gCubeSystem
/
resource-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test the ErrorCode after with the new deserialization of the entity. 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/resource-management/resource-manager@162829 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Manuele Simi 2018-02-01 03:32:56 +00:00
parent 3adf77e8bd
commit 85bacd7afe
3 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
io/src/main/java/org/gcube/resourcemanagement/manager/io/codeexceptions/WebCodeException.java
View File

@ -1,7 +1,6 @@
package org.gcube.resourcemanagement.manager.io.codeexceptions;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
/**

8
webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java
View File

@ -48,9 +48,9 @@ public class RMContext {
logger.info("Force URL: " + rrURL);
ContextHolder holder = new ContextHolder(json);
ResponseFromResourceRegistry returned = CreateRequest.fromHolder(holder).forceURL(rrURL).submit();
if (!returned.wasSuccessful()) {
/* if (!returned.wasSuccessful()) {
throw new WebCodeException(new RMContextDoesNotExistException("too bad"));
}
}*/
return this.buildResponse(returned,Status.CREATED,"Context successfully created.","Failed to create the context.");
}
@ -65,9 +65,9 @@ public class RMContext {
logger.info("Requested to delete context with id {}", uuid);
logger.info("Force URL: " + rrURL);
ResponseFromResourceRegistry returned = DeleteRequest.fromUUID(UUID.fromString(uuid)).forceURL(rrURL).submit();
if (!returned.wasSuccessful()) {
/* if (!returned.wasSuccessful()) {
throw new WebCodeException(new RMContextDoesNotExistException());
}
}*/
return this.buildResponse(returned,Status.OK,"Context successfully deleted.","Failed to delete the context.");
}

44
webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java
View File

@ -24,8 +24,9 @@ import org.gcube.informationsystem.impl.utils.ISMapper;
import org.gcube.informationsystem.model.entity.Context;
import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient;
import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl;
import org.gcube.resourcemanagement.manager.io.codeexceptions.CodeFinder;
import org.gcube.resourcemanagement.manager.io.codeexceptions.ErrorCode;
import org.gcube.resourcemanagement.manager.io.codeexceptions.SerializableErrorEntity;
import org.gcube.resourcemanagement.manager.io.codeexceptions.CodeFinder;
import org.gcube.resourcemanagement.manager.io.codeexceptions.deserializer.ErrorEntityManager;
import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode;
import org.gcube.resourcemanagement.manager.io.rs.RMContextDoesNotExistException;
@ -40,7 +41,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.BlockJUnit4ClassRunner;
import org.junit.runners.MethodSorters;
import org.omg.IOP.ExceptionDetailMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -143,9 +143,10 @@ public class RMContextTest extends JerseyTest {
/**
* Test method for
* {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#create(String)}.
*
* @throws Exception
*/
@Test(expected = RMContextDoesNotExistException.class)
@Test
public void step1_Create() throws Exception {
if (skipTest)
return;
@ -163,10 +164,9 @@ public class RMContextTest extends JerseyTest {
assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
Status.NOT_ACCEPTABLE.getStatusCode(), create.getStatus());
SerializableErrorEntity entity = create.readEntity(SerializableErrorEntity.class);
//try {
logger.info("about to load " + entity.getExceptionClass());
ErrorEntityManager response = new ErrorEntityManager(entity);
if (response.hasException()) {
logger.info("about to load " + entity.getExceptionClass());
try {
throw response.getException();
} catch (Exception e) {
@ -174,6 +174,12 @@ public class RMContextTest extends JerseyTest {
e.printStackTrace();
throw e;
}
} else if (response.hasErrorCode()) {
ErrorCode code = response.getErrorCode();
RMCreateContextCode realCode = CodeFinder.findAndConvert(code, RMCreateContextCode.values());
assertEquals(RMCreateContextCode.CONTEXT_ALREADY_EXISTS, realCode);
} else {
assertTrue("Invalid error response returned.", true);
}
}
@ -194,13 +200,17 @@ public class RMContextTest extends JerseyTest {
Context newContext = new ContextImpl(context2, context2UUID);
newContext.setParent(new ContextImpl("DoNotExist"));
try {
Response create = target(RMContextPath.CONTEXT_ROOT).queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request()
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);
// RMCreateContextCode realCode =
// CodeFinder.findAndConvert(code.getErrorCode(),
// RMCreateContextCode.values());
// assertEquals(RMCreateContextCode.CONTEXT_PARENT_DOES_NOT_EXIST,
// realCode);
} catch (JsonProcessingException e) {
assertFalse("Failed to marshal the context.", false);
}
@ -220,7 +230,8 @@ public class RMContextTest extends JerseyTest {
Queries queries = new Queries();
newContext.setParent(context1UUID);
try {
Response create = target(RMContextPath.CONTEXT_ROOT).queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request()
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"));
assertNotNull(create);
if (create.getStatusInfo().getStatusCode() == Status.CREATED.getStatusCode()) {
@ -230,8 +241,11 @@ public class RMContextTest extends JerseyTest {
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);
// RMCreateContextCode realCode =
// CodeFinder.findAndConvert(code.getErrorCode(),
// RMCreateContextCode.values());
// assertEquals(RMCreateContextCode.CONTEXT_ALREADY_EXISTS,
// realCode);
}
} catch (JsonProcessingException e) {
assertFalse("Failed to marshal the context.", false);
@ -241,6 +255,7 @@ public class RMContextTest extends JerseyTest {
/**
* Test method for
* {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#delete(String, String)}
*
* @throws Exception
*/
@Test
@ -249,8 +264,7 @@ public class RMContextTest extends JerseyTest {
return;
Response delete = target(RMContextPath.CONTEXT_ROOT).path(context2UUID.toString())
.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR)
.request().delete();
.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request().delete();
assertNotNull(delete);
if (delete.getStatusInfo().getStatusCode() == Status.OK.getStatusCode()) {
@ -271,7 +285,6 @@ public class RMContextTest extends JerseyTest {
}
}
/**
* Test method for
* {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#delete(String, String)}
@ -282,8 +295,7 @@ public class RMContextTest extends JerseyTest {
return;
try {
Response delete = target(RMContextPath.CONTEXT_ROOT).path(context1UUID.toString())
.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR)
.request().delete();
.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request().delete();
assertNotNull(delete);
assertEquals("Unexpected returned code. Reason: " + delete.getStatusInfo().getReasonPhrase(),
Status.OK.getStatusCode(), delete.getStatus());