X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Ftestframework%2FDmaapObjectFactory.java;h=9d45a54c5823e8ff12cd43ff75fd3d7e72582e06;hb=f4088bd4e2a872f5a10b58df00d6811351f8c265;hp=9d3c8688e915097208a91b866c9f2644c5f52195;hpb=d5d37c0477744cbaa6a9d9fc690c0dafbb2d1868;p=dmaap%2Fdbcapi.git

diff --git a/src/test/java/org/onap/dmaap/dbcapi/testframework/DmaapObjectFactory.java b/src/test/java/org/onap/dmaap/dbcapi/testframework/DmaapObjectFactory.java
index 9d3c868..9d45a54 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/testframework/DmaapObjectFactory.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/testframework/DmaapObjectFactory.java
@@ -19,30 +19,9 @@
  */
 package org.onap.dmaap.dbcapi.testframework;
 
-import org.onap.dmaap.dbcapi.model.DR_Node;
-import org.onap.dmaap.dbcapi.model.DR_Sub;
-import org.onap.dmaap.dbcapi.model.DcaeLocation;
-import org.onap.dmaap.dbcapi.model.Dmaap;
-import org.onap.dmaap.dbcapi.model.FqtnType;
-import org.onap.dmaap.dbcapi.model.MR_Client;
-import org.onap.dmaap.dbcapi.model.MR_Cluster;
-import org.onap.dmaap.dbcapi.model.Topic;
+import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.util.RandomInteger;
 
-import static org.junit.Assert.*;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static java.lang.System.out;
-import static java.lang.System.err;
-
 public class DmaapObjectFactory {
 
 	/*
@@ -71,9 +50,11 @@ public class DmaapObjectFactory {
 	private static final String edge_subnet = "10.10.20.0/24";
 	private static final String edge_cluster_fqdn = "localhost";
 	private static final String[]hosts = { "host1", "host2", "host3" };
+	private static final String port = "3904";
+	private static final String prot = "http";
 
 	public Dmaap genDmaap() {
-		return new Dmaap( dmaap_ver, dmaap_topic_root, dmaap_name, dmaap_dr, dmaap_log_url, dmaap_mm_topic, "nk", "ako" );
+		return new Dmaap.DmaapBuilder().setVer(dmaap_ver).setTnr(dmaap_topic_root).setDn(dmaap_name).setDpu(dmaap_dr).setLu(dmaap_log_url).setBat(dmaap_mm_topic).setNk("nk").setAko("ako").createDmaap();
 	}
 
 	public DcaeLocation genDcaeLocation( String layer ) {
@@ -86,9 +67,9 @@ public class DmaapObjectFactory {
 
 	public MR_Cluster genMR_Cluster( String layer ) {
 		if ( layer.contains( "edge" ) ) {
-			return new MR_Cluster( edge_loc, edge_cluster_fqdn, "ignore", hosts );
+			return new MR_Cluster( edge_loc, edge_cluster_fqdn,  prot, port );
 		}
-		return new MR_Cluster( central_loc, central_cluster_fqdn, "ignore", hosts );
+		return new MR_Cluster( central_loc, central_cluster_fqdn, prot, port );
 	}
 
 	public Topic genSimpleTopic( String tname ) {
@@ -97,6 +78,7 @@ public class DmaapObjectFactory {
         t.setFqtnStyle( FqtnType.Validator("none") );
         t.setTopicDescription( "a simple Topic named " + tname );
         t.setOwner( "ut");
+        t.setFqtn(t.genFqtn());
 		return t;
 	}