directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1395477 - in /directory/apacheds/trunk/server-integ: pom.xml src/test/java/org/apache/directory/IndexIT.java src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java src/test/java/org/apache/directory/server/suites/
Date Mon, 08 Oct 2012 08:55:40 GMT
Author: elecharny
Date: Mon Oct  8 08:55:39 2012
New Revision: 1395477

URL: http://svn.apache.org/viewvc?rev=1395477&view=rev
Log:
o Removed the suite
o Renamed the test to *IT so that they are executed 
o Modified the pom.xml to reflect those changes

Added:
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java
      - copied, changed from r1395368, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexTest.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java
      - copied, changed from r1395368, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineTest.java
Removed:
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/suites/
Modified:
    directory/apacheds/trunk/server-integ/pom.xml

Modified: directory/apacheds/trunk/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/pom.xml?rev=1395477&r1=1395476&r2=1395477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Mon Oct  8 08:55:39 2012
@@ -264,10 +264,7 @@
               </systemPropertyVariables>
               <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
               <includes>
-                <include>**/*ISuite.java</include>
-                <!-- the replication test class shouldn't be added to a suite, cause it
-                  launches the servers on its own without depending on FrameworkRunner -->
-                <include>**/ClientServerReplicationIT.java</include>
+                <include>**/*IT.java</include>
               </includes>
               <excludes>
                 <exclude>**/*PerfIT.java</exclude>

Copied: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java
(from r1395368, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java?p2=directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java&p1=directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexTest.java&r1=1395368&r2=1395477&rev=1395477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexTest.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java
Mon Oct  8 08:55:39 2012
@@ -48,7 +48,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 
-public class IndexTest
+public class IndexIT
 {
     private static File dbFileDir;
     private static SchemaManager schemaManager;
@@ -64,7 +64,7 @@ public class IndexTest
 
         if ( workingDirectory == null )
         {
-            String path = IndexTest.class.getResource( "" ).getPath();
+            String path = IndexIT.class.getResource( "" ).getPath();
             int targetPos = path.indexOf( "target" );
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
@@ -88,9 +88,9 @@ public class IndexTest
     public void setup() throws Exception
     {
 
-        File tmpIndexFile = File.createTempFile( IndexTest.class.getSimpleName(), "db" );
+        File tmpIndexFile = File.createTempFile( IndexIT.class.getSimpleName(), "db" );
         tmpIndexFile.deleteOnExit();
-        dbFileDir = new File( tmpIndexFile.getParentFile(), IndexTest.class.getSimpleName()
);
+        dbFileDir = new File( tmpIndexFile.getParentFile(), IndexIT.class.getSimpleName()
);
         dbFileDir.mkdirs();
 
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT
);

Copied: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java
(from r1395368, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java?p2=directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java&p1=directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineTest.java&r1=1395368&r2=1395477&rev=1395477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineTest.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java
Mon Oct  8 08:55:39 2012
@@ -54,7 +54,7 @@ import org.junit.runner.RunWith;
 @CreateDS(name = "Dsmlv2EngineTest-DS")
 @CreateLdapServer(transports =
     { @CreateTransport(protocol = "LDAP") })
-public class Dsmlv2EngineTest extends AbstractLdapTestUnit
+public class Dsmlv2EngineIT extends AbstractLdapTestUnit
 {
     private LdapConnection connection;
 



Mime
View raw message