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%2FAppsControllerTest.java;h=bd824e4567a2adbb516c9a1fc5def9b5ea2dbeac;hb=HEAD;hp=58745d22b76670f0479cea351913b86281a97c01;hpb=e4bbb52912d2a28fd543fb6412c4e98c0730d1ce;p=portal.git
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
index 58745d22..bd824e45 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
@@ -65,6 +65,7 @@ import org.onap.portalapp.portal.domain.AppsResponse;
import org.onap.portalapp.portal.domain.EPApp;
import org.onap.portalapp.portal.domain.EPUser;
import org.onap.portalapp.portal.domain.EcompApp;
+import org.onap.portalapp.portal.domain.EpAppType;
import org.onap.portalapp.portal.domain.UserRole;
import org.onap.portalapp.portal.domain.UserRoles;
import org.onap.portalapp.portal.framework.MockitoTestSuite;
@@ -128,6 +129,33 @@ public class AppsControllerTest extends MockitoTestSuite{
MockEPUser mockUser = new MockEPUser();
+ @Test
+ public void putOnboardingAppXSSTest() {
+ EPUser user = mockUser.mockEPUser();
+ Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
+ OnboardingApp onboardingApp = new OnboardingApp();
+ onboardingApp.setUebTopicName("test
");
+ Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
+ Mockito.when(appService.modifyOnboardingApp(onboardingApp, user)).thenReturn(null);
+ Mockito.when(mockedResponse.getStatus()).thenReturn(200);
+ FieldsValidator actualFieldValidator = appsController.putOnboardingApp(mockedRequest, onboardingApp,
+ mockedResponse);
+ assertNull(actualFieldValidator);
+ }
+
+ @Test
+ public void postOnboardingAppXSSTest() {
+ EPUser user = mockUser.mockEPUser();
+ Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
+ OnboardingApp onboardingApp = new OnboardingApp();
+ onboardingApp.setUebKey("test");
+ Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
+ Mockito.when(appService.addOnboardingApp(onboardingApp, user)).thenReturn(null);
+ FieldsValidator actualFieldValidator = appsController.postOnboardingApp(mockedRequest, onboardingApp,
+ mockedResponse);
+ assertNull(actualFieldValidator);
+ }
+
@Test
public void getUserAppsTest() {
EPUser user = mockUser.mockEPUser();
@@ -187,23 +215,23 @@ public class AppsControllerTest extends MockitoTestSuite{
app.setName("Test");
app.setImageUrl("test");
- app.setDescription("test");
- app.setNotes("test");
- app.setUrl("test");
+ app.setAppDescription("test");
+ app.setAppNotes("test");
+ app.setLandingPage("test");
app.setId((long) 1);
app.setAppRestEndpoint("test");
- app.setAlternateUrl("test");
+ app.setAlternateLandingPage("test");
app.setName("test");
app.setMlAppName("test");
app.setMlAppAdminId("test");
- app.setUsername("test");
- app.setAppPassword("test");
+ app.setAppBasicAuthUsername("test");
+ app.setAppBasicAuthPassword("test");
app.setOpen(false);
app.setEnabled(false);
app.setUebKey("test");
app.setUebSecret("test");
app.setUebTopicName("test");
- app.setAppType(1);
+ app.setAppType(EpAppType.GUI);
expectedApps.add(app);
@@ -236,23 +264,23 @@ public class AppsControllerTest extends MockitoTestSuite{
app.setName("Test");
app.setImageUrl("test");
- app.setDescription("test");
- app.setNotes("test");
- app.setUrl("test");
+ app.setAppDescription("test");
+ app.setAppNotes("test");
+ app.setLandingPage("test");
app.setId((long) 1);
app.setAppRestEndpoint("test");
- app.setAlternateUrl("test");
+ app.setAlternateLandingPage("test");
app.setName("test");
app.setMlAppName("test");
app.setMlAppAdminId("test");
- app.setUsername("test");
- app.setAppPassword("test");
+ app.setAppBasicAuthUsername("test");
+ app.setAppBasicAuthPassword("test");
app.setOpen(false);
app.setEnabled(false);
app.setUebKey("test");
app.setUebSecret("test");
app.setUebTopicName("test");
- app.setAppType(1);
+ app.setAppType(EpAppType.GUI);
expectedApps.add(app);
@@ -797,14 +825,14 @@ public class AppsControllerTest extends MockitoTestSuite{
EPUser user = mockUser.mockEPUser();
Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
OnboardingApp OnboardingApp = new OnboardingApp();
- OnboardingApp.isCentralAuth = true;
- OnboardingApp.nameSpace = "test1";
+ OnboardingApp.setRolesInAAF(true);
+ OnboardingApp.setNameSpace("test1");
FieldsValidator expectedFieldValidator = new FieldsValidator();
expectedFieldValidator.setHttpStatusCode((long) 200);
expectedFieldValidator.setFields(null);
expectedFieldValidator.setErrorCode(null);
EPApp OnboardingApp1 = new EPApp();
- OnboardingApp1.setCentralAuth(false);
+ OnboardingApp1.setRolesInAAF(false);
OnboardingApp1.setNameSpace("test");
Mockito.when(appService.getApp(Matchers.anyLong())).thenReturn(OnboardingApp1);
Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
@@ -822,8 +850,8 @@ public class AppsControllerTest extends MockitoTestSuite{
EPUser user = mockUser.mockEPUser();
Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
OnboardingApp onboardingApp = new OnboardingApp();
- onboardingApp.isCentralAuth = true;
- onboardingApp.nameSpace = "com.test1";
+ onboardingApp.setRolesInAAF(true);
+ onboardingApp.setNameSpace("com.test1");
EPApp app = new EPApp();
app.setNameSpace("com.test ");
FieldsValidator expectedFieldValidator = new FieldsValidator();
@@ -849,10 +877,10 @@ public class AppsControllerTest extends MockitoTestSuite{
EPUser user = mockUser.mockEPUser();
Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
OnboardingApp onboardingApp = new OnboardingApp();
- onboardingApp.isCentralAuth = false;
- onboardingApp.nameSpace = "com.test1";
+ onboardingApp.setRolesInAAF(false);
+ onboardingApp.setNameSpace("com.test1");
EPApp app = new EPApp();
- app.setCentralAuth(false);
+ app.setRolesInAAF(false);
app.setNameSpace("com.test ");
FieldsValidator expectedFieldValidator = new FieldsValidator();
expectedFieldValidator.setHttpStatusCode((long) 404);
@@ -875,8 +903,8 @@ public class AppsControllerTest extends MockitoTestSuite{
EPUser user = mockUser.mockEPUser();
Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
OnboardingApp onboardingApp = new OnboardingApp();
- onboardingApp.isCentralAuth = true;
- onboardingApp.nameSpace = "com.test1";
+ onboardingApp.setRolesInAAF(true);
+ onboardingApp.setNameSpace("com.test1");
EPApp app = new EPApp();
app.setNameSpace("com.test ");
FieldsValidator expectedFieldValidator = new FieldsValidator();
@@ -1047,11 +1075,11 @@ public class AppsControllerTest extends MockitoTestSuite{
EPApp app = new EPApp();
app.setName("Test");
app.setImageUrl("test");
- app.setDescription("test");
- app.setNotes("test");
- app.setUrl("test");
+ app.setAppDescription("test");
+ app.setAppNotes("test");
+ app.setLandingPage("test");
app.setId((long) 1);
- app.setAppType(1);
+ app.setAppType(EpAppType.GUI);
app.setImageUrl("www.ecomp.com");
app.setThumbnail(new byte[] {1, 6, 3});
Mockito.when(appService.getApp((long) 1)).thenReturn(app);
@@ -1066,11 +1094,11 @@ public class AppsControllerTest extends MockitoTestSuite{
EPApp app = new EPApp();
app.setName("Test");
app.setImageUrl("test");
- app.setDescription("test");
- app.setNotes("test");
- app.setUrl("test");
+ app.setAppDescription("test");
+ app.setAppNotes("test");
+ app.setLandingPage("test");
app.setId((long) 1);
- app.setAppType(1);
+ app.setAppType(EpAppType.GUI);
app.setImageUrl("www.ecomp.png");
app.setThumbnail(new byte[] {1, 6, 3});
Mockito.when(appService.getApp((long) 1)).thenReturn(app);