moved unit test to integration test for he rest of the modules

fcrepo · Mar 20, 2013 · 4fffd1b · 4fffd1b
1 parent 2195be1
commit 4fffd1b
Show file tree

Hide file tree

Showing 32 changed files with 57 additions and 40 deletions.
diff --git a/fcrepo-generator-rdf/pom.xml b/fcrepo-generator-rdf/pom.xml
@@ -85,5 +85,14 @@
       <artifactId>javaee-api</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+  	<plugins>
+  	  <plugin>
+      	<groupId>org.apache.maven.plugins</groupId>
+      	<artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+  	</plugins>
+  </build>
 
 </project>
diff --git a/...crepo/generator/AbstractResourceTest.java → .../fcrepo/generator/AbstractResourceIT.java b/...crepo/generator/AbstractResourceTest.java → .../fcrepo/generator/AbstractResourceIT.java
@@ -20,7 +20,7 @@
 import java.util.concurrent.TimeUnit;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-public abstract class AbstractResourceTest {
+public abstract class AbstractResourceIT {
 
     protected Logger logger;
 
@@ -42,7 +42,7 @@ public void setLogger() {
 
     protected static HttpClient client;
 
-    public AbstractResourceTest() {
+    public AbstractResourceIT() {
         connectionManager.setMaxTotal(Integer.MAX_VALUE);
         connectionManager.setDefaultMaxPerRoute(5);
         connectionManager.closeIdleConnections(3, TimeUnit.SECONDS);

diff --git a/...rg/fcrepo/generator/RdfGeneratorTest.java → .../org/fcrepo/generator/RdfGeneratorIT.java b/...rg/fcrepo/generator/RdfGeneratorTest.java → .../org/fcrepo/generator/RdfGeneratorIT.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertTrue;
 
 @ContextConfiguration({"/spring-test/generator.xml", "/spring-test/repo.xml"})
-public class RdfGeneratorTest extends AbstractResourceTest {
+public class RdfGeneratorIT extends AbstractResourceIT {
 
     @Test
     public void testJcrPropertiesBasedTriples() throws Exception {

diff --git a/...rator/rdf/JcrPropertiesGeneratorTest.java → ...nerator/rdf/JcrPropertiesGeneratorIT.java b/...rator/rdf/JcrPropertiesGeneratorTest.java → ...nerator/rdf/JcrPropertiesGeneratorIT.java
@@ -16,7 +16,7 @@
 
 @ContextConfiguration({"/spring-test/repo.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
-public class JcrPropertiesGeneratorTest {
+public class JcrPropertiesGeneratorIT {
 
 
     @Inject

diff --git a/fcrepo-http-api/pom.xml b/fcrepo-http-api/pom.xml
@@ -143,6 +143,10 @@
         <groupId>org.codehaus.enunciate</groupId>
         <artifactId>maven-enunciate-cxf-plugin</artifactId>
       </plugin>
+      <plugin>
+      	<groupId>org.apache.maven.plugins</groupId>
+      	<artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/.../org/fcrepo/api/AbstractResourceTest.java → ...va/org/fcrepo/api/AbstractResourceIT.java b/.../org/fcrepo/api/AbstractResourceTest.java → ...va/org/fcrepo/api/AbstractResourceIT.java
@@ -23,7 +23,7 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("/spring-test/master.xml")
-public abstract class AbstractResourceTest {
+public abstract class AbstractResourceIT {
 
     protected Logger logger;
 
@@ -45,7 +45,7 @@ public void setLogger() {
 
     protected static HttpClient client;
 
-    public AbstractResourceTest() {
+    public AbstractResourceIT() {
         connectionManager.setMaxTotal(Integer.MAX_VALUE);
         connectionManager.setDefaultMaxPerRoute(5);
         connectionManager.closeIdleConnections(3, TimeUnit.SECONDS);

diff --git a/...org/fcrepo/api/FedoraDatastreamsTest.java → ...a/org/fcrepo/api/FedoraDatastreamsIT.java b/...org/fcrepo/api/FedoraDatastreamsTest.java → ...a/org/fcrepo/api/FedoraDatastreamsIT.java
@@ -27,7 +27,7 @@
 import org.fcrepo.utils.FixityResult;
 import org.junit.Test;
 
-public class FedoraDatastreamsTest extends AbstractResourceTest {
+public class FedoraDatastreamsIT extends AbstractResourceIT {
 
     private static final String faulkner1 =
             "The past is never dead. It's not even past.";

diff --git a/...org/fcrepo/api/FedoraFieldSearchTest.java → ...a/org/fcrepo/api/FedoraFieldSearchIT.java b/...org/fcrepo/api/FedoraFieldSearchTest.java → ...a/org/fcrepo/api/FedoraFieldSearchIT.java
@@ -12,7 +12,7 @@
 import static org.junit.Assert.assertEquals;
 
 
-public class FedoraFieldSearchTest extends AbstractResourceTest {
+public class FedoraFieldSearchIT extends AbstractResourceIT {
     @Test
     public void testSearchForm() throws Exception {
 

diff --git a/...org/fcrepo/api/FedoraIdentifiersTest.java → ...a/org/fcrepo/api/FedoraIdentifiersIT.java b/...org/fcrepo/api/FedoraIdentifiersTest.java → ...a/org/fcrepo/api/FedoraIdentifiersIT.java
@@ -13,10 +13,10 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.util.EntityUtils;
-import org.fcrepo.api.AbstractResourceTest;
+import org.fcrepo.api.AbstractResourceIT;
 import org.junit.Test;
 
-public class FedoraIdentifiersTest extends AbstractResourceTest {
+public class FedoraIdentifiersIT extends AbstractResourceIT {
 
     @Test
     public void testGetNextPidResponds() throws Exception {

diff --git a/...ava/org/fcrepo/api/FedoraObjectsTest.java → .../java/org/fcrepo/api/FedoraObjectsIT.java b/...ava/org/fcrepo/api/FedoraObjectsTest.java → .../java/org/fcrepo/api/FedoraObjectsIT.java
@@ -10,10 +10,10 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.util.EntityUtils;
-import org.fcrepo.api.AbstractResourceTest;
+import org.fcrepo.api.AbstractResourceIT;
 import org.junit.Test;
 
-public class FedoraObjectsTest extends AbstractResourceTest {
+public class FedoraObjectsIT extends AbstractResourceIT {
 
     @Test
     public void testIngest() throws Exception {

diff --git a/.../org/fcrepo/api/FedoraRepositoryTest.java → ...va/org/fcrepo/api/FedoraRepositoryIT.java b/.../org/fcrepo/api/FedoraRepositoryTest.java → ...va/org/fcrepo/api/FedoraRepositoryIT.java
@@ -14,7 +14,7 @@
 import org.apache.http.util.EntityUtils;
 import org.junit.Test;
 
-public class FedoraRepositoryTest extends AbstractResourceTest {
+public class FedoraRepositoryIT extends AbstractResourceIT {
 
     @Test
     public void testDescribeModeshape() throws Exception {

diff --git a/fcrepo-jms/pom.xml b/fcrepo-jms/pom.xml
@@ -84,6 +84,10 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
       </plugin>
+      <plugin>
+      	<groupId>org.apache.maven.plugins</groupId>
+      	<artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/...java/org/fcrepo/observer/AtomJMSTest.java → ...t/java/org/fcrepo/observer/AtomJMSIT.java b/...java/org/fcrepo/observer/AtomJMSTest.java → ...t/java/org/fcrepo/observer/AtomJMSIT.java
@@ -49,7 +49,7 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration({"/spring-test/jms.xml", "/spring-test/repo.xml",
         "/spring-test/eventing.xml"})
-public class AtomJMSTest implements MessageListener {
+public class AtomJMSIT implements MessageListener {
 
     @Inject
     private Repository repository;
@@ -67,7 +67,7 @@ public class AtomJMSTest implements MessageListener {
 
     private Entry entry;
 
-    final private Logger logger = LoggerFactory.getLogger(AtomJMSTest.class);
+    final private Logger logger = LoggerFactory.getLogger(AtomJMSIT.class);
 
     @Test
     public void testAtomStream() throws LoginException, RepositoryException {

diff --git a/...rc/test/java/org/fcrepo/AbstractTest.java → .../src/test/java/org/fcrepo/AbstractIT.java b/...rc/test/java/org/fcrepo/AbstractTest.java → .../src/test/java/org/fcrepo/AbstractIT.java
@@ -7,7 +7,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-public abstract class AbstractTest {
+public abstract class AbstractIT {
 
 	protected Logger logger;
 

diff --git a/.../test/java/org/fcrepo/DatastreamTest.java → ...rc/test/java/org/fcrepo/DatastreamIT.java b/.../test/java/org/fcrepo/DatastreamTest.java → ...rc/test/java/org/fcrepo/DatastreamIT.java
@@ -22,7 +22,7 @@
 import org.springframework.test.context.ContextConfiguration;
 
 @ContextConfiguration({"/spring-test/repo.xml"})
-public class DatastreamTest extends AbstractTest {
+public class DatastreamIT extends AbstractIT {
 
     @Inject
     Repository repo;

diff --git a/...est/java/org/fcrepo/FedoraObjectTest.java → .../test/java/org/fcrepo/FedoraObjectIT.java b/...est/java/org/fcrepo/FedoraObjectTest.java → .../test/java/org/fcrepo/FedoraObjectIT.java
@@ -17,7 +17,7 @@
 import org.springframework.test.context.ContextConfiguration;
 
 @ContextConfiguration({"/spring-test/repo.xml"})
-public class FedoraObjectTest extends AbstractTest {
+public class FedoraObjectIT extends AbstractIT {
 
     @Inject
     Repository repo;

diff --git a/...g/fcrepo/observer/SimpleObserverTest.java → ...org/fcrepo/observer/SimpleObserverIT.java b/...g/fcrepo/observer/SimpleObserverTest.java → ...org/fcrepo/observer/SimpleObserverIT.java
@@ -7,7 +7,7 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.fcrepo.AbstractTest;
+import org.fcrepo.AbstractIT;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,7 +17,7 @@
 import com.google.common.eventbus.Subscribe;
 
 @ContextConfiguration({ "/spring-test/eventing.xml", "/spring-test/repo.xml" })
-public class SimpleObserverTest extends AbstractTest {
+public class SimpleObserverIT extends AbstractIT {
 
 	private Integer eventBusMessageCount;
 	@Inject

diff --git a/...crepo/services/DatastreamServiceTest.java → .../fcrepo/services/DatastreamServiceIT.java b/...crepo/services/DatastreamServiceTest.java → .../fcrepo/services/DatastreamServiceIT.java
@@ -17,13 +17,13 @@
 import javax.jcr.Session;
 
 import org.apache.tika.io.IOUtils;
-import org.fcrepo.AbstractTest;
+import org.fcrepo.AbstractIT;
 import org.fcrepo.Datastream;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 
 @ContextConfiguration({"/spring-test/repo.xml"})
-public class DatastreamServiceTest extends AbstractTest {
+public class DatastreamServiceIT extends AbstractIT {
 
     @Inject
     private Repository repository;

diff --git a/.../services/LowLevelStorageServiceTest.java → ...po/services/LowLevelStorageServiceIT.java b/.../services/LowLevelStorageServiceTest.java → ...po/services/LowLevelStorageServiceIT.java
@@ -27,7 +27,7 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration({"/spring-test/repo.xml"})
-public class LowLevelStorageServiceTest {
+public class LowLevelStorageServiceIT {
 
     @Inject
     Repository repo;

diff --git a/.../fcrepo/utils/LowLevelCacheEntryTest.java → ...rg/fcrepo/utils/LowLevelCacheEntryIT.java b/.../fcrepo/utils/LowLevelCacheEntryTest.java → ...rg/fcrepo/utils/LowLevelCacheEntryIT.java
@@ -27,7 +27,7 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration({"/spring-test/repo.xml"})
-public class LowLevelCacheEntryTest {
+public class LowLevelCacheEntryIT {
 
     @Inject
     Repository repo;

diff --git a/...ava/org/fcrepo/utils/SelfHealingTest.java → .../java/org/fcrepo/utils/SelfHealingIT.java b/...ava/org/fcrepo/utils/SelfHealingTest.java → .../java/org/fcrepo/utils/SelfHealingIT.java
@@ -35,7 +35,7 @@
 import org.slf4j.LoggerFactory;
 
 
-public class SelfHealingTest {
+public class SelfHealingIT {
     protected Logger logger;
     static private Repository repo;
 

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/utils/infinispan/StoreChunkInputStreamTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/utils/infinispan/StoreChunkInputStreamTest.java
@@ -16,7 +16,7 @@
 public class StoreChunkInputStreamTest {
 
     @Test
-    public void tryRetrievingContentFromInfinispanTest() throws IOException {
+    public void tryRetrievingContentFromInfinispanIT() throws IOException {
         EmbeddedCacheManager cm = new DefaultCacheManager("test_infinispan_configuration.xml");
 
         Cache<String, byte[]> ispn = cm.getCache("FedoraRepository");

diff --git a/...repo/api/legacy/AbstractResourceTest.java → ...fcrepo/api/legacy/AbstractResourceIT.java b/...repo/api/legacy/AbstractResourceTest.java → ...fcrepo/api/legacy/AbstractResourceIT.java
@@ -26,7 +26,7 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("/spring-test/master.xml")
-public abstract class AbstractResourceTest {
+public abstract class AbstractResourceIT {
 
     protected Logger logger;
 
@@ -48,7 +48,7 @@ public void setLogger() {
 
     protected static HttpClient client;
 
-    public AbstractResourceTest() {
+    public AbstractResourceIT() {
         connectionManager.setMaxTotal(Integer.MAX_VALUE);
         connectionManager.setDefaultMaxPerRoute(5);
         connectionManager.closeIdleConnections(3, TimeUnit.SECONDS);

diff --git a/fcrepo-legacy-api/src/test/java/org/fcrepo/api/legacy/FedoraDatastreamsIT.java b/fcrepo-legacy-api/src/test/java/org/fcrepo/api/legacy/FedoraDatastreamsIT.java
@@ -26,7 +26,7 @@
 import org.custommonkey.xmlunit.jaxp13.Validator;
 import org.junit.Test;
 
-public class FedoraDatastreamsIT extends AbstractResourceTest {
+public class FedoraDatastreamsIT extends AbstractResourceIT {
 
     private static final String faulkner1 =
             "The past is never dead. It's not even past.";

diff --git a/fcrepo-legacy-api/src/test/java/org/fcrepo/api/legacy/FedoraIdentifiersIT.java b/fcrepo-legacy-api/src/test/java/org/fcrepo/api/legacy/FedoraIdentifiersIT.java
@@ -14,7 +14,7 @@
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-public class FedoraIdentifiersIT extends AbstractResourceTest {
+public class FedoraIdentifiersIT extends AbstractResourceIT {
 
     @Test
     public void testGetNextPidResponds() throws Exception {

diff --git a/fcrepo-legacy-api/src/test/java/org/fcrepo/api/legacy/FedoraObjectsIT.java b/fcrepo-legacy-api/src/test/java/org/fcrepo/api/legacy/FedoraObjectsIT.java
@@ -21,7 +21,7 @@
 import org.custommonkey.xmlunit.jaxp13.Validator;
 import org.junit.Test;
 
-public class FedoraObjectsIT extends AbstractResourceTest {
+public class FedoraObjectsIT extends AbstractResourceIT {
 
     @Test
     public void testIngest() throws Exception {

diff --git a/fcrepo-legacy-api/src/test/java/org/fcrepo/api/legacy/FedoraRepositoryIT.java b/fcrepo-legacy-api/src/test/java/org/fcrepo/api/legacy/FedoraRepositoryIT.java
@@ -19,7 +19,7 @@
 //import org.custommonkey.xmlunit.jaxp13.Validator;
 import org.junit.Test;
 
-public class FedoraRepositoryIT extends AbstractResourceTest {
+public class FedoraRepositoryIT extends AbstractResourceIT {
 
     @Test
     public void testDescribeModeshape() throws Exception {

diff --git a/...epo/syndication/AbstractResourceTest.java → ...crepo/syndication/AbstractResourceIT.java b/...epo/syndication/AbstractResourceTest.java → ...crepo/syndication/AbstractResourceIT.java
@@ -19,7 +19,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-public abstract class AbstractResourceTest {
+public abstract class AbstractResourceIT {
 
     protected Logger logger;
 
@@ -41,7 +41,7 @@ public void setLogger() {
 
     protected static HttpClient client;
 
-    public AbstractResourceTest() {
+    public AbstractResourceIT() {
         connectionManager.setMaxTotal(Integer.MAX_VALUE);
         connectionManager.setDefaultMaxPerRoute(5);
         connectionManager.closeIdleConnections(3, TimeUnit.SECONDS);

diff --git a/.../java/org/fcrepo/syndication/RSSTest.java → ...st/java/org/fcrepo/syndication/RSSIT.java b/.../java/org/fcrepo/syndication/RSSTest.java → ...st/java/org/fcrepo/syndication/RSSIT.java
@@ -17,9 +17,9 @@
 
 @ContextConfiguration({"/spring-test/repo.xml", "/spring-test/rest.xml",
         "/spring-test/eventing.xml"})
-public class RSSTest extends AbstractResourceTest {
+public class RSSIT extends AbstractResourceIT {
 
-    final private Logger logger = LoggerFactory.getLogger(RSSTest.class);
+    final private Logger logger = LoggerFactory.getLogger(RSSIT.class);
 
     @Test
     public void testRSS() throws Exception {

diff --git a/...test/java/org/fcrepo/SanityCheckTest.java → ...c/test/java/org/fcrepo/SanityCheckIT.java b/...test/java/org/fcrepo/SanityCheckTest.java → ...c/test/java/org/fcrepo/SanityCheckIT.java
@@ -22,7 +22,7 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration({"/spring/repo.xml", "/spring/eventing.xml", "/spring/jms.xml", "/spring/generator.xml", "/spring-test/rest.xml"})
-public class SanityCheckTest {
+public class SanityCheckIT {
 
     protected Logger logger;
 

diff --git a/...fcrepo/webhooks/AbstractResourceTest.java → ...g/fcrepo/webhooks/AbstractResourceIT.java b/...fcrepo/webhooks/AbstractResourceTest.java → ...g/fcrepo/webhooks/AbstractResourceIT.java
@@ -19,7 +19,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-public abstract class AbstractResourceTest {
+public abstract class AbstractResourceIT {
 
     protected Logger logger;
 
@@ -41,7 +41,7 @@ public void setLogger() {
 
     protected static HttpClient client;
 
-    public AbstractResourceTest() {
+    public AbstractResourceIT() {
         connectionManager.setMaxTotal(Integer.MAX_VALUE);
         connectionManager.setDefaultMaxPerRoute(5);
         connectionManager.closeIdleConnections(3, TimeUnit.SECONDS);

diff --git a/...g/fcrepo/webhooks/FedoraWebhooksTest.java → ...org/fcrepo/webhooks/FedoraWebhooksIT.java b/...g/fcrepo/webhooks/FedoraWebhooksTest.java → ...org/fcrepo/webhooks/FedoraWebhooksIT.java
@@ -23,7 +23,7 @@
 
 @ContextConfiguration({"/spring-test/repo.xml", "/spring-test/rest.xml",
         "/spring-test/eventing.xml"})
-public class FedoraWebhooksTest extends AbstractResourceTest {
+public class FedoraWebhooksIT extends AbstractResourceIT {
 
     @Test
     public void registerWebhookCallbackTest() throws IOException {