X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FRoleManageControllerTest.java;h=ff9fcffc72f055d944d44160084ee2bf41fd94d8;hb=2845910b34682056c1949f82e39d9205a26554e9;hp=c1854bfe391c06f440b172980294df4361e07b71;hpb=24608a9e1450c409dc3870440d29e91cc3a26bb9;p=portal.git diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java index c1854bfe..ff9fcffc 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java @@ -142,6 +142,8 @@ public class RoleManageControllerTest { NullPointerException nullPointerException = new NullPointerException(); MockEPUser mockUser = new MockEPUser(); + private DelegatingServletInputStream dsi; + @Test public void removeRoleRoleFunctionTest() throws Exception { @@ -595,8 +597,9 @@ public class RoleManageControllerTest { roleJson2.put("roleFunctions", roleFunctions); ObjectMapper mapper = new ObjectMapper(); JsonNode actualObj = mapper.readTree(roleJson2.toString()); - Mockito.when(mockedRequest.getInputStream()).thenReturn(new DelegatingServletInputStream( - new ByteArrayInputStream(actualObj.toString().getBytes(StandardCharsets.UTF_8)))); + dsi = new DelegatingServletInputStream( + new ByteArrayInputStream(actualObj.toString().getBytes(StandardCharsets.UTF_8))); + Mockito.when(mockedRequest.getInputStream()).thenReturn(dsi); Mockito.when(mockedRequest.getReader()).thenReturn(new BufferedReader(new StringReader(actualObj.toString()))); Mockito.when(mockedRequest.getContentType()).thenReturn("application/json"); Mockito.when(mockedRequest.getCharacterEncoding()).thenReturn("UTF-8"); @@ -647,8 +650,9 @@ public class RoleManageControllerTest { roleJson2.put("roleFunctions", roleFunctions); ObjectMapper mapper = new ObjectMapper(); JsonNode actualObj = mapper.readTree(roleJson2.toString()); - Mockito.when(mockedRequest.getInputStream()).thenReturn(new DelegatingServletInputStream( - new ByteArrayInputStream(actualObj.toString().getBytes(StandardCharsets.UTF_8)))); + dsi = new DelegatingServletInputStream( + new ByteArrayInputStream(actualObj.toString().getBytes(StandardCharsets.UTF_8))); + Mockito.when(mockedRequest.getInputStream()).thenReturn(dsi); Mockito.when(mockedRequest.getReader()).thenReturn(new BufferedReader(new StringReader(actualObj.toString()))); Mockito.when(mockedRequest.getContentType()).thenReturn("application/json"); Mockito.when(mockedRequest.getCharacterEncoding()).thenReturn("UTF-8"); @@ -701,8 +705,9 @@ public class RoleManageControllerTest { roleJson2.put("roleFunctions", roleFunctions); ObjectMapper mapper = new ObjectMapper(); JsonNode actualObj = mapper.readTree(roleJson2.toString()); - Mockito.when(mockedRequest.getInputStream()).thenReturn(new DelegatingServletInputStream( - new ByteArrayInputStream(actualObj.toString().getBytes(StandardCharsets.UTF_8)))); + dsi = new DelegatingServletInputStream( + new ByteArrayInputStream(actualObj.toString().getBytes(StandardCharsets.UTF_8))); + Mockito.when(mockedRequest.getInputStream()).thenReturn(dsi); Mockito.when(mockedRequest.getReader()).thenReturn(new BufferedReader(new StringReader(actualObj.toString()))); Mockito.when(mockedRequest.getContentType()).thenReturn("application/json"); Mockito.when(mockedRequest.getCharacterEncoding()).thenReturn("UTF-8");