X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FTopicResourceTest.java;h=04c1bda6683e2552bf043e652c8b06168179020b;hb=0654d98f69b80b8d932dd33a5dcc56dbecc6a64e;hp=ac22e17425089d8fe24b472e36450f7e95c57fba;hpb=bfe1f5204aa40a4178c005f23e530401b991ac58;p=dmaap%2Fdbcapi.git

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 ac22e17..04c1bda 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java
@@ -30,6 +30,7 @@ import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.dmaap.dbcapi.database.DatabaseClass;
 import org.onap.dmaap.dbcapi.model.DcaeLocation;
 import org.onap.dmaap.dbcapi.model.Dmaap;
 import org.onap.dmaap.dbcapi.model.MR_Cluster;
@@ -53,18 +54,24 @@ public class TopicResourceTest extends JerseyTest {
 
 	private static final String  fmt = "%24s: %s%n";
 
-
-
+	private boolean is2xx(int val ) {
+		if ( val >= 200 && val < 300 ) {
+			return true;
+		}
+		return false;
+	}
 
 	@Before
 	public void preTest() throws Exception {
+		DatabaseClass.clearDatabase();
 		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 );
+			System.out.println( "POST dmaap resp=" + resp.getStatus() );
+			assertTrue( is2xx( resp.getStatus()) );
+		
 		}catch (Exception e ) {
 		}
 		try {
@@ -73,7 +80,7 @@ public class TopicResourceTest extends JerseyTest {
 			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 );
+				assertTrue( is2xx( resp.getStatus())  );
 			}
 		} catch (Exception e ) {
 		}
@@ -83,7 +90,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() == 200 );
+				assertTrue( is2xx( resp.getStatus()) );
 			}	
 		} catch (Exception e ) {