You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2012/08/28 10:28:34 UTC
svn commit: r1378018 - in
/directory/apacheds/branches/apacheds-txns/core-annotations: ./
src/test/java/org/apache/directory/server/core/factory/
Author: akarasulu
Date: Tue Aug 28 08:28:33 2012
New Revision: 1378018
URL: http://svn.apache.org/viewvc?rev=1378018&view=rev
Log:
making long running integration test require the use of the -Dintegration switch
Added:
directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationIT.java
- copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryIT.java
- copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
Removed:
directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
Modified:
directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml
Modified: directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml?rev=1378018&r1=1378017&r2=1378018&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml Tue Aug 28 08:28:33 2012
@@ -151,4 +151,140 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>integration</id>
+ <activation>
+ <property><name>integration</name></property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*IT.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*PerfIT.java</exclude>
+ <exclude>**/*PerfTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-codec</artifactId>
+ <version>${org.apache.directory.shared.version}</version>
+ <outputDirectory>${codec.plugin.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>quicktest</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*PerfIT.java</exclude>
+ <exclude>**/*PerfTest.java</exclude>
+ <exclude>**/*ITest.java</exclude>
+ <exclude>**/*IT.java</exclude>
+ </excludes>
+ <systemPropertyVariables>
+ <apacheds.partition.factory>org.apache.directory.server.core.factory.LdifPartitionFactory</apacheds.partition.factory>
+ <felix.cache.rootdir>
+ ${project.build.directory}
+ </felix.cache.rootdir>
+ <felix.cache.locking>
+ false
+ </felix.cache.locking>
+ <org.osgi.framework.storage.clean>
+ onFirstInit
+ </org.osgi.framework.storage.clean>
+ <org.osgi.framework.storage>
+ ${project.build.directory}/osgi-cache
+ </org.osgi.framework.storage>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <echo>
+=================================================================
+ Q U I C K T E S T S
+ ---------------------
+
+WARNING: Long running integration tests have been disabled!
+=================================================================
+ </echo>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-codec</artifactId>
+ <version>${org.apache.directory.shared.version}</version>
+ <outputDirectory>${codec.plugin.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Copied: directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationIT.java?p2=directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationIT.java&p1=directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java&r1=1377773&r2=1378018&rev=1378018&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationIT.java Tue Aug 28 08:28:33 2012
@@ -43,7 +43,7 @@ import org.junit.Test;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@CreateDS( name = "classDS" )
-public class DirectoryServiceAnnotationTest
+public class DirectoryServiceAnnotationIT
{
@Test
public void testCreateDS() throws Exception
Copied: directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryIT.java?p2=directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryIT.java&p1=directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java&r1=1377773&r2=1378018&rev=1378018&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryIT.java Tue Aug 28 08:28:33 2012
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith;
*/
@RunWith(ConcurrentJunitRunner.class)
@Concurrency()
-public class DirectoryServiceFactoryTest
+public class DirectoryServiceFactoryIT
{
@Test
public void testCreateDS() throws Exception