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;
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 {
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 ) {
}
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 ) {