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=aa92e202f490e56dc54be72ff9670ff4cb237175;hb=eb7e7f53f6cc186fd4319c729f3138540aac741a;hp=152d14b2da028222fed0b9d8f070c67e5d9f8c03;hpb=c7d74b01b59da07704be4069acece1a91d451a7e;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 152d14b2..aa92e202 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
@@ -21,22 +21,27 @@ package org.oransc.ric.portal.dashboard.controller;
 
 import java.lang.invoke.MethodHandles;
 import java.net.URI;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
+import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
+import org.oransc.ric.portal.dashboard.model.AppStats;
 import org.oransc.ric.portal.dashboard.model.RicInstanceKeyName;
+import org.oransc.ric.portal.dashboard.model.StatsDetailsTransport;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class AdminControllerTest extends AbstractControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -86,40 +91,78 @@ public class AdminControllerTest extends AbstractControllerTest {
 		Assertions.assertTrue(response.getStatusCode().is4xxClientError());
 	}
 
+	@Order(1)
 	@Test
-	public void getxAppMetricsUrlTest() {
-		Map<String, String> metricsQueryParms = new HashMap<String, String>();
-		URI uri;
+	public void getAppStatsTest() {
+		URI uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, "i1",
+				AdminController.STATAPPMETRIC_METHOD);
+		logger.info("Invoking uri {}", uri);
+		ResponseEntity<List<AppStats>> response = testRestTemplateAdminRole().exchange(uri, HttpMethod.GET, null,
+				new ParameterizedTypeReference<List<AppStats>>() {
+				});
+		Assertions.assertFalse(response.getBody().isEmpty());
+		Assertions.assertNotEquals(-1, response.getBody().get(0).getStatsDetails().getAppId());
+	}
 
-		metricsQueryParms.clear();
-		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,
-				null, SuccessTransport.class);
-		Assertions.assertFalse(successResponse.getBody().getData().toString().isEmpty());
-		Assertions.assertTrue(successResponse.getStatusCode().is2xxSuccessful());
+	@Order(2)
+	@Test
+	public void createAppStatsTest() {
+		URI uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+				RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD);
+		logger.info("Invoking uri {}", uri);
+		StatsDetailsTransport statsDetails = new StatsDetailsTransport();
+		statsDetails.setAppName("MachLearn-2");
+		statsDetails.setMetricUrl("https://www.example2.com");
+		AppStats st = testRestTemplateAdminRole().postForObject(uri, statsDetails, AppStats.class);
+		Assertions.assertFalse(st.getStatsDetails().getAppName().isEmpty());
+		statsDetails.setAppName("MachLearn-2-next");
+		statsDetails.setMetricUrl("https://www.example2-next.com");
+		AppStats stNext = testRestTemplateAdminRole().postForObject(uri, statsDetails, AppStats.class);
+		Assertions.assertTrue(st.getStatsDetails().getAppId() < stNext.getStatsDetails().getAppId());
+	}
 
-		metricsQueryParms.clear();
-		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());
-		Assertions.assertTrue(successResponse.getStatusCode().is2xxSuccessful());
+	@Order(3)
+	@Test
+	public void updateAppStatsTest() {
+		URI uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+				RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD);
+		logger.info("Invoking uri {}", uri);
+		ResponseEntity<List<AppStats>> response = testRestTemplateAdminRole().exchange(uri, HttpMethod.GET, null,
+				new ParameterizedTypeReference<List<AppStats>>() {
+				});
+		int statToUpdate = 0;
+		if (response.getBody() != null) {
+			statToUpdate = response.getBody().get(0).getStatsDetails().getAppId();
+		}
+		StatsDetailsTransport statsDetails = new StatsDetailsTransport();
+		statsDetails.setAppId(statToUpdate);
+		statsDetails.setAppName("MachLearn-1");
+		statsDetails.setMetricUrl("https://www.example1.com");
+		HttpEntity<StatsDetailsTransport> entity = new HttpEntity<>(statsDetails);
+		ResponseEntity<String> stringResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity,
+				String.class);
+		Assertions.assertTrue(stringResponse.getStatusCode().is2xxSuccessful());
 	}
 
+	@Order(4)
 	@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
-		metricsQueryParms.put("app", "ABCD");
-		URI uri = buildUri(metricsQueryParms, AdminController.CONTROLLER_PATH, AdminController.XAPPMETRICS_METHOD);
-		logger.debug("Invoking {}", uri);
-		ResponseEntity<String> errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
+	public void deleteAppStatsTest() {
+		URI uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+				RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD);
+		ResponseEntity<List<AppStats>> response = testRestTemplateAdminRole().exchange(uri, HttpMethod.GET, null,
+				new ParameterizedTypeReference<List<AppStats>>() {
+				});
+		int statToDelete = 0;
+		if (response.getBody() != null) {
+			statToDelete = response.getBody().get(0).getStatsDetails().getAppId();
+		}
+		uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+				RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD,
+				DashboardConstants.APP_ID, String.valueOf(statToDelete));
+		logger.info("Invoking uri {}", uri);
+		ResponseEntity<String> stringResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.DELETE, null,
 				String.class);
-		logger.debug("{}", errorResponse.getBody().toString());
-		Assertions.assertTrue(errorResponse.getStatusCode().is4xxClientError());
+		Assertions.assertTrue(stringResponse.getStatusCode().is2xxSuccessful());
 	}
 
 	@Test