Integrate GXInboundResponse.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/resource-management/resource-manager@163246 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
db3d6a3cf7
commit
856b10efa6
|
@ -18,8 +18,8 @@ import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
|
|||
import org.gcube.common.authorization.library.AuthorizationEntry;
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.gxrest.response.inbound.GXInboundResponse;
|
||||
import org.gcube.common.gxrest.response.outbound.CodeFinder;
|
||||
import org.gcube.common.gxrest.response.outbound.ErrorCode;
|
||||
import org.gcube.common.gxrest.response.outbound.deserialization.SerializableErrorEntity;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.informationsystem.impl.entity.ContextImpl;
|
||||
import org.gcube.informationsystem.impl.utils.ISMapper;
|
||||
|
@ -199,14 +199,15 @@ public class RMContextTest extends JerseyTest {
|
|||
Response create = target(RMContextPath.CONTEXT_ROOT).queryParam(RMContextPath.FORCE_RRURL_PARAM, RR)
|
||||
.request()
|
||||
.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
|
||||
assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
|
||||
Status.NOT_ACCEPTABLE.getStatusCode(), create.getStatus());
|
||||
SerializableErrorEntity code = create.readEntity(SerializableErrorEntity.class);
|
||||
// RMCreateContextCode realCode =
|
||||
// CodeFinder.findAndConvert(code.getErrorCode(),
|
||||
// RMCreateContextCode.values());
|
||||
// assertEquals(RMCreateContextCode.CONTEXT_PARENT_DOES_NOT_EXIST,
|
||||
// realCode);
|
||||
GXInboundResponse response = new GXInboundResponse(create);
|
||||
|
||||
assertTrue("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
|
||||
response.hasNOT_ACCEPTABLECode());
|
||||
if (response.hasErrorCode()) {
|
||||
RMCreateContextCode realCode = CodeFinder.findAndConvert(response.getErrorCode(),
|
||||
RMCreateContextCode.values());
|
||||
assertEquals(RMCreateContextCode.CONTEXT_PARENT_DOES_NOT_EXIST,realCode);
|
||||
}
|
||||
} catch (JsonProcessingException e) {
|
||||
assertFalse("Failed to marshal the context.", false);
|
||||
}
|
||||
|
@ -230,18 +231,12 @@ public class RMContextTest extends JerseyTest {
|
|||
.request()
|
||||
.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
|
||||
assertNotNull(create);
|
||||
if (create.getStatusInfo().getStatusCode() == Status.CREATED.getStatusCode()) {
|
||||
String message = create.readEntity(String.class);
|
||||
System.out.println("RM says: " + message);
|
||||
GXInboundResponse response = new GXInboundResponse(create);
|
||||
if (response.hasCREATEDCode()) {
|
||||
System.out.println("RM says: " + response.getMessage());
|
||||
} else {
|
||||
assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
|
||||
Status.NOT_ACCEPTABLE.getStatusCode(), create.getStatus());
|
||||
SerializableErrorEntity code = create.readEntity(SerializableErrorEntity.class);
|
||||
// RMCreateContextCode realCode =
|
||||
// CodeFinder.findAndConvert(code.getErrorCode(),
|
||||
// RMCreateContextCode.values());
|
||||
// assertEquals(RMCreateContextCode.CONTEXT_ALREADY_EXISTS,
|
||||
// realCode);
|
||||
assertTrue("Unexpected returned code. Reason: " + response.getHTTPStatus().getReasonPhrase(),
|
||||
response.hasNOT_ACCEPTABLECode());
|
||||
}
|
||||
} catch (JsonProcessingException e) {
|
||||
assertFalse("Failed to marshal the context.", false);
|
||||
|
@ -262,12 +257,12 @@ public class RMContextTest extends JerseyTest {
|
|||
Response delete = target(RMContextPath.CONTEXT_ROOT).path(context2UUID.toString())
|
||||
.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request().delete();
|
||||
assertNotNull(delete);
|
||||
if (delete.getStatusInfo().getStatusCode() == Status.OK.getStatusCode()) {
|
||||
GXInboundResponse response = new GXInboundResponse(delete);
|
||||
if (response.hasOKCode()) {
|
||||
|
||||
} else {
|
||||
assertEquals("Unexpected returned code. Reason: " + delete.getStatusInfo().getReasonPhrase(),
|
||||
Status.NOT_ACCEPTABLE.getStatusCode(), delete.getStatus());
|
||||
GXInboundResponse response = new GXInboundResponse(delete);
|
||||
if (response.hasException()) {
|
||||
try {
|
||||
throw response.getException();
|
||||
|
@ -292,8 +287,9 @@ public class RMContextTest extends JerseyTest {
|
|||
Response delete = target(RMContextPath.CONTEXT_ROOT).path(context1UUID.toString())
|
||||
.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request().delete();
|
||||
assertNotNull(delete);
|
||||
assertEquals("Unexpected returned code. Reason: " + delete.getStatusInfo().getReasonPhrase(),
|
||||
Status.OK.getStatusCode(), delete.getStatus());
|
||||
GXInboundResponse response = new GXInboundResponse(delete);
|
||||
assertTrue("Unexpected returned code. Reason: " + response.getHTTPStatus().getReasonPhrase(),
|
||||
response.hasOKCode());
|
||||
} catch (Exception e) {
|
||||
assertFalse("Failed to delete the context.", false);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue