X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FPortalRestCentralServiceTest.java;fp=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FPortalRestCentralServiceTest.java;h=48aa0844af64856890b3c53970b8c99b0408d937;hb=05c8688cd695a381eadaaa05f2027cf3f68feb5c;hp=7617bc2dd392314fd3640b1517916882a585fec7;hpb=f6f5bf3401f62a8f6019da3196423e5b26be2254;p=portal%2Fric-dashboard.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 7617bc2d..48aa0844 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
@@ -34,6 +34,7 @@ import org.onap.portalsdk.core.restful.domain.EcompUser;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -43,6 +44,12 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+	// Get values from configuration, probably blank
+	@Value("${portalapi.username}")
+	private String portalApiUsername;
+	@Value("${portalapi.password}")
+	private String portalApiPassword;
+
 	@Test
 	public void getAnalyticsTest() {
 		// paths are hardcoded here exactly like the EPSDK-FW library :(
@@ -65,8 +72,8 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest {
 
 	private HttpEntity<Object> getEntityWithAuthHeaders(Object body) {
 		HttpHeaders headers = new HttpHeaders();
-		headers.set(IPortalRestCentralService.CREDENTIALS_USER, IPortalRestCentralService.CREDENTIALS_USER);
-		headers.set(IPortalRestCentralService.CREDENTIALS_PASS, IPortalRestCentralService.CREDENTIALS_PASS);
+		headers.set(IPortalRestCentralService.CREDENTIALS_USER, portalApiUsername);
+		headers.set(IPortalRestCentralService.CREDENTIALS_PASS, portalApiPassword);
 		HttpEntity<Object> entity = new HttpEntity<>(body, headers);
 		return entity;
 	}
@@ -84,9 +91,10 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest {
 		return user;
 	}
 
+	/** See comments in {@link DefaultContextTest} */
 	@Test
 	public void createUserTest() {
-		final String loginId = "login1";
+		final String loginId = "login-" + Long.toString(System.currentTimeMillis());
 		URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user");
 		logger.info("createUserTest invoking {}", create);
 		HttpEntity<Object> requestEntity = getEntityWithAuthHeaders(createEcompUser(loginId));
@@ -95,15 +103,16 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest {
 		Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
 	}
 
+	/** See comments in {@link DefaultContextTest} */
 	@Test
 	public void updateUserTest() {
-		final String loginId = "login2";
+		final String loginId = "login-" + Long.toString(System.currentTimeMillis());
 		URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user");
 		EcompUser user = createEcompUser(loginId);
 		logger.info("updateUserTest invoking {}", create);
 		HttpEntity<Object> requestEntity = getEntityWithAuthHeaders(user);
 		ResponseEntity<String> response = restTemplate.exchange(create, HttpMethod.POST, requestEntity, String.class);
-		logger.info("updateUserTest response {}", response);
+		logger.info("updateUserTest create response {}", response);
 		Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
 		URI update = buildUri(null, PortalApiConstants.API_PREFIX, "user", loginId);
 		user.setEmail("user@company.org");