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%2FAdminControllerTest.java;h=152d14b2da028222fed0b9d8f070c67e5d9f8c03;hb=c7d74b01b59da07704be4069acece1a91d451a7e;hp=02534fb0e3656021ce64e7b358e14bbd6f123a9f;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java
index 02534fb0..152d14b2 100644
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java
@@ -29,7 +29,6 @@ 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.ErrorTransport;
 import org.oransc.ric.portal.dashboard.model.RicInstanceKeyName;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
 import org.slf4j.Logger;
@@ -93,7 +92,7 @@ public class AdminControllerTest extends AbstractControllerTest {
 		URI uri;
 
 		metricsQueryParms.clear();
-		metricsQueryParms.put("app", DashboardConstants.APP_NAME_AC);
+		metricsQueryParms.put("app", DashboardConstants.APP_NAME_MC);
 		uri = buildUri(metricsQueryParms, AdminController.CONTROLLER_PATH, AdminController.XAPPMETRICS_METHOD);
 		logger.debug("Invoking {}", uri);
 		ResponseEntity<SuccessTransport> successResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
@@ -102,7 +101,7 @@ public class AdminControllerTest extends AbstractControllerTest {
 		Assertions.assertTrue(successResponse.getStatusCode().is2xxSuccessful());
 
 		metricsQueryParms.clear();
-		metricsQueryParms.put("app", DashboardConstants.APP_NAME_MC);
+		metricsQueryParms.put("app", DashboardConstants.APP_NAME_ML);
 		logger.debug("Invoking {}", uri);
 		successResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null, SuccessTransport.class);
 		Assertions.assertFalse(successResponse.getBody().getData().toString().isEmpty());
@@ -117,9 +116,9 @@ public class AdminControllerTest extends AbstractControllerTest {
 		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);
-		logger.debug("{}", errorResponse.getBody().getError().toString());
+		ResponseEntity<String> errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
+				String.class);
+		logger.debug("{}", errorResponse.getBody().toString());
 		Assertions.assertTrue(errorResponse.getStatusCode().is4xxClientError());
 	}
 
@@ -128,10 +127,10 @@ public class AdminControllerTest extends AbstractControllerTest {
 		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());
+		ResponseEntity<String> response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
+				String.class);
+		logger.debug("{}", response.getBody().toString());
+		Assertions.assertTrue(response.getStatusCode().is5xxServerError());
 	}
 
 	@Test
@@ -139,9 +138,9 @@ public class AdminControllerTest extends AbstractControllerTest {
 		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());
+		ResponseEntity<String> errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
+				String.class);
+		logger.debug("{}", errorResponse.getBody());
 		Assertions.assertTrue(errorResponse.getStatusCode().is5xxServerError());
 	}