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.MR_Cluster;
import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
-/* may conflict with test framework!
+
@Before
- public void preTest() throws Exception {
+ public void init() throws Exception {
+ DatabaseClass.clearDatabase();
}
-
+/*
@After
public void tearDown() throws Exception {
}
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 && resp.getStatus() < 300);
}
resp = target( "mr_clusters").
path( cluster.getDcaeLocationName()).request().get( Response.class );
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( resp.getStatus() >= 200 && resp.getStatus() < 300 );
}
} catch (Exception e ) {
}
}
// now change a field
- cluster.setHosts( h );
+
reqEntity = Entity.entity( cluster, MediaType.APPLICATION_JSON );
// update with incorrect key
System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
- assertTrue( resp.getStatus() == 201 );
+ assertTrue( resp.getStatus() == 201 || resp.getStatus() == 200 );
// now really delete it
resp = target( "mr_clusters").