moved integration test to org.fcrepo.integration

fcrepo · Mar 20, 2013 · 8fd8ddb · 8fd8ddb
1 parent 366ece2
commit 8fd8ddb
Show file tree

Hide file tree

Showing 34 changed files with 59 additions and 40 deletions.
diff --git a/.../fcrepo/generator/AbstractResourceIT.java → ...gration/generator/AbstractResourceIT.java b/.../fcrepo/generator/AbstractResourceIT.java → ...gration/generator/AbstractResourceIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.generator;
+package org.fcrepo.integration.generator;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/...repo/generator/DublinCoreGeneratorIT.java → ...tion/generator/DublinCoreGeneratorIT.java b/...repo/generator/DublinCoreGeneratorIT.java → ...tion/generator/DublinCoreGeneratorIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.generator;
+package org.fcrepo.integration.generator;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;

diff --git a/.../fcrepo/generator/AbstractResourceIT.java → ...gration/generator/AbstractResourceIT.java b/.../fcrepo/generator/AbstractResourceIT.java → ...gration/generator/AbstractResourceIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.generator;
+package org.fcrepo.integration.generator;
 
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;

diff --git a/.../org/fcrepo/generator/RdfGeneratorIT.java → ...integration/generator/RdfGeneratorIT.java b/.../org/fcrepo/generator/RdfGeneratorIT.java → ...integration/generator/RdfGeneratorIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo.generator;
+package org.fcrepo.integration.generator;
 
 
 import org.apache.http.HttpResponse;

diff --git a/...nerator/rdf/JcrPropertiesGeneratorIT.java → ...nerator/rdf/JcrPropertiesGeneratorIT.java b/...nerator/rdf/JcrPropertiesGeneratorIT.java → ...nerator/rdf/JcrPropertiesGeneratorIT.java
@@ -1,7 +1,10 @@
-package org.fcrepo.generator.rdf;
+package org.fcrepo.integration.generator.rdf;
 
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
+
+import org.fcrepo.generator.rdf.JcrPropertiesGenerator;
+import org.fcrepo.generator.rdf.TripleGenerator;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.modeshape.jcr.api.JcrTools;

diff --git a/...va/org/fcrepo/api/AbstractResourceIT.java → ...o/integration/api/AbstractResourceIT.java b/...va/org/fcrepo/api/AbstractResourceIT.java → ...o/integration/api/AbstractResourceIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api;
+package org.fcrepo.integration.api;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/...a/org/fcrepo/api/FedoraDatastreamsIT.java → .../integration/api/FedoraDatastreamsIT.java b/...a/org/fcrepo/api/FedoraDatastreamsIT.java → .../integration/api/FedoraDatastreamsIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api;
+package org.fcrepo.integration.api;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;

diff --git a/...a/org/fcrepo/api/FedoraFieldSearchIT.java → .../integration/api/FedoraFieldSearchIT.java b/...a/org/fcrepo/api/FedoraFieldSearchIT.java → .../integration/api/FedoraFieldSearchIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo.api;
+package org.fcrepo.integration.api;
 
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpGet;

