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;h=ecb9640ded32609925d30c5d38f0db6018393fc2;hb=a2ad32a98e7a3f32214d3ecd7ca9730e3602d11f;hp=dc80968b3b3326dae5f55eb79f3268571f107ba7;hpb=a2bc79c5f0027e953815d6e98814a748b36827aa;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 dc80968b..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 @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,97 +21,91 @@ 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; public class PortalRestCentralServiceTest extends AbstractControllerTest { - private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - @Test - public void getAnalyticsTest() { - // paths are hardcoded here exactly like the EPSDK-FW library :( - URI uri = buildUri(null, PortalApiConstants.API_PREFIX, "/analytics"); - logger.info("Invoking {}", uri); - ResponseEntity response = restTemplate.exchange(uri, HttpMethod.GET, null, String.class); - // No Portal is available so this always fails - Assertions.assertTrue(response.getStatusCode().is4xxClientError()); - } + @Test + public void getAnalyticsTest() { + // paths are hardcoded here exactly like the EPSDK-FW library :( + URI uri = buildUri(null, PortalApiConstants.API_PREFIX, "/analytics"); + logger.info("Invoking {}", uri); + ResponseEntity response = restTemplate.exchange(uri, HttpMethod.GET, null, String.class); + // No Portal is available so this always fails + Assertions.assertTrue(response.getStatusCode().is4xxClientError()); + } - @Test - public void getErrorPageTest() { - // Send unauthorized request - URI uri = buildUri(null, "/favicon.ico"); - logger.info("Invoking {}", uri); - ResponseEntity response = restTemplate.exchange(uri, HttpMethod.GET, null, String.class); - Assertions.assertTrue(response.getStatusCode().is4xxClientError()); - Assertions.assertTrue(response.getBody().contains("Static error page")); - } + @Test + public void getErrorPageTest() { + // Send unauthorized request + URI uri = buildUri(null, "/favicon.ico"); + logger.info("Invoking {}", uri); + ResponseEntity response = restTemplate.exchange(uri, HttpMethod.GET, null, String.class); + Assertions.assertTrue(response.getStatusCode().is4xxClientError()); + 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; - } - -/* @Test - public void createUserTest() { - final String loginId = "login1"; - URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user"); - logger.info("Invoking {}", create); - HttpEntity requestEntity = getEntityWithHeaders(createEcompUser(loginId)); - ResponseEntity response = restTemplate.exchange(create, HttpMethod.POST, requestEntity, String.class); - Assertions.assertTrue(response.getStatusCode().is2xxSuccessful()); - } - - @Test - public void updateUserTest() { - final String loginId = "login2"; - URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user"); - EcompUser user = createEcompUser(loginId); - logger.info("Invoking {}", create); - HttpEntity requestEntity = getEntityWithHeaders(user); - // Create - ResponseEntity response = restTemplate.exchange(create, HttpMethod.POST, requestEntity, String.class); - Assertions.assertTrue(response.getStatusCode().is2xxSuccessful()); - URI update = buildUri(null, PortalApiConstants.API_PREFIX, "user", loginId); - user.setEmail("user@company.org"); - requestEntity = getEntityWithHeaders(user); - response = restTemplate.exchange(update, HttpMethod.POST, requestEntity, String.class); - Assertions.assertTrue(response.getStatusCode().is2xxSuccessful()); - } -*/ + /* + * 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"; + * URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user"); + * logger.info("Invoking {}", create); + * HttpEntity requestEntity = getEntityWithHeaders(createEcompUser(loginId)); + * ResponseEntity response = restTemplate.exchange(create, HttpMethod.POST, requestEntity, String.class); + * Assertions.assertTrue(response.getStatusCode().is2xxSuccessful()); + * } + * + * @Test + * public void updateUserTest() { + * final String loginId = "login2"; + * URI create = buildUri(null, PortalApiConstants.API_PREFIX, "user"); + * EcompUser user = createEcompUser(loginId); + * logger.info("Invoking {}", create); + * HttpEntity requestEntity = getEntityWithHeaders(user); + * // Create + * ResponseEntity response = restTemplate.exchange(create, HttpMethod.POST, requestEntity, String.class); + * Assertions.assertTrue(response.getStatusCode().is2xxSuccessful()); + * URI update = buildUri(null, PortalApiConstants.API_PREFIX, "user", loginId); + * user.setEmail("user@company.org"); + * requestEntity = getEntityWithHeaders(user); + * response = restTemplate.exchange(update, HttpMethod.POST, requestEntity, String.class); + * Assertions.assertTrue(response.getStatusCode().is2xxSuccessful()); + * } + */ }