Code Review
/
dmaap
/
dbcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Provision topics on mr_clusters
[dmaap/dbcapi.git]
/
src
/
test
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
resources
/
MR_ClusterResourceTest.java
diff --git
a/src/test/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResourceTest.java
b/src/test/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResourceTest.java
index
7a57794
..
e4d1da0
100644
(file)
--- a/
src/test/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResourceTest.java
+++ b/
src/test/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResourceTest.java
@@
-64,7
+64,7
@@
public class MR_ClusterResourceTest extends JerseyTest {
@Test
public void GetTest() {
Response resp = target( "mr_clusters").request().get( Response.class );
@Test
public void GetTest() {
Response resp = target( "mr_clusters").request().get( Response.class );
- System.out.println( "GET
feed
resp=" + resp.getStatus() );
+ System.out.println( "GET
MR_Cluster
resp=" + resp.getStatus() );
assertTrue( resp.getStatus() == 200 );
}
assertTrue( resp.getStatus() == 200 );
}
@@
-107,20
+107,20
@@
public class MR_ClusterResourceTest extends JerseyTest {
// first, add it
System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
if( resp.getStatus() != 409 ) {
// first, add it
System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
if( resp.getStatus() != 409 ) {
- assertTrue( resp.getStatus()
== 2
00 );
+ assertTrue( resp.getStatus()
>= 200 && resp.getStatus() < 3
00 );
}
// now change a field
}
// now change a field
- cluster.setHosts( h );
+
reqEntity = Entity.entity( cluster, MediaType.APPLICATION_JSON );
// update with incorrect key
resp = target( "mr_clusters")
reqEntity = Entity.entity( cluster, MediaType.APPLICATION_JSON );
// update with incorrect key
resp = target( "mr_clusters")
- .path(
cluster.getDcaeLocationName()
)
+ .path(
"invalidLocationNam"
)
.request()
.put( reqEntity, Response.class );
System.out.println( "PUT MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity(String.class));
.request()
.put( reqEntity, Response.class );
System.out.println( "PUT MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity(String.class));
- assertTrue( resp.getStatus() ==
200
);
+ assertTrue( resp.getStatus() ==
404
);
// update with correct key
resp = target( "mr_clusters")
// update with correct key
resp = target( "mr_clusters")
@@
-128,7
+128,7
@@
public class MR_ClusterResourceTest extends JerseyTest {
.request()
.put( reqEntity, Response.class );
System.out.println( "PUT MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity(String.class));
.request()
.put( reqEntity, Response.class );
System.out.println( "PUT MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity(String.class));
- assertTrue( resp.getStatus()
== 2
00 );
+ assertTrue( resp.getStatus()
>= 200 && resp.getStatus() < 3
00 );
}
@Test
}
@Test
@@
-163,7
+163,7
@@
public class MR_ClusterResourceTest extends JerseyTest {
System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
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").
// now really delete it
resp = target( "mr_clusters").