directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1378025 - in /directory/apacheds/branches/apacheds-txns/protocol-ldap: pom.xml src/test/java/org/apache/directory/server/ldap/JournalIT.java src/test/java/org/apache/directory/server/ldap/JournalTest.java
Date Tue, 28 Aug 2012 08:59:30 GMT
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 @@
       </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/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 <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  *
  */
-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 );
         }



Mime
View raw message