X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FPortalRestCentralServiceTest.java;h=ecb9640ded32609925d30c5d38f0db6018393fc2;hb=0bf1e8c65fb6b3c2a011e25587500fa45d50d6c0;hp=1e8d3a321482cd461f87029de976e0014b6df4e8;hpb=592ce20ec359928373de2e7f06214c8f8ad73c20;p=nonrtric.git diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/PortalRestCentralServiceTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/PortalRestCentralServiceTest.java index 1e8d3a32..ecb9640d 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/PortalRestCentralServiceTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/PortalRestCentralServiceTest.java @@ -21,21 +21,12 @@ package org.oransc.ric.portal.dashboard.controller; import java.lang.invoke.MethodHandles; import java.net.URI; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; -import org.onap.portalsdk.core.restful.domain.EcompRole; -import org.onap.portalsdk.core.restful.domain.EcompUser; -import org.oransc.ric.portal.dashboard.DashboardConstants; -import org.oransc.ric.portal.dashboard.config.PortalApIMockConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; @@ -63,30 +54,32 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest { Assertions.assertTrue(response.getBody().contains("Static error page")); } - private HttpEntity getEntityWithHeaders(Object body) { - HttpHeaders headers = new HttpHeaders(); - headers.set(PortalApIMockConfiguration.PORTAL_USERNAME_HEADER_KEY, - PortalApIMockConfiguration.PORTAL_USERNAME_HEADER_KEY); - headers.set(PortalApIMockConfiguration.PORTAL_PASSWORD_HEADER_KEY, - PortalApIMockConfiguration.PORTAL_PASSWORD_HEADER_KEY); - HttpEntity entity = new HttpEntity<>(body, headers); - return entity; - } - - private EcompUser createEcompUser(String loginId) { - EcompUser user = new EcompUser(); - user.setLoginId(loginId); - EcompRole role = new EcompRole(); - role.setRoleFunctions(Collections.EMPTY_SET); - role.setId(1L); - role.setName(DashboardConstants.ROLE_NAME_ADMIN); - Set roles = new HashSet<>(); - roles.add(role); - user.setRoles(roles); - return user; - } - /* + * private HttpEntity getEntityWithHeaders(Object body) { + * HttpHeaders headers = new HttpHeaders(); + * headers.set(PortalApIMockConfiguration.PORTAL_USERNAME_HEADER_KEY, + * PortalApIMockConfiguration.PORTAL_USERNAME_HEADER_KEY); + * headers.set(PortalApIMockConfiguration.PORTAL_PASSWORD_HEADER_KEY, + * PortalApIMockConfiguration.PORTAL_PASSWORD_HEADER_KEY); + * HttpEntity entity = new HttpEntity<>(body, headers); + * return entity; + * } + * + * private EcompUser createEcompUser(String loginId) { + * EcompUser user = new EcompUser(); + * user.setLoginId(loginId); + * EcompRole role = new EcompRole(); + * role.setRoleFunctions(Collections.EMPTY_SET); + * role.setId(1L); + * role.setName(DashboardConstants.ROLE_NAME_ADMIN); + * Set roles = new HashSet<>(); + * roles.add(role); + * user.setRoles(roles); + * return user; + * } + * + * @Test + * * @Test * public void createUserTest() { * final String loginId = "login1";