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=1124090567f09005201d87ce78f4d6c7ceef4d2d;hb=036e63834ec23b08ceb2f9cece1eaa602d3082bd;hp=e1c48ea04959853d0529798f497f13cbde6c53ab;hpb=44203c43bb16a87eb54cc97431a026e111842c97;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 e1c48ea0..11240905 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
@@ -21,11 +21,16 @@ 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;
@@ -68,14 +73,25 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest {
 		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);
+		HttpEntity<Object> requestEntity = getEntityWithHeaders(createEcompUser(loginId));
 		ResponseEntity<String> response = restTemplate.exchange(create, HttpMethod.POST, requestEntity, String.class);
 		Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
 	}
@@ -84,9 +100,8 @@ public class PortalRestCentralServiceTest extends AbstractControllerTest {
 	public void updateUserTest() {
 		final String loginId = "login2";
 		URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user");
+		EcompUser user = createEcompUser(loginId);
 		logger.info("Invoking {}", create);
-		EcompUser user = new EcompUser();
-		user.setLoginId(loginId);
 		HttpEntity<Object> requestEntity = getEntityWithHeaders(user);
 		// Create
 		ResponseEntity<String> response = restTemplate.exchange(create, HttpMethod.POST, requestEntity, String.class);