You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/12/22 08:54:25 UTC
svn commit: r893106 - in /directory/sandbox/kayyagari/integ-test-framework: ./ src/main/java/org/apache/directory/server/core/integ/ src/test/java/org/apache/directory/server/core/integ/

Author: elecharny
Date: Tue Dec 22 07:54:19 2009
New Revision: 893106

URL: http://svn.apache.org/viewvc?rev=893106&view=rev
Log:
Finishing up the shuffling

Added:
    directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/TestLevelFactory.java
      - copied unchanged from r893099, directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestLevelFactory.java
Removed:
    directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestLevelFactory.java
Modified:
    directory/sandbox/kayyagari/integ-test-framework/pom.xml
    directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
    directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkDirectoryServiceFactory.java
    directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
    directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java

Modified: directory/sandbox/kayyagari/integ-test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-framework/pom.xml?rev=893106&r1=893105&r2=893106&view=diff
==============================================================================
--- directory/sandbox/kayyagari/integ-test-framework/pom.xml (original)
+++ directory/sandbox/kayyagari/integ-test-framework/pom.xml Tue Dec 22 07:54:19 2009
@@ -17,8 +17,8 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.7</version>
-      <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

Modified: directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java?rev=893106&r1=893105&r2=893106&view=diff
==============================================================================
--- directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java (original)
+++ directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java Tue Dec 22 07:54:19 2009
@@ -19,8 +19,6 @@
 package org.apache.directory.server.core.integ;
 
 
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.util.HashSet;
 import java.util.List;
@@ -114,7 +112,7 @@
 
             if ( errors.size() != 0 )
             {
-                fail( "Schema load failed : " + ExceptionUtils.printErrors( errors ) );
+                throw new Exception( "Schema load failed : " + ExceptionUtils.printErrors( errors ) );
             }
 
             extractor.extractOrCopy();

Modified: directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkDirectoryServiceFactory.java?rev=893106&r1=893105&r2=893106&view=diff
==============================================================================
--- directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkDirectoryServiceFactory.java (original)
+++ directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkDirectoryServiceFactory.java Tue Dec 22 07:54:19 2009
@@ -1,8 +1,6 @@
 package org.apache.directory.server.core.integ;
 
 
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.util.HashSet;
 import java.util.List;
@@ -77,7 +75,7 @@
 
         if ( errors.size() != 0 )
         {
-            fail( "Schema load failed : " + ExceptionUtils.printErrors( errors ) );
+            throw new Exception( "Schema load failed : " + ExceptionUtils.printErrors( errors ) );
         }
 
         schemaPartition.setSchemaManager( schemaManager );

Modified: directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=893106&r1=893105&r2=893106&view=diff
==============================================================================
--- directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java (original)
+++ directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java Tue Dec 22 07:54:19 2009
@@ -19,8 +19,6 @@
 package org.apache.directory.server.core.integ;
 
 
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.lang.reflect.Field;
 import java.util.HashSet;
@@ -167,7 +165,7 @@
 
         if ( errors.size() != 0 )
         {
-            fail( "Schema load failed : " + ExceptionUtils.printErrors( errors ) );
+            throw new Exception( "Schema load failed : " + ExceptionUtils.printErrors( errors ) );
         }
 
         extractor.extractOrCopy();

Modified: directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java?rev=893106&r1=893105&r2=893106&view=diff
==============================================================================
--- directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java (original)
+++ directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java Tue Dec 22 07:54:19 2009
@@ -2,8 +2,6 @@
 
 
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.server.core.DirectoryService;