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=f1c26806188ff9be03a6f90e0d4f423d8a4e215c;hb=a16f2d04fa1af4fe1ea993133a1d106e7fa1da3d;hp=8c61a4e423f096e1209a430cd1c57b93353a037c;hpb=6b79976523018d41b3643b15deeb6706ad4daa6e;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 8c61a4e4..f1c26806 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
@@ -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.
@@ -27,10 +27,10 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Assertions;
 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.DashboardUser;
 import org.oransc.ric.portal.dashboard.model.ErrorTransport;
-import org.oransc.ric.portal.dashboard.model.IDashboardResponse;
+import org.oransc.ric.portal.dashboard.model.InstanceTransport;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,12 +58,22 @@ public class AdminControllerTest extends AbstractControllerTest {
 		Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful());
 	}
 
+	@Test
+	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>>() {
+				});
+		Assertions.assertFalse(response.getBody().isEmpty());
+	}
+
 	@Test
 	public void getUsersTest() {
 		URI uri = buildUri(null, AdminController.CONTROLLER_PATH, AdminController.USER_METHOD);
 		logger.info("Invoking {}", uri);
-		ResponseEntity<List<DashboardUser>> response = testRestTemplateAdminRole().exchange(uri, HttpMethod.GET, null,
-				new ParameterizedTypeReference<List<DashboardUser>>() {
+		ResponseEntity<List<EcompUser>> response = testRestTemplateAdminRole().exchange(uri, HttpMethod.GET, null,
+				new ParameterizedTypeReference<List<EcompUser>>() {
 				});
 		Assertions.assertFalse(response.getBody().isEmpty());
 	}
@@ -83,21 +93,22 @@ public class AdminControllerTest extends AbstractControllerTest {
 		metricsQueryParms.put("app", DashboardConstants.APP_NAME_AC);
 		URI uri = buildUri(metricsQueryParms, AdminController.CONTROLLER_PATH, AdminController.XAPPMETRICS_METHOD);
 		logger.debug("Invoking {}", uri);
-		ResponseEntity<SuccessTransport> successResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
-				SuccessTransport.class);
+		ResponseEntity<SuccessTransport> successResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
+				null, SuccessTransport.class);
 		Assertions.assertFalse(successResponse.getBody().getData().toString().isEmpty());
 		Assertions.assertTrue(successResponse.getStatusCode().is2xxSuccessful());
 	}
 
 	@Test
 	public void getxAppMetricsUrlTestFail() {
-		Map<String, String> metricsQueryParms = new HashMap<String, String>(); 
-		//Providing a bogus value for application name in query parameter to test failure 
+		Map<String, String> metricsQueryParms = new HashMap<String, String>();
+		// Providing a bogus value for application name in query parameter to test
+		// failure
 		metricsQueryParms.put("app", "ABCD");
 		URI uri = buildUri(metricsQueryParms, AdminController.CONTROLLER_PATH, AdminController.XAPPMETRICS_METHOD);
 		logger.debug("Invoking {}", uri);
-		ResponseEntity<ErrorTransport> errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
-				ErrorTransport.class);
+		ResponseEntity<ErrorTransport> errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
+				null, ErrorTransport.class);
 		logger.debug("{}", errorResponse.getBody().getError().toString());
 		Assertions.assertTrue(errorResponse.getStatusCode().is4xxClientError());
 	}