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=f3f9fad36ef92440d4f42347e5a2881b92e1a64d;hb=HEAD;hp=aa92e202f490e56dc54be72ff9670ff4cb237175;hpb=eb7e7f53f6cc186fd4319c729f3138540aac741a;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 aa92e202..f3f9fad3 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
@@ -22,11 +22,13 @@ package org.oransc.ric.portal.dashboard.controller;
 import java.lang.invoke.MethodHandles;
 import java.net.URI;
 import java.util.List;
+
+import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.MethodOrderer;
 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;
@@ -40,6 +42,7 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestClientException;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class AdminControllerTest extends AbstractControllerTest {
@@ -94,14 +97,30 @@ public class AdminControllerTest extends AbstractControllerTest {
 	@Order(1)
 	@Test
 	public void getAppStatsTest() {
+		// Get all
 		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,
+		logger.info("getAppStatsTest: uri {}", uri);
+		ResponseEntity<List<AppStats>> list = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
 				new ParameterizedTypeReference<List<AppStats>>() {
 				});
-		Assertions.assertFalse(response.getBody().isEmpty());
-		Assertions.assertNotEquals(-1, response.getBody().get(0).getStatsDetails().getAppId());
+		Assertions.assertFalse(list.getBody().isEmpty());
+		Assertions.assertNotEquals(-1, list.getBody().get(0).getStatsDetails().getAppId());
+
+		// Get one by ID
+		int appId = list.getBody().get(0).getStatsDetails().getAppId();
+		uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, "i1",
+				AdminController.STATAPPMETRIC_METHOD, DashboardConstants.APP_ID, Integer.toString(appId));
+		logger.info("getAppStatsTest: uri {}", uri);
+		AppStats stats = testRestTemplateStandardRole().getForObject(uri, AppStats.class);
+		Assertions.assertEquals(appId, stats.getStatsDetails().getAppId());
+
+		// Fail to get one by ID
+		uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, "i1",
+				AdminController.STATAPPMETRIC_METHOD, DashboardConstants.APP_ID, "987654321");
+		logger.info("getAppStatsTest: uri {}", uri);
+		stats = testRestTemplateStandardRole().getForObject(uri, AppStats.class);
+		Assert.assertNull(stats);
 	}
 
 	@Order(2)
@@ -119,6 +138,9 @@ public class AdminControllerTest extends AbstractControllerTest {
 		statsDetails.setMetricUrl("https://www.example2-next.com");
 		AppStats stNext = testRestTemplateAdminRole().postForObject(uri, statsDetails, AppStats.class);
 		Assertions.assertTrue(st.getStatsDetails().getAppId() < stNext.getStatsDetails().getAppId());
+		Assertions.assertThrows(RestClientException.class, () -> {
+			testRestTemplateAdminRole().postForObject(uri, statsDetails, AppStats.class);
+		});
 	}
 
 	@Order(3)
@@ -142,6 +164,14 @@ public class AdminControllerTest extends AbstractControllerTest {
 		ResponseEntity<String> stringResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity,
 				String.class);
 		Assertions.assertTrue(stringResponse.getStatusCode().is2xxSuccessful());
+
+		StatsDetailsTransport bogusDetails = new StatsDetailsTransport();
+		bogusDetails.setAppId(-1);
+		bogusDetails.setAppName("bogus");
+		HttpEntity<StatsDetailsTransport> bogusEntity = new HttpEntity<>(bogusDetails);
+		ResponseEntity<String> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, bogusEntity,
+				String.class);
+		Assertions.assertTrue(voidResponse.getStatusCode().is4xxClientError());
 	}
 
 	@Order(4)
@@ -163,6 +193,13 @@ public class AdminControllerTest extends AbstractControllerTest {
 		ResponseEntity<String> stringResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.DELETE, null,
 				String.class);
 		Assertions.assertTrue(stringResponse.getStatusCode().is2xxSuccessful());
+
+		URI uri99 = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+				RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD,
+				DashboardConstants.APP_ID, "999999");
+		ResponseEntity<String> voidResponse = testRestTemplateAdminRole().exchange(uri99, HttpMethod.DELETE, null,
+				String.class);
+		Assertions.assertTrue(voidResponse.getStatusCode().is4xxClientError());
 	}
 
 	@Test