From dd6050b19defb81ed9733a26d695b273aa0ad77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esm=C3=A9=20Cowles?= <escowles@ucsd.edu>
Date: Wed, 9 Jul 2014 10:56:18 -0400
Subject: [PATCH] Removing IT from connector project (because REST API
 transaction context is required for the tests), and re-enabled the REST API
 federation write tests

---
 .../file/FedoraFileSystemConnector.java          |  1 +
 ...asicReadWriteFedoraFileSystemConnectorIT.java | 16 ----------------
 .../integration/http/api/FedoraNodesIT.java      |  5 -----
 .../src/test/resources/test_repository.json      |  2 +-
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/fcrepo-connector-file/src/main/java/org/fcrepo/connector/file/FedoraFileSystemConnector.java b/fcrepo-connector-file/src/main/java/org/fcrepo/connector/file/FedoraFileSystemConnector.java
index 97669eca27..373d7a30a4 100644
--- a/fcrepo-connector-file/src/main/java/org/fcrepo/connector/file/FedoraFileSystemConnector.java
+++ b/fcrepo-connector-file/src/main/java/org/fcrepo/connector/file/FedoraFileSystemConnector.java
@@ -108,6 +108,7 @@ public Document getDocumentById(final String id) {
         }
 
         final Document doc = super.getDocumentById(id);
+        if ( doc == null ) { return doc; }
 
         final DocumentReader docReader = readDocument(doc);
         final DocumentWriter docWriter = writeDocument(doc);
diff --git a/fcrepo-connector-file/src/test/java/org/fcrepo/integration/connector/file/BasicReadWriteFedoraFileSystemConnectorIT.java b/fcrepo-connector-file/src/test/java/org/fcrepo/integration/connector/file/BasicReadWriteFedoraFileSystemConnectorIT.java
index 8e08ce10b5..9bfba75a7a 100644
--- a/fcrepo-connector-file/src/test/java/org/fcrepo/integration/connector/file/BasicReadWriteFedoraFileSystemConnectorIT.java
+++ b/fcrepo-connector-file/src/test/java/org/fcrepo/integration/connector/file/BasicReadWriteFedoraFileSystemConnectorIT.java
@@ -15,14 +15,11 @@
  */
 package org.fcrepo.integration.connector.file;
 
-import org.fcrepo.kernel.FedoraObject;
 import org.fcrepo.kernel.FedoraResource;
 import org.fcrepo.kernel.rdf.IdentifierTranslator;
 import org.fcrepo.kernel.impl.rdf.impl.DefaultIdentifierTranslator;
 import org.junit.Test;
 
-import java.util.UUID;
-
 import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
@@ -125,17 +122,4 @@ public void testRemoveProperty() throws RepositoryException {
 
         session.logout();
     }
-
-    @Test
-    public void testCreateObject() throws RepositoryException {
-        final String id = UUID.randomUUID().toString();
-        Session session = repo.login();
-        objectService.createObject(session, "/" + federationName() + "/" + id);
-        session.save();
-        session.logout();
-
-        session = repo.login();
-        final FedoraObject obj = objectService.getObject(session, "/" + federationName() + "/" + id);
-        assertNotNull("Couldn't find object!", obj);
-    }
 }
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java
index a41caa934b..85ac087bbe 100644
--- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java
+++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java
@@ -103,7 +103,6 @@
 import org.apache.http.impl.client.cache.CachingHttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.fcrepo.http.commons.domain.RDFMediaType;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
@@ -1419,9 +1418,7 @@ public String getMethod() {
 
     /**
      * I should be able to upload a file to a read/write federated filesystem.
-     * TODO: ignored until read-write filesystem support is reintroduced.
     **/
-    @Ignore
     @Test
     public void testUploadToProjection() throws IOException {
         // upload file to federated filesystem using rest api
@@ -1448,9 +1445,7 @@ public void testUploadToProjection() throws IOException {
 
     /**
      * I should be able to copy objects from the repository to a federated filesystem.
-     * TODO: ignored until read-write filesystem support is reintroduced.
     **/
-    @Ignore
     @Test
     public void testCopyToProjection() throws IOException {
         // create object in the repository
diff --git a/fcrepo-http-api/src/test/resources/test_repository.json b/fcrepo-http-api/src/test/resources/test_repository.json
index cc8daad0ac..5c6dc0c69f 100644
--- a/fcrepo-http-api/src/test/resources/test_repository.json
+++ b/fcrepo-http-api/src/test/resources/test_repository.json
@@ -19,7 +19,7 @@
       "fileSystem" : {
         "classname" : "org.fcrepo.connector.file.FedoraFileSystemConnector",
         "directoryPath" : "target/test-classes/test-objects",
-        "readonly" : true,
+        "readonly" : false,
         "extraPropertiesStorage": "json",
         "cacheTtlSeconds" : 5,
         "projections" : [ "default:/files => /" ]