X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FPortalRestCentralServiceTest.java;h=7617bc2dd392314fd3640b1517916882a585fec7;hb=refs%2Fchanges%2F58%2F2258%2F2;hp=4f24101001e54aeed00e8af722aea16f0f926d7d;hpb=9fef9615bd5889eacbe8ddad454b7ff4b4c195c0;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/PortalRestCentralServiceTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/PortalRestCentralServiceTest.java
index 4f241010..7617bc2d 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/PortalRestCentralServiceTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/PortalRestCentralServiceTest.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,17 @@ 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.crossapi.IPortalRestCentralService;
 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.config.PortalApIMockConfiguration;
+import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
@@ -58,25 +63,35 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest {
 		Assertions.assertTrue(response.getBody().contains("Static error page"));
 	}
 
-	private HttpEntity<Object> getEntityWithHeaders(Object body) {
+	private HttpEntity<Object> getEntityWithAuthHeaders(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);
+		headers.set(IPortalRestCentralService.CREDENTIALS_USER, IPortalRestCentralService.CREDENTIALS_USER);
+		headers.set(IPortalRestCentralService.CREDENTIALS_PASS, IPortalRestCentralService.CREDENTIALS_PASS);
 		HttpEntity<Object> 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<EcompRole> roles = new HashSet<>();
+		roles.add(role);
+		user.setRoles(roles);
+		return user;
+	}
+
 	@Test
 	public void createUserTest() {
 		final String loginId = "login1";
 		URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user");
-		logger.info("Invoking {}", create);
-		EcompUser user = new EcompUser();
-		user.setLoginId(loginId);
-		HttpEntity<Object> requestEntity = getEntityWithHeaders(user);
+		logger.info("createUserTest invoking {}", create);
+		HttpEntity<Object> requestEntity = getEntityWithAuthHeaders(createEcompUser(loginId));
 		ResponseEntity<String> response = restTemplate.exchange(create, HttpMethod.POST, requestEntity, String.class);
+		logger.info("createUserTest response {}", response);
 		Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
 	}
 
@@ -84,17 +99,18 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest {
 	public void updateUserTest() {
 		final String loginId = "login2";
 		URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user");
-		logger.info("Invoking {}", create);
-		EcompUser user = new EcompUser();
-		user.setLoginId(loginId);
-		HttpEntity<Object> requestEntity = getEntityWithHeaders(user);
-		// Create
+		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);
 		Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
 		URI update = buildUri(null, PortalApiConstants.API_PREFIX, "user", loginId);
 		user.setEmail("user@company.org");
-		requestEntity = getEntityWithHeaders(user);
+		requestEntity = getEntityWithAuthHeaders(user);
+		logger.info("updateUserTest invoking {}", update);
 		response = restTemplate.exchange(update, HttpMethod.POST, requestEntity, String.class);
+		logger.info("updateUserTest response {}", response);
 		Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
 	}