Updates for more code coverage

[dmaap/dbcapi.git] / src / test / java / org / onap / dmaap / dbcapi / service / TopicServiceTest.java

diff --git a/src/test/java/org/onap/dmaap/dbcapi/service/TopicServiceTest.java b/src/test/java/org/onap/dmaap/dbcapi/service/TopicServiceTest.java
index 8fd7b47..f571520 100644 (file)
--- a/src/test/java/org/onap/dmaap/dbcapi/service/TopicServiceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/service/TopicServiceTest.java
@@ -20,6 +20,7 @@
 package org.onap.dmaap.dbcapi.service;
 
 import  org.onap.dmaap.dbcapi.model.*;
+import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
 
 import static org.junit.Assert.*;
@@ -33,17 +34,42 @@ import java.util.ArrayList;
 public class TopicServiceTest {
 
        private static final String  fmt = "%24s: %s%n";
-
+       private static DmaapObjectFactory factory = new DmaapObjectFactory();
        ReflectionHarness rh = new ReflectionHarness();
 
-       TopicService ts;
-       MR_ClusterService mcs;
-       String locname = "central-onap";
+       private TopicService ts;
+       private MR_ClusterService mcs;
+       private MR_ClientService cls;
+       private DcaeLocationService dls;
+
+       DmaapService ds;
+       String locname;
 
        @Before
        public void setUp() throws Exception {
+               ts = new TopicService();
+               assert( ts != null );
+               mcs = new MR_ClusterService();
+               assert( mcs != null );
+               Dmaap nd = factory.genDmaap();
+               ds = new DmaapService();
+               ds.addDmaap( nd );
                ts = new TopicService();
                mcs = new MR_ClusterService();
+               cls = new MR_ClientService();
+
+               dls = new DcaeLocationService();
+               DcaeLocation loc = factory.genDcaeLocation( "central" );
+               locname = loc.getDcaeLocationName();
+               dls.addDcaeLocation( loc );
+               loc = factory.genDcaeLocation( "edge");
+
+               ApiError err = new ApiError();
+               
+               MR_Cluster node = factory.genMR_Cluster( "central" );
+               mcs.addMr_Cluster( node, err);
+               node = factory.genMR_Cluster("edge" );
+               mcs.addMr_Cluster(node,  err);
        }
 
        @After
@@ -68,32 +94,31 @@ public class TopicServiceTest {
 
        @Test
        public void test3() {
-               Topic topic = new Topic();
+               String t = "test3";
+               Topic topic = factory.genSimpleTopic( t );
                ApiError err = new ApiError();
-               topic.setTopicName( "test3" );
-               topic.setFqtnStyle( FqtnType.Validator("none") );
-               topic.getFqtn();
+               
                Topic nTopic = ts.addTopic( topic, err, false );
                if ( nTopic != null ) {
-                       assertTrue( nTopic.getTopicName().equals( topic.getTopicName() ));
+                       assertTrue( nTopic.getTopicName().equals( t ));
                }
 
        }
 
        @Test
        public void test3a() {
-               Topic topic = new Topic();
+
+
                ApiError err = new ApiError();
-               topic.setTopicName( "test3" );
-               topic.setFqtnStyle( FqtnType.Validator("none") );
-               topic.getFqtn();
+
                String t = "org.onap.dmaap.interestingTopic";
+               Topic topic = factory.genSimpleTopic(t);
                String f = "mrc.onap.org:3904/events/org.onap.dmaap.interestingTopic";
                String c = "publisher";
                String[] a = { "sub", "view" };
-               MR_Client sub = new MR_Client( locname, f, c, a );
+               MR_Client sub = factory.genMR_Client("central",  f, c, a );
                String[] b = { "pub", "view" };
-               MR_Client pub = new MR_Client( "edge", f, c, b );
+               MR_Client pub = factory.genMR_Client( "edge", f, c, b );
                ArrayList<MR_Client> clients = new ArrayList<MR_Client>();
 
                clients.add( sub );
@@ -106,7 +131,7 @@ public class TopicServiceTest {
                
                Topic nTopic = ts.addTopic( topic, err, false );
                if ( nTopic != null ) {
-                       assertTrue( nTopic.getTopicName().equals( topic.getTopicName() ));
+                       assertTrue( nTopic.getTopicName().equals( t ));
                }
                
 
@@ -122,21 +147,60 @@ public class TopicServiceTest {
        @Test
        public void test5() {
                ApiError err = new ApiError();
-/*
-
-TODO: find a null pointer in here...
-               String[] hl = { "host1", "host2", "host3" };
-               String loc = "central-onap";
-               MR_Cluster cluster = new MR_Cluster( loc, "localhost", "", hl );
-               mcs.addMr_Cluster( cluster, err );
-               Topic topic = new Topic();
-               topic.setTopicName( "test5" );
-               topic.setFqtnStyle( FqtnType.Validator("none") );
-               topic.setReplicationCase( ReplicationType.Validator("none") );
-               String f = topic.getFqtn();
+
+               Topic topic = factory.genSimpleTopic("test5");
                Topic nTopic = ts.updateTopic( topic, err );
-*/
-               assertTrue( err.getCode() == 0 );
+
+               assertTrue( err.getCode() == 200 );
+       }
+       
+       @Test
+       public void bridgeTest6() {
+               ApiError err = new ApiError();
+
+               String t = "org.onap.dmaap.bridgingTopic";
+               Topic topic = factory.genSimpleTopic(t);
+               topic.setReplicationCase( ReplicationType.REPLICATION_EDGE_TO_CENTRAL );
+
+               String c = "publisher";
+               String[] a = { "sub", "view" };
+               MR_Client sub = factory.genMR_Client("central",  topic.getFqtn(), c, a );
+               String[] b = { "pub", "view" };
+               MR_Client pub = factory.genMR_Client( "edge", topic.getFqtn(), c, b );
+               ArrayList<MR_Client> clients = new ArrayList<MR_Client>();
+
+               clients.add( sub );
+               clients.add( pub );
+
+               topic.setClients( clients );
+
+               Topic nTopic = ts.updateTopic( topic, err );
+
+               assertTrue( err.getCode() == 200 );
+       }
+       @Test
+       public void bridgeTest7() {
+               ApiError err = new ApiError();
+
+               String t = "org.onap.dmaap.bridgingTopic7";
+               Topic topic = factory.genSimpleTopic(t);
+               topic.setReplicationCase( ReplicationType.REPLICATION_CENTRAL_TO_EDGE );
+
+               String c = "publisher";
+               String[] a = { "sub", "view" };
+               MR_Client sub = factory.genMR_Client("edge",  topic.getFqtn(), c, a );
+               String[] b = { "pub", "view" };
+               MR_Client pub = factory.genMR_Client( "central", topic.getFqtn(), c, b );
+               ArrayList<MR_Client> clients = new ArrayList<MR_Client>();
+
+               clients.add( sub );
+               clients.add( pub );
+
+               topic.setClients( clients );
+
+               Topic nTopic = ts.updateTopic( topic, err );
+
+               assertTrue( err.getCode() == 200 );
        }
 
 }