Skip to content

Commit

Permalink
use unique node names for the integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbeer
cbeer committed Mar 20, 2013
1 parent 1c5eb5a commit 2b4bfc3
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 33 deletions.
36 changes: 18 additions & 18 deletions fcrepo-kernel/src/test/java/org/fcrepo/integration/DatastreamIT.java
View file
Expand Up @@ -31,47 +31,47 @@ public class DatastreamIT extends AbstractIT {
@Test
public void testLabel() throws Exception {
Session session = repo.login();
createObjectNode(session, "testObject");
createObjectNode(session, "testDatastreamObject");
Node dsNode =
createDatastreamNode(session,
"/objects/testObject/testDatastreamNode",
"/objects/testDatastreamObject/testDatastreamNode",
"application/octet-stream", new ByteArrayInputStream(
"asdf".getBytes()));
new Datastream(dsNode).setLabel("Best datastream ever!");
session.save();
session.logout();
session = repo.login();
final Datastream ds = getDatastream("testObject", "testDatastreamNode");
final Datastream ds = getDatastream("testDatastreamObject", "testDatastreamNode");
assertEquals("Wrong label!", "Best datastream ever!", ds.getLabel());
}

@Test
public void testCreatedDate() throws RepositoryException, IOException, InvalidChecksumException {
Session session = repo.login();
createObjectNode(session, "testObject");
createObjectNode(session, "testDatastreamObject");
createDatastreamNode(session,
"/objects/testObject/testDatastreamNode1",
"/objects/testDatastreamObject/testDatastreamNode1",
"application/octet-stream", new ByteArrayInputStream(
"asdf".getBytes()));
session.save();
session.logout();
session = repo.login();
final Datastream ds = getDatastream("testObject", "testDatastreamNode1");
final Datastream ds = getDatastream("testDatastreamObject", "testDatastreamNode1");
assertNotNull("Couldn't find created date on datastream!", ds.getCreatedDate());
}

@Test
public void testDatastreamContent() throws IOException, RepositoryException, InvalidChecksumException {
Session session = repo.login();
createObjectNode(session, "testObject");
createObjectNode(session, "testDatastreamObject");
createDatastreamNode(session,
"/objects/testObject/testDatastreamNode1",
"/objects/testDatastreamObject/testDatastreamNode1",
"application/octet-stream", new ByteArrayInputStream(
"asdf".getBytes()));

session.save();

final Datastream ds = getDatastream("testObject", "testDatastreamNode1");
final Datastream ds = getDatastream("testDatastreamObject", "testDatastreamNode1");
String contentString = IOUtils.toString(ds.getContent(), "ASCII");

assertEquals("asdf", contentString);
Expand All @@ -81,16 +81,16 @@ public void testDatastreamContent() throws IOException, RepositoryException, Inv
@Test
public void testDatastreamContentDigestAndLength() throws IOException, RepositoryException, InvalidChecksumException {
Session session = repo.login();
createObjectNode(session, "testObject");
createObjectNode(session, "testDatastreamObject");
createDatastreamNode(session,
"/objects/testObject/testDatastreamNode2",
"/objects/testDatastreamObject/testDatastreamNode2",
"application/octet-stream", new ByteArrayInputStream(
"asdf".getBytes()));


session.save();

final Datastream ds = getDatastream("testObject", "testDatastreamNode2");
final Datastream ds = getDatastream("testDatastreamObject", "testDatastreamNode2");
assertEquals("urn:sha1:3da541559918a808c2402bba5012f6c60b27661c", ds
.getContentDigest().toString());
assertEquals(4L, ds.getContentSize());
Expand All @@ -104,16 +104,16 @@ public void testDatastreamContentDigestAndLength() throws IOException, Repositor
@Test
public void testModifyDatastreamContentDigestAndLength() throws IOException, RepositoryException, InvalidChecksumException {
Session session = repo.login();
createObjectNode(session, "testObject");
createObjectNode(session, "testDatastreamObject");
createDatastreamNode(session,
"/objects/testObject/testDatastreamNode3",
"/objects/testDatastreamObject/testDatastreamNode3",
"application/octet-stream", new ByteArrayInputStream(
"asdf".getBytes()));


session.save();

final Datastream ds = getDatastream("testObject", "testDatastreamNode3");
final Datastream ds = getDatastream("testDatastreamObject", "testDatastreamNode3");
ds.setContent(new ByteArrayInputStream(
"0123456789".getBytes()));

Expand All @@ -129,15 +129,15 @@ public void testModifyDatastreamContentDigestAndLength() throws IOException, Rep
@Test
public void testDatastreamContentWithChecksum() throws IOException, RepositoryException, InvalidChecksumException {
Session session = repo.login();
createObjectNode(session, "testObject");
createObjectNode(session, "testDatastreamObject");
createDatastreamNode(session,
"/objects/testObject/testDatastreamNode4",
"/objects/testDatastreamObject/testDatastreamNode4",
"application/octet-stream", new ByteArrayInputStream(
"asdf".getBytes()), "SHA-1", "3da541559918a808c2402bba5012f6c60b27661c");

session.save();

final Datastream ds = getDatastream("testObject", "testDatastreamNode4");
final Datastream ds = getDatastream("testDatastreamObject", "testDatastreamNode4");
assertEquals("urn:sha1:3da541559918a808c2402bba5012f6c60b27661c", ds
.getContentDigest().toString());

Expand Down
6 changes: 3 additions & 3 deletions fcrepo-kernel/src/test/java/org/fcrepo/integration/services/DatastreamServiceIT.java
View file
Expand Up @@ -48,14 +48,14 @@ public void testCreateDatastreamNode() throws Exception {
public void testGetDatastreamContentInputStream() throws Exception {
Session session = repository.login();
InputStream is = new ByteArrayInputStream("asdf".getBytes());
createObjectNode(session, "testObject");
createDatastreamNode(session, "/objects/testObject/testDatastreamNode",
createObjectNode(session, "testDatastreamServiceObject");
createDatastreamNode(session, "/objects/testDatastreamServiceObject/testDatastreamNode",
"application/octet-stream", is);

session.save();
session.logout();
session = repository.login();
final Datastream ds = getDatastream("testObject", "testDatastreamNode");
final Datastream ds = getDatastream("testDatastreamServiceObject", "testDatastreamNode");
assertEquals("asdf", IOUtils.toString(ds.getContent(), "UTF-8"));
session.logout();
}
Expand Down
12 changes: 6 additions & 6 deletions fcrepo-kernel/src/test/java/org/fcrepo/integration/services/LowLevelStorageServiceIT.java
View file
Expand Up @@ -37,16 +37,16 @@ public class LowLevelStorageServiceIT {
public void testChecksumBlobs() throws Exception {

Session session = repo.login();
createObjectNode(session, "testObject");
createObjectNode(session, "testLLObject");
createDatastreamNode(session,
"/objects/testObject/testRepositoryContent",
"/objects/testLLObject/testRepositoryContent",
"application/octet-stream", new ByteArrayInputStream(
"0123456789".getBytes()));


session.save();

final Datastream ds = getDatastream("testObject", "testRepositoryContent");
final Datastream ds = getDatastream("testLLObject", "testRepositoryContent");

final Collection<FixityResult> fixityResults = LowLevelStorageService.getFixity(
ds.getNode(), MessageDigest.getInstance("SHA-1"),
Expand All @@ -62,16 +62,16 @@ public void testChecksumBlobs() throws Exception {
@Test
public void testGetBinaryBlobs() throws Exception {
Session session = repo.login();
createObjectNode(session, "testObject");
createObjectNode(session, "testLLObject");
createDatastreamNode(session,
"/objects/testObject/testRepositoryContent",
"/objects/testLLObject/testRepositoryContent",
"application/octet-stream", new ByteArrayInputStream(
"0123456789".getBytes()));


session.save();

final Datastream ds = getDatastream("testObject", "testRepositoryContent");
final Datastream ds = getDatastream("testLLObject", "testRepositoryContent");

Iterator<InputStream> inputStreamList = getBinaryBlobs(ds.getNode()).values().iterator();

Expand Down
11 changes: 5 additions & 6 deletions fcrepo-kernel/src/test/java/org/fcrepo/integration/utils/SelfHealingIT.java
View file
Expand Up @@ -96,19 +96,18 @@ private Collection<FixityResult> getNodeFixity(final Datastream ds) throws NoSuc

}

// @Ignore("doesn't play nice with other tests")
@Test
public void testEddiesMagicSelfHealingRepository() throws Exception {
Session session = repo.login();

createObjectNode(session, "testObjectzzz");
createObjectNode(session, "test");

createDatastreamNode(session,
"/objects/testObjectzzz/testDatastreamNode4",
"/objects/testSelfHealingObject/testDatastreamNode4",
"application/octet-stream", new ByteArrayInputStream(
"9876543210".getBytes()), "SHA-1", "9cd656169600157ec17231dcf0613c94932efcdc");
createDatastreamNode(session,
"/objects/testObjectzzz/testDatastreamNode5",
"/objects/testSelfHealingObject/testDatastreamNode5",
"application/octet-stream", new ByteArrayInputStream(
"0123456789".getBytes()), "SHA-1", "87acec17cd9dcd20a716cc2cf67417b71c8a7016");

Expand All @@ -120,10 +119,10 @@ public void testEddiesMagicSelfHealingRepository() throws Exception {
Thread.sleep(1000);


Datastream ds = getDatastream("testObjectzzz", "testDatastreamNode5");
Datastream ds = getDatastream("testSelfHealingObject", "testDatastreamNode5");


Datastream ds2 = getDatastream("testObjectzzz", "testDatastreamNode4");
Datastream ds2 = getDatastream("testSelfHealingObject", "testDatastreamNode4");

logger.info("checking that our setup succeeded");
nodeFixity = getNodeFixity(ds);
Expand Down

0 comments on commit 2b4bfc3

Please sign in to comment.