diff --git a/...a/org/fcrepo/api/FedoraIdentifiersIT.java → .../integration/api/FedoraIdentifiersIT.java b/...a/org/fcrepo/api/FedoraIdentifiersIT.java → .../integration/api/FedoraIdentifiersIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api;
+package org.fcrepo.integration.api;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;
@@ -13,7 +13,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.util.EntityUtils;
-import org.fcrepo.api.AbstractResourceIT;
+import org.fcrepo.integration.api.AbstractResourceIT;
 import org.junit.Test;
 
 public class FedoraIdentifiersIT extends AbstractResourceIT {

diff --git a/.../java/org/fcrepo/api/FedoraObjectsIT.java → ...repo/integration/api/FedoraObjectsIT.java b/.../java/org/fcrepo/api/FedoraObjectsIT.java → ...repo/integration/api/FedoraObjectsIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api;
+package org.fcrepo.integration.api;
 
 import static java.util.regex.Pattern.compile;
 import static org.junit.Assert.assertEquals;
@@ -10,7 +10,7 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.util.EntityUtils;
-import org.fcrepo.api.AbstractResourceIT;
+import org.fcrepo.integration.api.AbstractResourceIT;
 import org.junit.Test;
 
 public class FedoraObjectsIT extends AbstractResourceIT {

diff --git a/...va/org/fcrepo/api/FedoraRepositoryIT.java → ...o/integration/api/FedoraRepositoryIT.java b/...va/org/fcrepo/api/FedoraRepositoryIT.java → ...o/integration/api/FedoraRepositoryIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api;
+package org.fcrepo.integration.api;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;

diff --git a/...t/java/org/fcrepo/observer/AtomJMSIT.java → ...crepo/integration/observer/AtomJMSIT.java b/...t/java/org/fcrepo/observer/AtomJMSIT.java → ...crepo/integration/observer/AtomJMSIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.observer;
+package org.fcrepo.integration.observer;
 
 import static com.google.common.collect.ImmutableList.copyOf;
 import static javax.jms.Session.AUTO_ACKNOWLEDGE;

diff --git a/.../src/test/java/org/fcrepo/AbstractIT.java → ...va/org/fcrepo/integration/AbstractIT.java b/.../src/test/java/org/fcrepo/AbstractIT.java → ...va/org/fcrepo/integration/AbstractIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo;
+package org.fcrepo.integration;
 
 import org.junit.Before;
 import org.junit.runner.RunWith;

diff --git a/...rc/test/java/org/fcrepo/DatastreamIT.java → .../org/fcrepo/integration/DatastreamIT.java b/...rc/test/java/org/fcrepo/DatastreamIT.java → .../org/fcrepo/integration/DatastreamIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo;
+package org.fcrepo.integration;
 
 import static org.fcrepo.services.DatastreamService.createDatastreamNode;
 import static org.fcrepo.services.DatastreamService.getDatastream;
@@ -17,6 +17,7 @@
 import javax.jcr.Session;
 
 import org.apache.commons.io.IOUtils;
+import org.fcrepo.Datastream;
 import org.fcrepo.exception.InvalidChecksumException;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
@@ -28,7 +29,7 @@ public class DatastreamIT extends AbstractIT {
     Repository repo;
 
     @Test
-    public void testLabel() throws RepositoryException, IOException, InvalidChecksumException {
+    public void testLabel() throws Exception {
         Session session = repo.login();
         createObjectNode(session, "testObject");
         Node dsNode =
@@ -39,7 +40,6 @@ public void testLabel() throws RepositoryException, IOException, InvalidChecksum
         new Datastream(dsNode).setLabel("Best datastream ever!");
         session.save();
         session.logout();
-
         session = repo.login();
         final Datastream ds = getDatastream("testObject", "testDatastreamNode");
         assertEquals("Wrong label!", "Best datastream ever!", ds.getLabel());

diff --git a/.../test/java/org/fcrepo/FedoraObjectIT.java → ...rg/fcrepo/integration/FedoraObjectIT.java b/.../test/java/org/fcrepo/FedoraObjectIT.java → ...rg/fcrepo/integration/FedoraObjectIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo;
+package org.fcrepo.integration;
 
 import static org.fcrepo.services.ObjectService.createObject;
 import static org.fcrepo.services.ObjectService.getObject;
@@ -13,6 +13,7 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import org.fcrepo.FedoraObject;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 

diff --git a/...org/fcrepo/observer/SimpleObserverIT.java → ...ntegration/observer/SimpleObserverIT.java b/...org/fcrepo/observer/SimpleObserverIT.java → ...ntegration/observer/SimpleObserverIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo.observer;
+package org.fcrepo.integration.observer;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,7 +7,8 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.fcrepo.AbstractIT;
+import org.fcrepo.integration.AbstractIT;
+import org.fcrepo.observer.FedoraEvent;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/.../fcrepo/services/DatastreamServiceIT.java → ...gration/services/DatastreamServiceIT.java b/.../fcrepo/services/DatastreamServiceIT.java → ...gration/services/DatastreamServiceIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.services;
+package org.fcrepo.integration.services;
 
 import static org.fcrepo.services.DatastreamService.createDatastreamNode;
 import static org.fcrepo.services.DatastreamService.getDatastream;
@@ -17,8 +17,8 @@
 import javax.jcr.Session;
 
 import org.apache.tika.io.IOUtils;
-import org.fcrepo.AbstractIT;
 import org.fcrepo.Datastream;
+import org.fcrepo.integration.AbstractIT;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 

diff --git a/...po/services/LowLevelStorageServiceIT.java → ...on/services/LowLevelStorageServiceIT.java b/...po/services/LowLevelStorageServiceIT.java → ...on/services/LowLevelStorageServiceIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo.services;
+package org.fcrepo.integration.services;
 
 import static org.fcrepo.services.DatastreamService.createDatastreamNode;
 import static org.fcrepo.services.DatastreamService.getDatastream;
@@ -19,6 +19,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.fcrepo.Datastream;
+import org.fcrepo.services.LowLevelStorageService;
 import org.fcrepo.utils.FixityResult;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/.../org/fcrepo/services/PathServiceTest.java → ...integration/services/PathServiceTest.java b/.../org/fcrepo/services/PathServiceTest.java → ...integration/services/PathServiceTest.java
@@ -1,6 +1,7 @@
 
-package org.fcrepo.services;
+package org.fcrepo.integration.services;
 
+import org.fcrepo.services.PathService;
 import org.junit.Test;
 
 import static org.fcrepo.services.PathService.getDatastreamJcrNodePath;

diff --git a/...rg/fcrepo/utils/LowLevelCacheEntryIT.java → ...tegration/utils/LowLevelCacheEntryIT.java b/...rg/fcrepo/utils/LowLevelCacheEntryIT.java → ...tegration/utils/LowLevelCacheEntryIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo.utils;
+package org.fcrepo.integration.utils;
 
 import static org.junit.Assert.assertEquals;
 
@@ -9,6 +9,7 @@
 import javax.jcr.Repository;
 
 import org.apache.commons.io.IOUtils;
+import org.fcrepo.utils.LowLevelCacheEntry;
 import org.infinispan.configuration.cache.CacheStoreConfiguration;
 import org.infinispan.loaders.CacheLoaderManager;
 import org.infinispan.loaders.CacheStore;

diff --git a/.../java/org/fcrepo/utils/SelfHealingIT.java → ...repo/integration/utils/SelfHealingIT.java b/.../java/org/fcrepo/utils/SelfHealingIT.java → ...repo/integration/utils/SelfHealingIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo.utils;
+package org.fcrepo.integration.utils;
 
 import static org.fcrepo.services.DatastreamService.createDatastreamNode;
 import static org.fcrepo.services.DatastreamService.getDatastream;
@@ -27,6 +27,8 @@
 import org.fcrepo.services.DatastreamService;
 import org.fcrepo.services.LowLevelStorageService;
 import org.fcrepo.services.ObjectService;
+import org.fcrepo.utils.FixityResult;
+import org.fcrepo.utils.LowLevelCacheEntry;
 import org.junit.Before;
 import org.junit.Test;
 import org.modeshape.jcr.JcrRepositoryFactory;

diff --git a/...infinispan/StoreChunkInputStreamTest.java → ...s/infinispan/StoreChunkInputStreamIT.java b/...infinispan/StoreChunkInputStreamTest.java → ...s/infinispan/StoreChunkInputStreamIT.java
@@ -1,19 +1,20 @@
-package org.fcrepo.utils.infinispan;
+package org.fcrepo.integration.utils.infinispan;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.commons.io.IOUtils;
+import org.fcrepo.utils.infinispan.StoreChunkInputStream;
 import org.infinispan.Cache;
 import org.infinispan.loaders.CacheLoaderManager;
 import org.infinispan.loaders.CacheStore;
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.junit.Test;
 
-public class StoreChunkInputStreamTest {
+public class StoreChunkInputStreamIT {
 
     @Test
     public void tryRetrievingContentFromInfinispanIT() throws IOException {

diff --git a/...fcrepo/api/legacy/AbstractResourceIT.java → ...ration/api/legacy/AbstractResourceIT.java b/...fcrepo/api/legacy/AbstractResourceIT.java → ...ration/api/legacy/AbstractResourceIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.integration.api.legacy;
 
 import static com.google.common.collect.ImmutableMap.of;
 import static org.custommonkey.xmlunit.XMLUnit.setXpathNamespaceContext;

diff --git a/...crepo/api/legacy/FedoraDatastreamsIT.java → ...ation/api/legacy/FedoraDatastreamsIT.java b/...crepo/api/legacy/FedoraDatastreamsIT.java → ...ation/api/legacy/FedoraDatastreamsIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.integration.api.legacy;
 
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static java.util.regex.Pattern.DOTALL;

diff --git a/...crepo/api/legacy/FedoraIdentifiersIT.java → ...ation/api/legacy/FedoraIdentifiersIT.java b/...crepo/api/legacy/FedoraIdentifiersIT.java → ...ation/api/legacy/FedoraIdentifiersIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.integration.api.legacy;
 
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;

diff --git a/...rg/fcrepo/api/legacy/FedoraObjectsIT.java → ...tegration/api/legacy/FedoraObjectsIT.java b/...rg/fcrepo/api/legacy/FedoraObjectsIT.java → ...tegration/api/legacy/FedoraObjectsIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.integration.api.legacy;
 
 import static java.util.regex.Pattern.compile;
 import static javax.ws.rs.core.MediaType.TEXT_XML;

diff --git a/...fcrepo/api/legacy/FedoraRepositoryIT.java → ...ration/api/legacy/FedoraRepositoryIT.java b/...fcrepo/api/legacy/FedoraRepositoryIT.java → ...ration/api/legacy/FedoraRepositoryIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.integration.api.legacy;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;

diff --git a/...crepo/syndication/AbstractResourceIT.java → ...ation/syndication/AbstractResourceIT.java b/...crepo/syndication/AbstractResourceIT.java → ...ation/syndication/AbstractResourceIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.syndication;
+package org.fcrepo.integration.syndication;
 
 import static java.lang.Integer.parseInt;
 import static java.lang.System.getProperty;

diff --git a/...st/java/org/fcrepo/syndication/RSSIT.java → ...fcrepo/integration/syndication/RSSIT.java b/...st/java/org/fcrepo/syndication/RSSIT.java → ...fcrepo/integration/syndication/RSSIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.syndication;
+package org.fcrepo.integration.syndication;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;

diff --git a/...c/test/java/org/fcrepo/SanityCheckIT.java → ...org/fcrepo/integration/SanityCheckIT.java b/...c/test/java/org/fcrepo/SanityCheckIT.java → ...org/fcrepo/integration/SanityCheckIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo;
+package org.fcrepo.integration;
 
 
 import org.apache.http.client.ClientProtocolException;

diff --git a/fcrepo-webhooks/pom.xml b/fcrepo-webhooks/pom.xml
@@ -71,4 +71,12 @@
     </dependency>
   </dependencies>
 
+<build>
+  <plugins>
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-failsafe-plugin</artifactId>
+     </plugin>
+  </plugins>
+</build>
 </project>
diff --git a/...g/fcrepo/webhooks/AbstractResourceIT.java → ...egration/webhooks/AbstractResourceIT.java b/...g/fcrepo/webhooks/AbstractResourceIT.java → ...egration/webhooks/AbstractResourceIT.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.webhooks;
+package org.fcrepo.integration.webhooks;
 
 import static java.lang.Integer.parseInt;
 import static java.lang.System.getProperty;

diff --git a/...org/fcrepo/webhooks/FedoraWebhooksIT.java → ...ntegration/webhooks/FedoraWebhooksIT.java b/...org/fcrepo/webhooks/FedoraWebhooksIT.java → ...ntegration/webhooks/FedoraWebhooksIT.java
@@ -1,4 +1,4 @@
-package org.fcrepo.webhooks;
+package org.fcrepo.integration.webhooks;
 
 
 import static java.util.regex.Pattern.DOTALL;

diff --git a/...ava/org/fcrepo/webhooks/TestEndpoint.java → ...po/integration/webhooks/TestEndpoint.java b/...ava/org/fcrepo/webhooks/TestEndpoint.java → ...po/integration/webhooks/TestEndpoint.java
@@ -1,4 +1,4 @@
-package org.fcrepo.webhooks;
+package org.fcrepo.integration.webhooks;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;