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%2FAdminControllerTest.java;h=02534fb0e3656021ce64e7b358e14bbd6f123a9f;hb=refs%2Fchanges%2F58%2F2258%2F2;hp=f1c26806188ff9be03a6f90e0d4f423d8a4e215c;hpb=a16f2d04fa1af4fe1ea993133a1d106e7fa1da3d;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java
index f1c26806..02534fb0 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.model.ErrorTransport;
-import org.oransc.ric.portal.dashboard.model.InstanceTransport;
+import org.oransc.ric.portal.dashboard.model.RicInstanceKeyName;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,8 +62,8 @@ public class AdminControllerTest extends AbstractControllerTest {
 	public void getInstancesTest() {
 		URI uri = buildUri(null, AdminController.CONTROLLER_PATH, AdminController.INSTANCE_METHOD);
 		logger.info("Invoking {}", uri);
-		ResponseEntity<List<InstanceTransport>> response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
-				null, new ParameterizedTypeReference<List<InstanceTransport>>() {
+		ResponseEntity<List<RicInstanceKeyName>> response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
+				null, new ParameterizedTypeReference<List<RicInstanceKeyName>>() {
 				});
 		Assertions.assertFalse(response.getBody().isEmpty());
 	}
@@ -90,13 +90,23 @@ public class AdminControllerTest extends AbstractControllerTest {
 	@Test
 	public void getxAppMetricsUrlTest() {
 		Map<String, String> metricsQueryParms = new HashMap<String, String>();
+		URI uri;
+
+		metricsQueryParms.clear();
 		metricsQueryParms.put("app", DashboardConstants.APP_NAME_AC);
-		URI uri = buildUri(metricsQueryParms, AdminController.CONTROLLER_PATH, AdminController.XAPPMETRICS_METHOD);
+		uri = buildUri(metricsQueryParms, AdminController.CONTROLLER_PATH, AdminController.XAPPMETRICS_METHOD);
 		logger.debug("Invoking {}", uri);
 		ResponseEntity<SuccessTransport> successResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
 				null, SuccessTransport.class);
 		Assertions.assertFalse(successResponse.getBody().getData().toString().isEmpty());
 		Assertions.assertTrue(successResponse.getStatusCode().is2xxSuccessful());
+
+		metricsQueryParms.clear();
+		metricsQueryParms.put("app", DashboardConstants.APP_NAME_MC);
+		logger.debug("Invoking {}", uri);
+		successResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null, SuccessTransport.class);
+		Assertions.assertFalse(successResponse.getBody().getData().toString().isEmpty());
+		Assertions.assertTrue(successResponse.getStatusCode().is2xxSuccessful());
 	}
 
 	@Test
@@ -113,4 +123,36 @@ public class AdminControllerTest extends AbstractControllerTest {
 		Assertions.assertTrue(errorResponse.getStatusCode().is4xxClientError());
 	}
 
+	@Test
+	public void throwHttpStatusCodeExceptionTest() {
+		URI uri = buildUri(null, AdminController.CONTROLLER_PATH,
+				AdminControllerExtension.HTTP_STATUS_CODE_EXCEPTION_METHOD);
+		logger.debug("Invoking {}", uri);
+		ResponseEntity<ErrorTransport> errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
+				null, ErrorTransport.class);
+		logger.debug("{}", errorResponse.getBody().getError().toString());
+		Assertions.assertTrue(errorResponse.getStatusCode().is5xxServerError());
+	}
+
+	@Test
+	public void throwRestClientResponseExceptionTest() {
+		URI uri = buildUri(null, AdminController.CONTROLLER_PATH,
+				AdminControllerExtension.REST_CLIENT_RESPONSE_EXCEPTION_METHOD);
+		logger.debug("Invoking {}", uri);
+		ResponseEntity<ErrorTransport> errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
+				null, ErrorTransport.class);
+		logger.debug("{}", errorResponse.getBody().getError().toString());
+		Assertions.assertTrue(errorResponse.getStatusCode().is5xxServerError());
+	}
+
+	@Test
+	public void throwRuntimeExceptionTest() {
+		URI uri = buildUri(null, AdminController.CONTROLLER_PATH, AdminControllerExtension.RUNTIME_EXCEPTION_METHOD);
+		logger.debug("Invoking {}", uri);
+		ResponseEntity<String> errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
+				String.class);
+		logger.debug("{}", errorResponse.getBody());
+		Assertions.assertTrue(errorResponse.getStatusCode().is5xxServerError());
+	}
+
 }