Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Re-enabling filesystem federation copy tests
  • Loading branch information
escowles authored and Andrew Woods committed Apr 10, 2014
1 parent 94cb07d commit 789823d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
Expand Up @@ -990,7 +990,6 @@ public String getMethod() {
* I should be able to upload a file to a read/write federated filesystem.
**/
@Test
@Ignore("Until ticket is resolved: https://www.pivotaltracker.com/story/show/68689198")
public void testUploadToProjection() throws IOException {
// upload file to federated filesystem using rest api
final String pid = randomUUID().toString();
Expand Down Expand Up @@ -1020,7 +1019,6 @@ public void testUploadToProjection() throws IOException {
* I should be able to copy objects from the repository to a federated filesystem.
**/
@Test
@Ignore("Until ticket is resolved: https://www.pivotaltracker.com/story/show/68689198")
public void testCopyToProjection() throws IOException {
// create object in the repository
final String pid = randomUUID().toString();
Expand Down Expand Up @@ -1049,7 +1047,6 @@ public void testCopyToProjection() throws IOException {
* I should be able to copy objects from a federated filesystem to the repository.
**/
@Test
@Ignore("Until ticket is resolved: https://www.pivotaltracker.com/story/show/68689198")
public void testCopyFromProjection() throws IOException {
// create object in federated filesystem
final String pid = randomUUID().toString();
Expand Down
Expand Up @@ -259,12 +259,19 @@ public void testAddMixinAutoVersioning() throws IOException {

@Test
public void testRepositoryWideAutoVersioning() throws IOException {
postNodeTypeCNDSnippet("[fedora:autoVersioned] mixin\n" +
" - fedoraconfig:versioningPolicy (STRING) = \"auto-version\" autocreated");
postNodeTypeCNDSnippet("[fedora:resource] > fedora:relations, mix:created, mix:lastModified, mix:lockable, mix:versionable, fedora:autoVersioned, dc:describable mixin\n" +
" - rdf:type (URI) multiple\n" +
" - * (undefined) multiple\n" +
" - * (undefined)");
final String autoVersionedType = "[fedora:autoVersioned] mixin\n" +
" - fedoraconfig:versioningPolicy (STRING) = \"auto-version\" autocreated";
final String autoVersionedResource = "[fedora:resource] > fedora:relations, mix:created, mix:lastModified, mix:lockable, mix:versionable, fedora:autoVersioned, dc:describable mixin\n" +
"- rdf:type (URI) multiple\n" +
"- * (undefined) multiple\n" +
"- * (undefined)";
final String defaultResource = "[fedora:resource] > fedora:relations, mix:created, mix:lastModified, mix:lockable, mix:referenceable, dc:describable mixin\n" +
"- rdf:type (URI) multiple\n" +
"- * (undefined) multiple\n" +
"- * (undefined)";

postNodeTypeCNDSnippet(autoVersionedType);
postNodeTypeCNDSnippet(autoVersionedResource);

final String objName = "testRepositoryWideAutoVersioning";
final String dsName = "datastream";
Expand All @@ -276,6 +283,9 @@ public void testRepositoryWideAutoVersioning() throws IOException {
initialVersion.contains(Node.ANY, createResource(serverAddress + objName).asNode(), VERSIONING_POLICY.asNode(), NodeFactory.createLiteral("auto-version")));

testDatastreamContentUpdatesCreateNewVersions(objName, dsName);

// undo auto-versioning
postNodeTypeCNDSnippet(defaultResource);
}

private void testDatastreamContentUpdatesCreateNewVersions(final String objName, final String dsName) throws IOException {
Expand Down

0 comments on commit 789823d

Please sign in to comment.