Updates for more code coverage

[dmaap/dbcapi.git] / src / test / java / org / onap / dmaap / dbcapi / resources / DR_SubResourceTest.java

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 48d1016..9ba5776 100644 (file)
--- a/src/test/java/org/onap/dmaap/dbcapi/resources/DR_SubResourceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/resources/DR_SubResourceTest.java
@@ -21,6 +21,8 @@
 package org.onap.dmaap.dbcapi.resources;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.service.*;
+import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
+
 import static org.junit.Assert.*;
 
 import org.junit.After;
@@ -39,16 +41,44 @@ import javax.ws.rs.Path;
 import javax.ws.rs.GET;
 
 public class DR_SubResourceTest extends JerseyTest{
+       
+       static DmaapObjectFactory factory = new DmaapObjectFactory();
 
        @Override
        protected Application configure() {
                return new ResourceConfig()
                                .register( DR_SubResource.class )
-                               .register( FeedResource.class );
+                               .register( FeedResource.class )
+                               .register( DcaeLocationResource.class )
+                               .register( DmaapResource.class );
        }
 
-       private static final String  fmt = "%24s: %s%n";
        String d, un, up, f, p;
+       
+       @Before
+       public void preTest() throws Exception {
+               try {
+
+                       Dmaap dmaap = factory.genDmaap();
+                       Entity<Dmaap> reqEntity = Entity.entity( dmaap, MediaType.APPLICATION_JSON );
+                       Response resp = target( "dmaap").request().post( reqEntity, Response.class );
+                       System.out.println( resp.getStatus() );
+                       assertTrue( resp.getStatus() == 200 );
+               }catch (Exception e ) {
+               }
+               try {
+                       DcaeLocation loc = factory.genDcaeLocation( "central" );
+                       Entity<DcaeLocation> reqEntity = Entity.entity( loc, MediaType.APPLICATION_JSON );
+                       Response resp = target( "dcaeLocations").request().post( reqEntity, Response.class );
+                       System.out.println( "POST dcaeLocation resp=" + resp.getStatus() + " " + resp.readEntity( String.class ));
+                       if ( resp.getStatus() != 409 ) {
+                               assertTrue( resp.getStatus() == 201 );
+                       }
+               } catch (Exception e ) {
+               }
+       
+
+       }
 /*
        @Before
        public void setUp() throws Exception {
@@ -99,7 +129,21 @@ public class DR_SubResourceTest extends JerseyTest{
                
                return dr_sub;
        }
-       
+       private DR_Sub addSubByName( String d, String un, String up, String feedName ) {
+               DR_Sub dr_sub = new DR_Sub( d, un, up, null, 
+                               "https://subscriber.onap.org/foo", "https://dr-prov/sublog", true );
+               
+               dr_sub.setFeedName(feedName);
+
+               Entity<DR_Sub> reqEntity2 = Entity.entity( dr_sub, MediaType.APPLICATION_JSON);
+               Response resp = target( "dr_subs").request().post( reqEntity2, Response.class);
+               System.out.println( "POST dr_subs resp=" + resp.getStatus() );
+               assertTrue( resp.getStatus() == 201 );
+               dr_sub = resp.readEntity( DR_Sub.class );
+               
+               return dr_sub;
+       }
+
        @Test
        public void GetTest() {
                Response resp = target( "dr_subs").request().get( Response.class );
@@ -122,6 +166,20 @@ public class DR_SubResourceTest extends JerseyTest{
                DR_Sub dr_pub = addSub( d, un, up, feed.getFeedId() );
        }
 
+       @Test
+       public void PostTestByName() {
+
+               Feed feed = addFeed( "subPostTest2", "post unit test" );
+               System.out.println( "subPostTest2: feedId=" + feed.getFeedId());
+               
+               String d, un, up;
+               d = "central-onap";
+               un = "user1";
+               up = "secretW0rd";
+
+               DR_Sub dr_pub = addSubByName( d, un, up, feed.getFeedName() );
+       }
+
        @Test
        public void PutTest() {
 
@@ -142,8 +200,9 @@ public class DR_SubResourceTest extends JerseyTest{
                System.out.println( "PUT dr_subs resp=" + resp.getStatus() );
                assertTrue( resp.getStatus() == 200 );
        }
-/*
- * TODO: figure out how to check delete() response
+
+
+// TODO: figure out how to check delete() response
        @Test
        public void DelTest() {
 
@@ -161,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 );
        }
-*/
+
 
 }