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%2Fmodel%2FModelTest.java;h=c668afc105ac73fdc92e6d8facd8b23d2512eb29;hb=a0180adc6a1e1ec09472549596428b70d48db3fc;hp=3208fd462775d057df8e88c594124123dc7c3b09;hpb=a4c4e6ac19b6b36038bf2ec5bca54f1ead616bfc;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
index 3208fd46..c668afc1 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java
@@ -20,6 +20,8 @@
 package org.oransc.ric.portal.dashboard.model;
 
 import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
@@ -27,6 +29,7 @@ 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,6 +62,9 @@ public class ModelTest extends AbstractModelTest {
 		Assert.assertNotNull(eud.getUsername());
 		Assert.assertTrue(eud.isAccountNonExpired());
 		Assert.assertTrue(eud.isAccountNonLocked());
+		Assert.assertTrue(eud.isCredentialsNonExpired());
+		Assert.assertTrue(eud.isEnabled());
+		logger.info(eud.toString());
 	}
 
 	private void checkErrorTransport(ErrorTransport m) {
@@ -110,6 +116,7 @@ public class ModelTest extends AbstractModelTest {
 		m.nodebIdentity(nodebIdentity).nodebStatus(nodebResponse);
 		Assert.assertEquals(m.getNodebIdentity(), nodebIdentity);
 		Assert.assertEquals(m.getNodebStatus(), nodebResponse);
+		logger.debug(m.toString());
 	}
 
 	private void checkSuccessTransport(SuccessTransport m) {
@@ -139,7 +146,9 @@ public class ModelTest extends AbstractModelTest {
 		m.setKey(s1);
 		m.setName(s2);
 		checkRicInstanceKeyName(m);
-		Assert.assertEquals(m, m);
+		Assert.assertTrue(m.equals(m));
+		Assert.assertFalse(m.equals(null));
+		Assert.assertFalse(m.equals(new RicInstanceKeyName()));
 		Assert.assertNotEquals(1, m.hashCode());
 		logger.info(m.toString());
 	}
@@ -159,9 +168,42 @@ public class ModelTest extends AbstractModelTest {
 		m.setKey(s3);
 		m.setName(s4);
 		checkRicInstance(m);
-		Assert.assertEquals(m, m);
+		Assert.assertTrue(m.equals(m));
+		Assert.assertFalse(m.equals(null));
+		Assert.assertFalse(m.equals(new RicInstance()));
 		Assert.assertNotEquals(1, m.hashCode());
 		logger.info(m.toString());
 	}
 
+	private void checkRicRegion(RicRegion m) {
+		Assert.assertEquals(s1, m.getName());
+	}
+
+	@Test
+	public void testRicRegion() {
+		RicRegion m = new RicRegion();
+		m.setName(s1);
+		checkRicRegion(m);
+		Assert.assertTrue(m.equals(m));
+		Assert.assertFalse(m.equals(null));
+		Assert.assertFalse(m.equals(new RicRegion()));
+		Assert.assertNotEquals(1, m.hashCode());
+		logger.info(m.toString());
+	}
+
+	@Test
+	public void testRicRegionList() {
+		RicRegionList m = new RicRegionList();
+		List<RicRegion> list = new ArrayList<>();
+		m = new RicRegionList(list);
+		Assert.assertEquals(list, m.getRegions());
+		Assert.assertNotNull(m.getSimpleInstances());
+		try {
+			m.getInstance(s1);
+		} catch (UnknownInstanceException ex) {
+			logger.info("failed as expected: {}", ex.toString());
+		}
+		logger.info(m.toString());
+	}
+
 }