directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r438374 - in /directory/branches/apacheds/1.0: core-unit/ core-unit/src/test/java/org/apache/directory/server/core/jndi/ core/src/test/java/org/apache/directory/server/core/jndi/ server-ssl/ server-ssl/src/test/java/org/apache/directory/ser...
Date Wed, 30 Aug 2006 05:20:57 GMT
Author: akarasulu
Date: Tue Aug 29 22:20:57 2006
New Revision: 438374

URL: http://svn.apache.org/viewvc?rev=438374&view=rev
Log:
Fixes for DIRSERVER-648: Make LdapsTest and RootDSETests only run with -Dintegration test
profile

Added:
    directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/RootDSEITest.java
      - copied, changed from r438345, directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java
    directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
      - copied, changed from r438345, directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java
Removed:
    directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java
    directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java
Modified:
    directory/branches/apacheds/1.0/core-unit/pom.xml
    directory/branches/apacheds/1.0/server-ssl/pom.xml

Modified: directory/branches/apacheds/1.0/core-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core-unit/pom.xml?rev=438374&r1=438373&r2=438374&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/core-unit/pom.xml (original)
+++ directory/branches/apacheds/1.0/core-unit/pom.xml Tue Aug 29 22:20:57 2006
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
-      <version>1.2.25   </version>
+      <version>1.2.25</version>
       <scope>provided</scope>
     </dependency>
 

Copied: directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/RootDSEITest.java
(from r438345, directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/RootDSEITest.java?p2=directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/RootDSEITest.java&p1=directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java&r1=438345&r2=438374&rev=438374&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java
(original)
+++ directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/RootDSEITest.java
Tue Aug 29 22:20:57 2006
@@ -46,7 +46,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class RootDSETest extends TestCase
+public class RootDSEITest extends TestCase
 {
     /** flag whether to delete database files for each test or not */
     protected boolean doDelete = true;

Modified: directory/branches/apacheds/1.0/server-ssl/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-ssl/pom.xml?rev=438374&r1=438373&r2=438374&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/server-ssl/pom.xml (original)
+++ directory/branches/apacheds/1.0/server-ssl/pom.xml Tue Aug 29 22:20:57 2006
@@ -36,5 +36,145 @@
       <version>0.9.4</version>
     </dependency>
   </dependencies>
+
+
+  <profiles>
+    <profile>
+    <id>no-integration-or-perf-tests</id>
+    <activation>
+      <activeByDefault>true</activeByDefault>
+    </activation>
+    <build>
+      <plugins>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <exclude>**/*ITest.java</exclude>
+              <exclude>**/*PTest.java</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+=================================================================
+                          W A R N I N G
+                          -------------
+                  
+Integration and performance tests have been disabled.  To enable 
+integration tests run maven with the -Dintegration switch.  To 
+enable performance tests run maven with the -Dperformance switch.
+=================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+   	    </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>integration</id>
+      <activation>
+        <property><name>integration</name></property>
+      </activation>
+    <build>
+      <plugins>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <exclude>**/*PTest.java</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+=================================================================
+                   I N T E G R A T I O N
+                   ---------------------
+                  
+Performance tests have been disabled.  To enable 
+performance tests run maven with the -Dperformance switch.
+=================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+   	    </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>performance</id>
+      <activation>
+        <property><name>performance</name></property>
+      </activation>
+    <build>
+      <plugins>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <systemProperties>
+              <property>
+                <name>outputDirectory</name>
+                <value>${basedir}/target</value>
+              </property>
+            </systemProperties>
+            <excludes>
+              <exclude>**/*ITest.java</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+=================================================================
+                   P E R F O R M A N C E
+                   ---------------------
+                  
+Integration tests have been disabled.  To enable integration
+tests run maven with the -Dintegration switch.
+=================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+   	    </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+
 </project>
 

Copied: directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
(from r438345, directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java?p2=directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java&p1=directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java&r1=438345&r2=438374&rev=438374&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java
(original)
+++ directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
Tue Aug 29 22:20:57 2006
@@ -44,7 +44,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class LdapsTest extends AbstractServerTest
+public class LdapsITest extends AbstractServerTest
 {
     private static final String RDN = "cn=The Person";
 



Mime
View raw message