Adapt test cases in the RM service to the latest changes in gxRest.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/resource-management/resource-manager@163351 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
856b10efa6
commit
67915767e1
|
@ -12,6 +12,7 @@ import javax.ws.rs.core.Application;
|
|||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.core.Response.Status;
|
||||
import javax.ws.rs.core.Response.StatusType;
|
||||
|
||||
import org.gcube.common.authorization.client.Constants;
|
||||
import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
|
||||
|
@ -154,19 +155,18 @@ public class RMContextTest extends JerseyTest {
|
|||
Response create = target("context").queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request()
|
||||
.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
|
||||
assertNotNull(create);
|
||||
GXInboundResponse response = new GXInboundResponse(create);
|
||||
|
||||
logger.info("RM returned status: " + create.getStatusInfo());
|
||||
if (create.getStatusInfo().getStatusCode() == Status.CREATED.getStatusCode()) {
|
||||
String message = create.readEntity(String.class);
|
||||
logger.info("RM says: " + message);
|
||||
if (response.hasCREATEDCode()) {
|
||||
logger.info("RM says: " + response.getMessage());
|
||||
} else {
|
||||
assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
|
||||
Status.NOT_ACCEPTABLE.getStatusCode(), create.getStatus());
|
||||
GXInboundResponse response = new GXInboundResponse(create);
|
||||
Status.NOT_ACCEPTABLE.getStatusCode(), response.getHTTPStatus().getStatusCode());
|
||||
if (response.hasException()) {
|
||||
try {
|
||||
throw response.getException();
|
||||
} catch (Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
throw e;
|
||||
}
|
||||
|
@ -288,8 +288,14 @@ public class RMContextTest extends JerseyTest {
|
|||
.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request().delete();
|
||||
assertNotNull(delete);
|
||||
GXInboundResponse response = new GXInboundResponse(delete);
|
||||
assertTrue("Unexpected returned code. Reason: " + response.getHTTPStatus().getReasonPhrase(),
|
||||
response.hasOKCode());
|
||||
StatusType status = response.getHTTPStatus();
|
||||
logger.info("Returnes status: " + status.getStatusCode());
|
||||
logger.info("Message: " + status.getReasonPhrase());
|
||||
if (!response.hasOKCode()) {
|
||||
assertTrue("Unexpected returned code. Reason: " + response.getHTTPStatus().getReasonPhrase(),
|
||||
response.hasNOT_ACCEPTABLECode());
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
assertFalse("Failed to delete the context.", false);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue