Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
More test cleanup
  • Loading branch information
ajs6f committed Feb 7, 2013
1 parent cab8def commit 3547faa
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 24 deletions.
6 changes: 3 additions & 3 deletions src/test/java/org/fcrepo/modeshape/AbstractResourceTest.java
Expand Up @@ -29,16 +29,16 @@ public void setLogger() {
logger = LoggerFactory.getLogger(this.getClass());
}

protected PostMethod postObjectMethod(final String pid) {
protected static PostMethod postObjMethod(final String pid) {
return new PostMethod(serverAddress + "rest/objects/" + pid);
}

protected PostMethod postDSMethod(final String pid, final String ds) {
protected static PostMethod postDSMethod(final String pid, final String ds) {
return new PostMethod(serverAddress + "rest/objects/" + pid
+ "/datastreams/" + ds);
}

protected PutMethod putDSMethod(final String pid, final String ds) {
protected static PutMethod putDSMethod(final String pid, final String ds) {
return new PutMethod(serverAddress + "rest/objects/" + pid
+ "/datastreams/" + ds);
}
Expand Down
14 changes: 7 additions & 7 deletions src/test/java/org/fcrepo/modeshape/FedoraDatastreamsTest.java
Expand Up @@ -18,7 +18,7 @@ public class FedoraDatastreamsTest extends AbstractResourceTest {

@Test
public void testGetDatastreams() throws Exception {
PostMethod pmethod = postObjectMethod("asdf");
PostMethod pmethod = postObjMethod("asdf");
client.executeMethod(pmethod);

GetMethod method = new GetMethod(serverAddress
Expand All @@ -29,7 +29,7 @@ public void testGetDatastreams() throws Exception {

@Test
public void testAddDatastream() throws Exception {
PostMethod pmethod = postObjectMethod("asdf");
PostMethod pmethod = postObjMethod("asdf");
client.executeMethod(pmethod);

PostMethod method = postDSMethod("asdf", "zxc");
Expand All @@ -39,7 +39,7 @@ public void testAddDatastream() throws Exception {

@Test
public void testMutateDatastream() throws Exception {
PostMethod createObjectMethod = postObjectMethod("asdf2");
PostMethod createObjectMethod = postObjMethod("asdf2");
Integer status = client.executeMethod(createObjectMethod);
assertEquals("Couldn't create an object!", (Integer) 201, status);

Expand All @@ -65,7 +65,7 @@ public void testMutateDatastream() throws Exception {

@Test
public void testGetDatastream() throws Exception {
PostMethod pmethod = postObjectMethod("asdf");
PostMethod pmethod = postObjMethod("asdf");
client.executeMethod(pmethod);

GetMethod method_test_get = new GetMethod(serverAddress
Expand All @@ -85,7 +85,7 @@ public void testGetDatastream() throws Exception {

@Test
public void testDeleteDatastream() throws Exception {
PostMethod pmethod = postObjectMethod("asdf");
PostMethod pmethod = postObjMethod("asdf");
client.executeMethod(pmethod);

PostMethod method = postDSMethod("asdf", "lkjh");
Expand All @@ -110,7 +110,7 @@ public void testDeleteDatastream() throws Exception {

@Test
public void testGetDatastreamContent() throws Exception {
final PostMethod createObjMethod = postObjectMethod("testfoo");
final PostMethod createObjMethod = postObjMethod("testfoo");
client.executeMethod(createObjMethod);
assertEquals(201, client.executeMethod(createObjMethod));

Expand All @@ -127,7 +127,7 @@ public void testGetDatastreamContent() throws Exception {

@Test
public void testMultipleDatastreams() throws Exception {
final PostMethod createObjMethod = postObjectMethod("testfoo");
final PostMethod createObjMethod = postObjMethod("testfoo");
client.executeMethod(createObjMethod);
assertEquals(201, client.executeMethod(createObjMethod));

Expand Down
23 changes: 9 additions & 14 deletions src/test/java/org/fcrepo/modeshape/FedoraObjectsTest.java
Expand Up @@ -13,21 +13,18 @@ public class FedoraObjectsTest extends AbstractResourceTest {

@Test
public void testIngest() throws Exception {
PostMethod method = new PostMethod(serverAddress + "rest/objects/asdf");
int status = client.executeMethod(method);
assertEquals(201, status);
PostMethod method = postObjMethod("asdf");
assertEquals(201, client.executeMethod(method));
}

@Test
public void testGetObjectInXML() throws Exception {
PostMethod createObjMethod = new PostMethod(serverAddress
+ "rest/objects/fdsa");
PostMethod createObjMethod = postObjMethod("fdsa");
client.executeMethod(createObjMethod);

GetMethod getObjMethod = new GetMethod(serverAddress
+ "rest/objects/fdsa");
int status = client.executeMethod(getObjMethod);
assertEquals(200, status);
assertEquals(200, client.executeMethod(getObjMethod));
String response = getObjMethod.getResponseBodyAsString();
logger.debug("Retrieved object profile:\n" + response);
assertTrue("Object had wrong PID!",
Expand All @@ -36,18 +33,16 @@ public void testGetObjectInXML() throws Exception {

@Test
public void testDeleteObject() throws Exception {
PostMethod createObjmethod = new PostMethod(serverAddress
+ "rest/objects/asdf");
client.executeMethod(createObjmethod);
PostMethod createObjmethod = postObjMethod("asdf");
assertEquals(201, client.executeMethod(createObjmethod));

DeleteMethod delMethod = new DeleteMethod(serverAddress
+ "rest/objects/asdf");
int status = client.executeMethod(delMethod);
assertEquals(204, status);
assertEquals(204, client.executeMethod(delMethod));

GetMethod getMethod = new GetMethod(serverAddress + "rest/objects/asdf");
status = client.executeMethod(getMethod);
assertEquals("Object wasn't really deleted!", 404, status);
assertEquals("Object wasn't really deleted!", 404,
client.executeMethod(getMethod));
}

}

0 comments on commit 3547faa

Please sign in to comment.