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:04:47 UTC
svn commit: r1378008 - in
/directory/apacheds/branches/apacheds-txns/core-shared: ./
src/test/java/org/apache/directory/server/core/shared/txn/
Author: akarasulu
Date: Tue Aug 28 08:04:47 2012
New Revision: 1378008
URL: http://svn.apache.org/viewvc?rev=1378008&view=rev
Log:
adding profiles for long running integration tests
Added:
directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeIT.java
- copied, changed from r1377773, directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java
Removed:
directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java
Modified:
directory/apacheds/branches/apacheds-txns/core-shared/pom.xml
directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/IndexCursorWrapperTest.java
Modified: directory/apacheds/branches/apacheds-txns/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/pom.xml?rev=1378008&r1=1378007&r2=1378008&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/pom.xml Tue Aug 28 08:04:47 2012
@@ -140,5 +140,136 @@
</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>
+ </includes>
+ <excludes>
+ <exclude>**/*PerfIT.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>**/*PerfTest.java</exclude>
+ <exclude>**/*ITest.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-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeIT.java (from r1377773, directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeIT.java?p2=directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeIT.java&p1=directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java&r1=1377773&r2=1378008&rev=1378008&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeIT.java Tue Aug 28 08:04:47 2012
@@ -57,7 +57,7 @@ import org.junit.rules.TemporaryFolder;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EntryUpdateMergeTest extends AbstractPartitionTest
+public class EntryUpdateMergeIT extends AbstractPartitionTest
{
/** Test partition Dn */
private Dn dn;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/IndexCursorWrapperTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/IndexCursorWrapperTest.java?rev=1378008&r1=1378007&r2=1378008&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/IndexCursorWrapperTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/IndexCursorWrapperTest.java Tue Aug 28 08:04:47 2012
@@ -62,9 +62,6 @@ public class IndexCursorWrapperTest exte
/** Mock attribute oid */
private String attributeOid = "mockOid";
- /** Mock index with the mock attributeoid */
- private MockIndex mockIndex;
-
/** Log buffer size : 4096 bytes */
private int logBufferSize = 1 << 12;