Author: akarasulu Date: Tue Aug 28 08:59:30 2012 New Revision: 1378025 URL: http://svn.apache.org/viewvc?rev=1378025&view=rev Log: making long running integration test require the use of the -Dintegration switch Added: directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java Removed: directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java Modified: directory/apacheds/branches/apacheds-txns/protocol-ldap/pom.xml Modified: directory/apacheds/branches/apacheds-txns/protocol-ldap/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/protocol-ldap/pom.xml?rev=1378025&r1=1378024&r2=1378025&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/protocol-ldap/pom.xml (original) +++ directory/apacheds/branches/apacheds-txns/protocol-ldap/pom.xml Tue Aug 28 08:59:30 2012 @@ -191,4 +191,140 @@ + + + + integration + + integration + + + + + maven-surefire-plugin + + + **/*IT.java + **/*Test.java + + + **/*PerfIT.java + **/*PerfTest.java + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + process-test-resources + + copy + + + + + org.apache.directory.shared + shared-ldap-extras-codec + ${org.apache.directory.shared.version} + ${codec.plugin.directory} + + + + + + + + + + + + quicktest + + true + + + + + maven-surefire-plugin + + + **/*PerfIT.java + **/*PerfTest.java + **/*ITest.java + **/*IT.java + + + org.apache.directory.server.core.factory.LdifPartitionFactory + + ${project.build.directory} + + + false + + + onFirstInit + + + ${project.build.directory}/osgi-cache + + + + + + + maven-antrun-plugin + + + validate + + + +================================================================= + Q U I C K T E S T S + --------------------- + +WARNING: Long running integration tests have been disabled! +================================================================= + + + + + run + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + process-test-resources + + copy + + + + + org.apache.directory.shared + shared-ldap-extras-codec + ${org.apache.directory.shared.version} + ${codec.plugin.directory} + + + + + + + + + + + Copied: directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalIT.java?p2=directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalIT.java&p1=directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java&r1=1377773&r2=1378025&rev=1378025&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java (original) +++ directory/apacheds/branches/apacheds-txns/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalIT.java Tue Aug 28 08:59:30 2012 @@ -58,7 +58,7 @@ import org.junit.Test; * @author Apache Directory Project * */ -public class JournalTest +public class JournalIT { private static final String TEST_OUTPUT_PATH = "test.output.path"; @@ -88,7 +88,7 @@ public class JournalTest if ( workingDirectory == null ) { - String path = JournalTest.class.getResource( "" ).getPath(); + String path = JournalIT.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); }