Merge master into feature/RM-4012_UnitTests

This commit is contained in:
Silviu Dinuta
2016-10-31 14:04:14 +02:00
9 changed files with 258 additions and 258 deletions

View File

@@ -222,7 +222,7 @@ public class RMSitesImplUnitTest extends BaseUnitTest
//mock Parameters
Parameters mockedParameters = mock(Parameters.class);
when(mockedParameters.getParameter(PARAM_SKIP_ADDTOFAVORITES)).thenReturn("true");
when(mockedParameters.getParameter(PARAM_SKIP_ADDTOFAVORITES)).thenReturn(Boolean.toString(true));
//call createRMSite method
rmSitesImpl.createRMSite(toCreate, mockedParameters);

View File

@@ -142,7 +142,7 @@ public class RMSiteEntityResourceUnitTest extends BaseUnitTest
{
String siteId = RM_SITE_ID;
Params parameters = mock(Params.class);
when(parameters.getParameter(PERMANENT_PARAMETER)).thenReturn("true");
when(parameters.getParameter(PERMANENT_PARAMETER)).thenReturn(Boolean.toString(true));
try
{
rmSiteEntityResource.delete(siteId, parameters);