diff options
Diffstat (limited to 'src/test/java/org/onap')
5 files changed, 152 insertions, 38 deletions
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)); } diff --git a/src/test/java/org/onap/dmaap/dbcapi/resources/DR_SubResourceTest.java b/src/test/java/org/onap/dmaap/dbcapi/resources/DR_SubResourceTest.java index 2227870..9ba5776 100644 --- a/src/test/java/org/onap/dmaap/dbcapi/resources/DR_SubResourceTest.java +++ b/src/test/java/org/onap/dmaap/dbcapi/resources/DR_SubResourceTest.java @@ -201,8 +201,8 @@ public class DR_SubResourceTest extends JerseyTest{ assertTrue( resp.getStatus() == 200 ); } -/* - * TODO: figure out how to check delete() response + +// TODO: figure out how to check delete() response @Test public void DelTest() { @@ -220,9 +220,9 @@ public class DR_SubResourceTest extends JerseyTest{ .request() .delete(); System.out.println( "DEL dr_subs resp=" + resp.getStatus() ); - assertTrue( resp.getStatus() == 200 ); + assertTrue( resp.getStatus() == 204 ); } -*/ + } diff --git a/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java b/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java index b494a59..ac22e17 100644 --- a/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java +++ b/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java @@ -83,7 +83,7 @@ public class TopicResourceTest extends JerseyTest { Response resp = target( "mr_clusters").request().post( reqEntity, Response.class ); System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) ); if (resp.getStatus() != 409 ) { - assertTrue( resp.getStatus() == 201); + assertTrue( resp.getStatus() == 200 ); } } catch (Exception e ) { 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 --- 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 ); } } 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 0bce106..901b4ea 100644 --- a/src/test/java/org/onap/dmaap/dbcapi/testframework/DmaapObjectFactory.java +++ b/src/test/java/org/onap/dmaap/dbcapi/testframework/DmaapObjectFactory.java @@ -99,6 +99,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; } |