X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common-test%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fportal%2Ftest%2Fcontroller%2FBasicAuthAccountControllerTest.java;h=8f9549ced3e641e484add84e6c310f3a4b190d5b;hb=23634dba70b166ad3c79b5eadfbd32b5375d44be;hp=705052746f5a7bcad1a08003b6586d3cd91c675a;hpb=4ba6a0f20a190030700917a6065a6779ca9d308f;p=portal.git

diff --git a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/BasicAuthAccountControllerTest.java b/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/BasicAuthAccountControllerTest.java
index 70505274..8f9549ce 100644
--- a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/BasicAuthAccountControllerTest.java
+++ b/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/BasicAuthAccountControllerTest.java
@@ -86,8 +86,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 		PortalRestResponse<String> expectedResponse = new PortalRestResponse<String>();
 		expectedResponse.setMessage("SUCCESS");
 		expectedResponse.setResponse("");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedResponse.setStatus(portalRestStatusEnum.OK);
+		expectedResponse.setStatus(PortalRestStatusEnum.OK);
 		long accountd = 1;
 
 		Mockito.when(basicAuthAccountService.saveBasicAuthAccount(basicAuthCredentials)).thenReturn(accountd);
@@ -106,8 +105,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 		PortalRestResponse<String> expectedResponse = new PortalRestResponse<String>();
 		expectedResponse.setMessage("Authorization Required");
 		expectedResponse.setResponse("Admin Only Operation! ");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedResponse.setStatus(PortalRestStatusEnum.ERROR);
 
 		PortalRestResponse<String> actualResponse = basicAuthAccountController.createBasicAuthAccount(mockedRequest,
 				mockedResponse, basicAuthCredentials);
@@ -123,8 +121,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 		PortalRestResponse<String> expectedResponse = new PortalRestResponse<String>();
 		expectedResponse.setMessage("FAILURE");
 		expectedResponse.setResponse("newBasicAuthAccount cannot be null or empty");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedResponse.setStatus(PortalRestStatusEnum.ERROR);
 		PortalRestResponse<String> actualResponse = basicAuthAccountController.createBasicAuthAccount(mockedRequest,
 				mockedResponse, basicAuthCredentials);
 		assertEquals(actualResponse, expectedResponse);
@@ -139,8 +136,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 
 		expectedPortalResponse.setMessage("Success");
 		expectedPortalResponse.setResponse(null);
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedPortalResponse.setStatus(portalRestStatusEnum.OK);
+		expectedPortalResponse.setStatus(PortalRestStatusEnum.OK);
 
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
@@ -161,8 +157,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 
 		expectedPortalResponse.setMessage("UnAuthorized! Admin Only Operation");
 		expectedPortalResponse.setResponse(new ArrayList<>());
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedPortalResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedPortalResponse.setStatus(PortalRestStatusEnum.ERROR);
 
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
@@ -183,8 +178,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 		PortalRestResponse<String> expectedResponse = new PortalRestResponse<String>();
 		expectedResponse.setMessage("SUCCESS");
 		expectedResponse.setResponse("");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedResponse.setStatus(portalRestStatusEnum.OK);
+		expectedResponse.setStatus(PortalRestStatusEnum.OK);
 		long accountd = 1;
 		PortalRestResponse<String> actualResponse = basicAuthAccountController.updateAccount(mockedRequest,
 				mockedResponse, accountd, basicAuthCredentials);
@@ -201,8 +195,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 		PortalRestResponse<String> expectedResponse = new PortalRestResponse<String>();
 		expectedResponse.setMessage("Authorization Required");
 		expectedResponse.setResponse("Admin Only Operation! ");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedResponse.setStatus(PortalRestStatusEnum.ERROR);
 		long accountd = 1;
 		PortalRestResponse<String> actualResponse = basicAuthAccountController.updateAccount(mockedRequest,
 				mockedResponse, accountd, basicAuthCredentials);
@@ -219,8 +212,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 		PortalRestResponse<String> expectedResponse = new PortalRestResponse<String>();
 		expectedResponse.setMessage("FAILURE");
 		expectedResponse.setResponse("BasicAuthCredentials cannot be null or empty");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedResponse.setStatus(PortalRestStatusEnum.ERROR);
 		long accountd = 1;
 		PortalRestResponse<String> actualResponse = basicAuthAccountController.updateAccount(mockedRequest,
 				mockedResponse, accountd, basicAuthCredentials);
@@ -235,8 +227,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 		PortalRestResponse<String> expectedResponse = new PortalRestResponse<String>();
 		expectedResponse.setMessage("SUCCESS");
 		expectedResponse.setResponse("");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedResponse.setStatus(portalRestStatusEnum.OK);
+		expectedResponse.setStatus(PortalRestStatusEnum.OK);
 		long accountd = 1;
 		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
 		PortalRestResponse<String> actualResponse = basicAuthAccountController.deleteAccount(mockedRequest,
@@ -252,8 +243,7 @@ public class BasicAuthAccountControllerTest extends MockitoTestSuite {
 		PortalRestResponse<String> expectedResponse = new PortalRestResponse<String>();
 		expectedResponse.setMessage("Authorization Required");
 		expectedResponse.setResponse("Admin Only Operation! ");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedResponse.setStatus(PortalRestStatusEnum.ERROR);
 		long accountd = 1;
 		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(false);
 		PortalRestResponse<String> actualResponse = basicAuthAccountController.deleteAccount(mockedRequest,