You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by pi...@apache.org on 2011/10/14 18:02:44 UTC
svn commit: r1183401 - in /incubator/lcf/trunk: ./
site/src/documentation/content/xdocs/ tests/ tests/cmis/
tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/ tests/filesystem/
tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tes...
Author: piergiorgio
Date: Fri Oct 14 16:02:42 2011
New Revision: 1183401
URL: http://svn.apache.org/viewvc?rev=1183401&view=rev
Log:
Fix for CONNECTORS-263: Long-running tests should all be moved to Maven's integration-test phase. All the integration tests classes are renamed with the suffix *IT.java to work with the Maven Failsafe Plugin. Updated the how-to-build-and-deploy page on the website and the Ant script to work with this latest change.
Added:
incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityIT.java
- copied, changed from r1183366, incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlTest.java
incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyIT.java
- copied, changed from r1183168, incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyTest.java
Removed:
incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlTest.java
incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityTest.java
incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyTest.java
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/build.xml
incubator/lcf/trunk/pom.xml
incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml
incubator/lcf/trunk/tests/cmis/pom.xml
incubator/lcf/trunk/tests/filesystem/pom.xml
incubator/lcf/trunk/tests/pom.xml
incubator/lcf/trunk/tests/wiki/pom.xml
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1183401&r1=1183400&r2=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Fri Oct 14 16:02:42 2011
@@ -3,6 +3,9 @@ $Id$
======================= 0.4-dev =====================
+CONNECTORS-263: Long-running tests should all be moved to Maven's integration-test phase
+(Piergiorgio Lucidi)
+
CONNECTORS-273: Add last-modified metadata to indexing for the
Wiki connector.
(Tobias Wunderlich, Karl Wright)
Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1183401&r1=1183400&r2=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Fri Oct 14 16:02:42 2011
@@ -2217,10 +2217,10 @@
</classpath>
<formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.filesystem_tests.SanityTest" todir="test-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.APISanityTest" todir="test-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.HopcountTest" todir="test-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.ExpirationTest" todir="test-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.SanityIT" todir="test-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.APISanityIT" todir="test-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.HopcountIT" todir="test-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.ExpirationIT" todir="test-output/filesystem"/>
<!-- MHL -->
</junit>
</target>
@@ -2288,7 +2288,7 @@
</classpath>
<formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.wiki_tests.SanityDerbyTest" todir="test-output/wiki"/>
+ <test name="org.apache.manifoldcf.wiki_tests.SanityDerbyIT" todir="test-output/wiki"/>
<!-- MHL -->
</junit>
@@ -2360,7 +2360,7 @@
</classpath>
<formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.cmis_tests.APISanityTest" todir="test-output/cmis"/>
+ <test name="org.apache.manifoldcf.cmis_tests.APISanityIT" todir="test-output/cmis"/>
<!-- MHL -->
</junit>
</target>
@@ -2496,10 +2496,10 @@
</classpath>
<formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.filesystem_tests.SanityPostgresqlTest" todir="test-postgresql-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.APISanityPostgresqlTest" todir="test-postgresql-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.HopcountPostgresqlTest" todir="test-postgresql-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.ExpirationPostgresqlTest" todir="test-postgresql-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.SanityPostgresqlIT" todir="test-postgresql-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.APISanityPostgresqlIT" todir="test-postgresql-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.HopcountPostgresqlIT" todir="test-postgresql-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.ExpirationPostgresqlIT" todir="test-postgresql-output/filesystem"/>
<!-- MHL -->
</junit>
</target>
@@ -2709,10 +2709,10 @@
</classpath>
<formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.filesystem_tests.SanityHSQLDBTest" todir="test-HSQLDB-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.APISanityHSQLDBTest" todir="test-HSQLDB-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.HopcountHSQLDBTest" todir="test-HSQLDB-output/filesystem"/>
- <test name="org.apache.manifoldcf.filesystem_tests.ExpirationHSQLDBTest" todir="test-HSQLDB-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.SanityHSQLDBIT" todir="test-HSQLDB-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.APISanityHSQLDBIT" todir="test-HSQLDB-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.HopcountHSQLDBIT" todir="test-HSQLDB-output/filesystem"/>
+ <test name="org.apache.manifoldcf.filesystem_tests.ExpirationHSQLDBIT" todir="test-HSQLDB-output/filesystem"/>
<!-- MHL -->
</junit>
</target>
Modified: incubator/lcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/pom.xml?rev=1183401&r1=1183400&r2=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/pom.xml (original)
+++ incubator/lcf/trunk/pom.xml Fri Oct 14 16:02:42 2011
@@ -57,11 +57,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
</plugin>
@@ -88,16 +83,6 @@
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>always</forkMode>
- <excludes>
- <exclude>**/*PostgresqlTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml?rev=1183401&r1=1183400&r2=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml Fri Oct 14 16:02:42 2011
@@ -244,11 +244,15 @@ mvn install:install-file -Dfile=lib/hsql
mvn clean install
</source>
<p>This should generate all the necessary artifacts to run with, and also run the Apache Derby-based tests.</p>
+ <p>To build and skip only the integration tests, type:</p>
+ <source>
+mvn clean install -DskipITs
+ </source>
<p>When you have the default package installed locally in your Maven repository, to only build ManifoldCF artifacts, type:</p>
<source>
mvn clean package
</source>
- <p>To reinstall all the new artifacts in your local Maven repository without running tests, type:</p>
+ <p>To reinstall all the new artifacts in your local Maven repository without running unit tests and integration tests, type:</p>
<source>
mvn clean install -Dmaven.test.skip
</source>
Modified: incubator/lcf/trunk/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/pom.xml?rev=1183401&r1=1183400&r2=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/pom.xml (original)
+++ incubator/lcf/trunk/tests/cmis/pom.xml Fri Oct 14 16:02:42 2011
@@ -39,7 +39,7 @@
<name>ManifoldCF - Test - CMIS</name>
<build>
- <defaultGoal>test</defaultGoal>
+ <defaultGoal>integration-test</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -88,7 +88,8 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.10</version>
<configuration>
<systemPropertyVariables>
<crawlerWarPath>../dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
@@ -102,6 +103,20 @@
<forkMode>always</forkMode>
<workingDirectory>target/test-output</workingDirectory>
</configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Copied: incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityIT.java (from r1183366, incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityIT.java?p2=incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityIT.java&p1=incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityTest.java&r1=1183366&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityTest.java (original)
+++ incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/APISanityIT.java Fri Oct 14 16:02:42 2011
@@ -52,7 +52,7 @@ import org.junit.Test;
/**
* @author Piergiorgio Lucidi
*/
-public class APISanityTest extends Base
+public class APISanityIT extends Base
{
private static final String REPLACER = "?";
private static final String CMIS_TEST_QUERY_CHANGE_DOC = "SELECT * FROM cmis:document WHERE cmis:name='"+REPLACER+"'";
Modified: incubator/lcf/trunk/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/pom.xml?rev=1183401&r1=1183400&r2=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/pom.xml (original)
+++ incubator/lcf/trunk/tests/filesystem/pom.xml Fri Oct 14 16:02:42 2011
@@ -30,7 +30,7 @@
<name>ManifoldCF - Test - Filesystem</name>
<build>
- <defaultGoal>test</defaultGoal>
+ <defaultGoal>integration-test</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -72,8 +72,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.10</version>
<configuration>
+ <skipTests>${skipITs}</skipTests>
<systemPropertyVariables>
<crawlerWarPath>../dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
<authorityserviceWarPath>../dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
@@ -86,7 +88,6 @@
<workingDirectory>target/test-output</workingDirectory>
</configuration>
</plugin>
-
</plugins>
</build>
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class APISanityHSQLDBTest extends BaseHSQLDB
+public class APISanityHSQLDBIT extends BaseHSQLDB
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class APISanityTest extends Base
+public class APISanityIT extends Base
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class APISanityPostgresqlTest extends BasePostgresql
+public class APISanityPostgresqlIT extends BasePostgresql
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a test which checks to see if document expiration works properly. */
-public class ExpirationHSQLDBTest extends BaseHSQLDB
+public class ExpirationHSQLDBIT extends BaseHSQLDB
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a test which checks to see if document expiration works properly. */
-public class ExpirationTest extends Base
+public class ExpirationIT extends Base
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a test which checks to see if document expiration works properly. */
-public class ExpirationPostgresqlTest extends BasePostgresql
+public class ExpirationPostgresqlIT extends BasePostgresql
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a test which checks to be sure hopcount functionality is working properly. */
-public class HopcountHSQLDBTest extends BaseHSQLDB
+public class HopcountHSQLDBIT extends BaseHSQLDB
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a test which checks to be sure hopcount functionality is working properly. */
-public class HopcountTest extends Base
+public class HopcountIT extends Base
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a test which checks to be sure hopcount functionality is working properly. */
-public class HopcountPostgresqlTest extends BasePostgresql
+public class HopcountPostgresqlIT extends BasePostgresql
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class SanityHSQLDBTest extends BaseHSQLDB
+public class SanityHSQLDBIT extends BaseHSQLDB
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class SanityTest extends Base
+public class SanityIT extends Base
{
@Before
Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlIT.java (from r1183168, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlIT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlIT.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlIT.java Fri Oct 14 16:02:42 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class SanityPostgresqlTest extends BasePostgresql
+public class SanityPostgresqlIT extends BasePostgresql
{
@Before
Modified: incubator/lcf/trunk/tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/pom.xml?rev=1183401&r1=1183400&r2=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/pom.xml (original)
+++ incubator/lcf/trunk/tests/pom.xml Fri Oct 14 16:02:42 2011
@@ -38,10 +38,7 @@
<module>filesystem</module>
<module>sharepoint</module>
</modules>
-
<build>
- <defaultGoal>test</defaultGoal>
+ <defaultGoal>integration-test</defaultGoal>
</build>
-
-
</project>
\ No newline at end of file
Modified: incubator/lcf/trunk/tests/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/pom.xml?rev=1183401&r1=1183400&r2=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/wiki/pom.xml (original)
+++ incubator/lcf/trunk/tests/wiki/pom.xml Fri Oct 14 16:02:42 2011
@@ -72,7 +72,8 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.10</version>
<configuration>
<systemPropertyVariables>
<crawlerWarPath>../dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
@@ -85,6 +86,20 @@
<forkMode>always</forkMode>
<workingDirectory>target/test-output</workingDirectory>
</configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
Copied: incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyIT.java (from r1183168, incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyIT.java?p2=incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyIT.java&p1=incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyTest.java&r1=1183168&r2=1183401&rev=1183401&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyTest.java (original)
+++ incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyIT.java Fri Oct 14 16:02:42 2011
@@ -30,7 +30,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class SanityDerbyTest extends BaseDerby
+public class SanityDerbyIT extends BaseDerby
{
protected static Map<String,String> initialCheckResources;
protected static Map<String,String> initialListResources;