X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fmodel%2FMR_ClusterTest.java;h=514e0d1a1a2c672853a3997e90b5e944d1499db9;hb=bfe1f5204aa40a4178c005f23e530401b991ac58;hp=ebe7b1edb6c04ea421a36f4beb6f4252c8b6fcfc;hpb=1c6b5fa580c9b82e17b710dbc4cf9bbce57eb5bc;p=dmaap%2Fdbcapi.git

diff --git a/src/test/java/org/onap/dmaap/dbcapi/model/MR_ClusterTest.java b/src/test/java/org/onap/dmaap/dbcapi/model/MR_ClusterTest.java
index ebe7b1e..514e0d1 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/model/MR_ClusterTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/model/MR_ClusterTest.java
@@ -30,7 +30,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
 public class MR_ClusterTest {
-	String d, fqdn;
+	String d, fqdn, repGrp, p1, p2, prot, p0;
 
 	ReflectionHarness rh = new ReflectionHarness();
 
@@ -38,6 +38,14 @@ public class MR_ClusterTest {
 	public void setUp() throws Exception {
 		d = "central-onap";
 		fqdn = "mr.onap.org";
+		repGrp = "zeppelin";
+		prot = "http";
+		p0 = "3904";
+		p1 = "9092";
+		p2 = "2323";
+		
+	
+		
 	}
 
 	@After
@@ -58,10 +66,45 @@ public class MR_ClusterTest {
 	@Test
 	public void testMR_ClusterClassConstructor() {
 
-		MR_Cluster t = new MR_Cluster( d, fqdn, "http", "3904");
+		MR_Cluster t = new MR_Cluster( d, fqdn, prot, p0);
+	
+		assertTrue( t.getDcaeLocationName() == d  );
+		assertTrue( t.getFqdn() == fqdn  );
+		assertTrue( t.getTopicProtocol() == prot );
+		assertTrue( t.getTopicPort() == p0 );
+		
+		// pass null params to trigger default settings
+		 t = new MR_Cluster( d, fqdn, null, null );
+		
+		assertTrue( t.getDcaeLocationName() == d  );
+		assertTrue( t.getFqdn() == fqdn  );
+		assertTrue( t.getTopicProtocol() != null );
+		assertTrue( t.getTopicPort() != null );
+	}
+	
+	@Test
+	public void testMR_ClusterManyArgsClassConstructor() {
+
+		MR_Cluster t = new MR_Cluster( d, fqdn, prot, p0, repGrp, p1, p2 );
 	
 		assertTrue( t.getDcaeLocationName() == d  );
 		assertTrue( t.getFqdn() == fqdn  );
+		assertTrue( t.getTopicProtocol() == prot );
+		assertTrue( t.getTopicPort() == p0 );
+		assertTrue( t.getReplicationGroup() == repGrp  );
+		assertTrue( t.getSourceReplicationPort() == p1  );
+		assertTrue( t.getTargetReplicationPort() == p2 );
+		
+		// pass null params to trigger default settings
+		t = new MR_Cluster( d, fqdn, null, null, null, null, null );
+		
+		assertTrue( t.getDcaeLocationName() == d  );
+		assertTrue( t.getFqdn() == fqdn  );
+		assertTrue( t.getTopicProtocol() != null );
+		assertTrue( t.getTopicPort() != null );
+		assertTrue( t.getReplicationGroup() != null  );
+		assertTrue( t.getSourceReplicationPort() != null  );
+		assertTrue( t.getTargetReplicationPort() != null );
 	}
 
 	@Test
@@ -72,7 +115,13 @@ public class MR_ClusterTest {
 		assertTrue( t.getDcaeLocationName() == null  );
 		assertTrue( t.getFqdn() == null  );
 
-		String fqtn = t.genTopicURL( "cluster2.onap.org", "org.onap.topic2" );	
+		String override = "cluster2.onap.org";
+		String	topic2 = "org.onap.topic2";
+		String fqtn = t.genTopicURL( override, topic2 );	
+		assertTrue( fqtn.contains( override) && fqtn.contains(topic2));
+		
+		fqtn = t.genTopicURL( null, "org.onap.topic2" );
+		assertTrue(fqtn.contains(topic2));
 	}