Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F9BADA4D for ; Tue, 28 Aug 2012 09:07:28 +0000 (UTC) Received: (qmail 60682 invoked by uid 500); 28 Aug 2012 09:07:21 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 60612 invoked by uid 500); 28 Aug 2012 09:07:20 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 60566 invoked by uid 99); 28 Aug 2012 09:07:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Aug 2012 09:07:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Aug 2012 09:07:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2E24B23888FE for ; Tue, 28 Aug 2012 09:06:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1378028 - in /directory/apacheds/branches/apacheds-txns/test-framework: ./ src/test/java/org/apache/directory/server/core/integ/ Date: Tue, 28 Aug 2012 09:06:33 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120828090634.2E24B23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Tue Aug 28 09:06:32 2012 New Revision: 1378028 URL: http://svn.apache.org/viewvc?rev=1378028&view=rev Log: making long running integration test require the use of the -Dintegration switch Added: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassAIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassBIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassCIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServerIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDSIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDS.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServerIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactoryIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServerIT.java - copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java Removed: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDS.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java Modified: directory/apacheds/branches/apacheds-txns/test-framework/pom.xml Modified: directory/apacheds/branches/apacheds-txns/test-framework/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/pom.xml?rev=1378028&r1=1378027&r2=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/pom.xml (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/pom.xml Tue Aug 28 09:06:32 2012 @@ -128,4 +128,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/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassAIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassAIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassAIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassAIT.java Tue Aug 28 09:06:32 2012 @@ -44,7 +44,7 @@ import org.junit.runner.RunWith; "sn: sn_testClassA2" }) -public class TestClassA extends AbstractLdapTestUnit +public class TestClassAIT extends AbstractLdapTestUnit { @Test @CreateDS( name="testDS" ) Copied: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassBIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassBIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassBIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassBIT.java Tue Aug 28 09:06:32 2012 @@ -35,7 +35,7 @@ import org.junit.runner.RunWith; "cn: testClassB", "sn: sn_testClassB" }) -public class TestClassB extends AbstractLdapTestUnit +public class TestClassBIT extends AbstractLdapTestUnit { @Test Copied: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassCIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassCIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassCIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassCIT.java Tue Aug 28 09:06:32 2012 @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith( FrameworkRunner.class ) -public class TestClassC extends AbstractLdapTestUnit +public class TestClassCIT extends AbstractLdapTestUnit { @Test public void testWithoutMethodOrClassLevelFactory() throws Exception Copied: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServerIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServerIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServerIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServerIT.java Tue Aug 28 09:06:32 2012 @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith( FrameworkRunner.class ) -public class TestClassServer extends AbstractLdapTestUnit +public class TestClassServerIT extends AbstractLdapTestUnit { @Test @ApplyLdifFiles( "test-entry.ldif" ) Copied: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDSIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDS.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDSIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDSIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDS.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDS.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDSIT.java Tue Aug 28 09:06:32 2012 @@ -35,7 +35,7 @@ import org.junit.runner.RunWith; */ @RunWith( FrameworkRunner.class ) @CreateDS( name = "TestMultiLevelDS-class" ) -public class TestMultiLevelDS extends AbstractLdapTestUnit +public class TestMultiLevelDSIT extends AbstractLdapTestUnit { @Test Copied: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteIT.java Tue Aug 28 09:06:32 2012 @@ -24,7 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith( FrameworkSuite.class ) -@Suite.SuiteClasses( { TestClassA.class, TestClassB.class, TestClassC.class } ) +@Suite.SuiteClasses( { TestClassAIT.class, TestClassBIT.class, TestClassCIT.class } ) @CreateDS( name = "SuiteDS" ) @ApplyLdifs( { @@ -33,6 +33,6 @@ import org.junit.runners.Suite; "cn: testSuite", "sn: sn_testSuite" }) -public class TestSuite +public class TestSuiteIT { } Copied: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServerIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServerIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServerIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServerIT.java Tue Aug 28 09:06:32 2012 @@ -29,7 +29,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith( FrameworkSuite.class ) -@Suite.SuiteClasses( { TestClassServer.class, TestMultiLevelDS.class } ) +@Suite.SuiteClasses( { TestClassServerIT.class, TestMultiLevelDSIT.class } ) @CreateDS( name = "SuiteDS", partitions = @@ -63,6 +63,6 @@ import org.junit.runners.Suite; "cn: testSuite", "sn: sn_testSuite" } ) -public class TestSuiteServer +public class TestSuiteServerIT { } Copied: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactoryIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactoryIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactoryIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactoryIT.java Tue Aug 28 09:06:32 2012 @@ -23,7 +23,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith( FrameworkSuite.class ) -@Suite.SuiteClasses({ TestClassA.class, TestClassB.class, TestClassC.class }) +@Suite.SuiteClasses({ TestClassAIT.class, TestClassBIT.class, TestClassCIT.class }) @ApplyLdifs( { "dn: cn=testSuite,ou=system", @@ -31,6 +31,6 @@ import org.junit.runners.Suite; "cn: testSuite", "sn: sn_testSuite" }) -public class TestSuiteWithoutFactory +public class TestSuiteWithoutFactoryIT { } Copied: directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServerIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServerIT.java?p2=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServerIT.java&p1=directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java&r1=1377773&r2=1378028&rev=1378028&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java (original) +++ directory/apacheds/branches/apacheds-txns/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServerIT.java Tue Aug 28 09:06:32 2012 @@ -35,7 +35,7 @@ import org.junit.runner.RunWith; { @CreateTransport( protocol = "LDAP" ) }) -public class TestWithClassLevelLdapServer extends AbstractLdapTestUnit +public class TestWithClassLevelLdapServerIT extends AbstractLdapTestUnit { @Test @ApplyLdifFiles( "test-entry.ldif" )