Add step2_Delete test case to delete a context. The sequential tests now are able to create and delete the test contexts.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/resource-management/resource-manager@162341 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
9c3f356eb4
commit
f1e50d4d15
|
@ -115,13 +115,12 @@ public class RMContextTest extends JerseyTest {
|
||||||
if (skipTest)
|
if (skipTest)
|
||||||
return;
|
return;
|
||||||
Context newContext = new ContextImpl(context1Name, context1UUID);
|
Context newContext = new ContextImpl(context1Name, context1UUID);
|
||||||
System.out.println(newContext.getHeader().getUUID().toString());
|
|
||||||
try {
|
try {
|
||||||
System.out.print(ISMapper.marshal(newContext));
|
System.out.print(ISMapper.marshal(newContext));
|
||||||
Response create = target("context").queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request()
|
Response create = target("context").queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request()
|
||||||
.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
|
.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
|
||||||
assertNotNull(create);
|
assertNotNull(create);
|
||||||
if (create.getStatusInfo() == Status.OK) {
|
if (create.getStatusInfo() == Status.CREATED) {
|
||||||
String message = create.readEntity(String.class);
|
String message = create.readEntity(String.class);
|
||||||
System.out.println("RM says: " + message);
|
System.out.println("RM says: " + message);
|
||||||
}else {
|
}else {
|
||||||
|
@ -145,14 +144,14 @@ public class RMContextTest extends JerseyTest {
|
||||||
public void step2_Delete() {
|
public void step2_Delete() {
|
||||||
if (skipTest)
|
if (skipTest)
|
||||||
return;
|
return;
|
||||||
Context newContext = new ContextImpl(context1Name);
|
|
||||||
try {
|
try {
|
||||||
Response create = target("context").request()
|
Response create = target(RMContextPath.CONTEXT_ROOT).path(context1UUID.toString())
|
||||||
.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
|
.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR)
|
||||||
|
.request().delete();
|
||||||
assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
|
assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
|
||||||
Status.BAD_REQUEST.getStatusCode(), create.getStatus());
|
Status.OK.getStatusCode(), create.getStatus());
|
||||||
} catch (JsonProcessingException e) {
|
} catch (Exception e) {
|
||||||
assertFalse("Failed to marshal the context.", false);
|
assertFalse("Failed to delete the context.", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -168,7 +167,7 @@ public class RMContextTest extends JerseyTest {
|
||||||
Context newContext = new ContextImpl(context1Name);
|
Context newContext = new ContextImpl(context1Name);
|
||||||
newContext.setParent(new ContextImpl("DoNotExist"));
|
newContext.setParent(new ContextImpl("DoNotExist"));
|
||||||
try {
|
try {
|
||||||
Response create = target("context").request()
|
Response create = target(RMContextPath.CONTEXT_ROOT).request()
|
||||||
.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
|
.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
|
||||||
assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
|
assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
|
||||||
Status.BAD_REQUEST.getStatusCode(), create.getStatus());
|
Status.BAD_REQUEST.getStatusCode(), create.getStatus());
|
||||||
|
|
Loading…
Reference in New Issue