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%2Fmodel%2FModelTest.java;h=88bcf990021055e9737cb2cb59683632f5299bdf;hb=9a688995681b92344824c990bb1d838d3cc7cfaa;hp=c668afc105ac73fdc92e6d8facd8b23d2512eb29;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
index c668afc1..88bcf990 100644
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
@@ -26,10 +26,10 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
-import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
-import org.oransc.ric.e2mgr.client.model.NodebIdentity;
 import org.oransc.ric.portal.dashboard.DashboardUserManagerTest;
 import org.oransc.ric.portal.dashboard.exception.UnknownInstanceException;
+import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse;
+import org.oransc.ricplt.e2mgr.client.model.NodebIdentity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,6 +37,27 @@ public class ModelTest extends AbstractModelTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+	private void checkAppStats(AppStats m) {
+		Assert.assertEquals(s1, m.getInstanceKey());
+		Assert.assertTrue(i1 == m.getStatsDetails().getAppId());
+		Assert.assertEquals(s2, m.getStatsDetails().getAppName());
+		Assert.assertEquals(s3, m.getStatsDetails().getMetricUrl());
+	}
+
+	@Test
+	public void testAppStats() {
+		StatsDetailsTransport n = new StatsDetailsTransport();
+		n.setAppId(i1);
+		n.setAppName(s2);
+		n.setMetricUrl(s3);
+		AppStats m = new AppStats();
+		m = new AppStats(s1, n);
+		m.setInstanceKey(s1);
+		m.setStatsDetails(n);
+		checkAppStats(m);
+		logger.info(m.toString());
+	}
+
 	private void checkAppTransport(AppTransport m) {
 		Assert.assertEquals(s1, m.getName());
 		Assert.assertEquals(s2, m.getVersion());
@@ -67,29 +88,6 @@ public class ModelTest extends AbstractModelTest {
 		logger.info(eud.toString());
 	}
 
-	private void checkErrorTransport(ErrorTransport m) {
-		Assert.assertEquals(s1, m.getError());
-		Assert.assertEquals(s2, m.getMessage());
-		Assert.assertEquals(s3, m.getPath());
-		Assert.assertEquals(i1, m.getStatus());
-		Assert.assertEquals(t1, m.getTimestamp());
-	}
-
-	@Test
-	public void testErrorTransport() {
-		ErrorTransport m = new ErrorTransport(i1, s1);
-		m = new ErrorTransport(i1, new Exception());
-		m = new ErrorTransport(i1, s1, s2, s3);
-		m = new ErrorTransport();
-		m.setError(s1);
-		m.setMessage(s2);
-		m.setPath(s3);
-		m.setStatus(i1);
-		m.setTimestamp(t1);
-		checkErrorTransport(m);
-		logger.info(m.toString());
-	}
-
 	private void checkInstanceTransport(RicInstanceKeyName m) {
 		Assert.assertEquals(s1, m.getKey());
 		Assert.assertEquals(s2, m.getName());
@@ -206,4 +204,42 @@ public class ModelTest extends AbstractModelTest {
 		logger.info(m.toString());
 	}
 
+	private void checkRicRegionTransport(RicRegionTransport m) {
+		Assert.assertEquals(s1, m.getName());
+		Assert.assertFalse(m.getInstances().isEmpty());
+	}
+
+	@Test
+	public void testRicRegionTransport() {
+		RicRegionTransport m = new RicRegionTransport().name(s1);
+		m.instances(new ArrayList<RicInstanceKeyName>());
+		m.getInstances().add(new RicInstanceKeyName(s1, s2));
+		checkRicRegionTransport(m);
+		Assert.assertTrue(m.equals(m));
+		Assert.assertFalse(m.equals(null));
+		Assert.assertFalse(m.equals(new RicRegionTransport()));
+		Assert.assertNotEquals(1, m.hashCode());
+		logger.info(m.toString());
+	}
+
+	private void checkStatsDetailsTransport(StatsDetailsTransport m) {
+		Assert.assertTrue(i1 == m.getAppId());
+		Assert.assertEquals(s1, m.getAppName());
+		Assert.assertEquals(s2, m.getMetricUrl());
+	}
+
+	@Test
+	public void testStatDetailsTransport() {
+		StatsDetailsTransport m = new StatsDetailsTransport();
+		m.setAppId(i1);
+		m.setAppName(s1);
+		m.setMetricUrl(s2);
+		checkStatsDetailsTransport(m);
+		Assert.assertTrue(m.equals(m));
+		Assert.assertFalse(m.equals(null));
+		Assert.assertFalse(m.equals(new StatsDetailsTransport()));
+		Assert.assertNotEquals(1, m.hashCode());
+		logger.info(m.toString());
+	}
+
 }