directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r809533 - in /directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core: authn/ authz/support/ interceptor/ partition/impl/btree/jdbm/ prefs/ schema/ schema/bootstrap/ sp/ subtree/
Date Mon, 31 Aug 2009 10:43:06 GMT
Author: elecharny
Date: Mon Aug 31 10:43:05 2009
New Revision: 809533

URL: http://svn.apache.org/viewvc?rev=809533&view=rev
Log:
Moved to Junit 4.5 annotations

Modified:
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java
Mon Aug 31 10:43:05 2009
@@ -23,8 +23,9 @@
 
 import org.apache.directory.server.core.authn.SimpleAuthenticator;
 import org.apache.directory.shared.ldap.util.StringTools;
-
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 
 /**
@@ -32,18 +33,20 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SimpleAuthenticatorOneWayEncryptedTest extends TestCase
+public class SimpleAuthenticatorOneWayEncryptedTest
 {
     private SimpleAuthenticator auth = null;
 
 
+    @Before
     protected void setUp() throws Exception
     {
-        super.setUp();
+
         this.auth = new SimpleAuthenticator();
     }
 
 
+    @Test
     public void testGetAlgorithmForHashedPassword()
     {
         String digestetValue = "{SHA}LhkDrSoM6qr0fW6hzlfOJQW61tc=";
@@ -60,6 +63,7 @@
     }
 
 
+    @Test
     public void testCreateDigestedPassword() throws IllegalArgumentException
     {
         String pwd = "Secret1!";

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
Mon Aug 31 10:43:05 2009
@@ -26,8 +26,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
 
 import org.apache.directory.server.core.authz.support.HighestPrecedenceFilter;
 import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -35,6 +34,7 @@
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.junit.Test;
 
 
 /**
@@ -44,7 +44,7 @@
  * @version $Rev$, $Date$
  *
  */
-public class HighestPrecedenceFilterTest extends TestCase
+public class HighestPrecedenceFilterTest
 {
     private static final Collection<ProtectedItem> PI_EMPTY_COLLECTION = Collections.unmodifiableCollection(
new ArrayList<ProtectedItem>() );
     private static final Collection<UserClass> UC_EMPTY_COLLECTION = Collections.unmodifiableCollection(
new ArrayList<UserClass>() );
@@ -52,14 +52,16 @@
     private static final Set<MicroOperation> MO_EMPTY_SET = Collections.unmodifiableSet(
new HashSet<MicroOperation>() );
 
 
+    @Test
     public void testZeroTuple() throws Exception
     {
         HighestPrecedenceFilter filter = new HighestPrecedenceFilter();
-        Assert.assertEquals( 0, filter.filter( null, AT_EMPTY_COLLECTION, null, null, null,
null, null, null, null, null, null,
+        assertEquals( 0, filter.filter( null, AT_EMPTY_COLLECTION, null, null, null, null,
null, null, null, null, null,
             null, null, null ).size() );
     }
 
 
+    @Test
     public void testOneTuple() throws Exception
     {
         HighestPrecedenceFilter filter = new HighestPrecedenceFilter();
@@ -68,11 +70,12 @@
         tuples.add( new ACITuple( UC_EMPTY_COLLECTION, AuthenticationLevel.NONE, PI_EMPTY_COLLECTION,
MO_EMPTY_SET, true, 10 ) );
         tuples = Collections.unmodifiableCollection( tuples );
         
-        Assert.assertEquals( tuples, filter.filter( null, tuples, null, null, null, null,
null, null, null, null, null, null,
+        assertEquals( tuples, filter.filter( null, tuples, null, null, null, null, null,
null, null, null, null, null,
             null, null ) );
     }
 
 
+    @Test
     public void testMoreThanOneTuples() throws Exception
     {
         final int MAX_PRECEDENCE = 10;
@@ -92,7 +95,7 @@
 
         for ( ACITuple tuple:tuples )
         {
-            Assert.assertEquals( MAX_PRECEDENCE, tuple.getPrecedence() );
+            assertEquals( MAX_PRECEDENCE, tuple.getPrecedence() );
         }
     }
 }

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
Mon Aug 31 10:43:05 2009
@@ -26,8 +26,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
 
 import org.apache.directory.server.core.authz.support.MicroOperationFilter;
 import org.apache.directory.server.core.authz.support.OperationScope;
@@ -36,6 +35,7 @@
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.junit.Test;
 
 
 /**
@@ -44,7 +44,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class MicroOperationFilterTest extends TestCase
+public class MicroOperationFilterTest
 {
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection(
new ArrayList<ACITuple>() );
     private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION = Collections.unmodifiableCollection(
new ArrayList<UserClass>() );
@@ -66,15 +66,17 @@
     }
 
 
+    @Test
     public void testZeroTuple() throws Exception
     {
         MicroOperationFilter filter = new MicroOperationFilter();
 
-        Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,

+        assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,

             null, null, null, null, null, null, null, null, null, null, null ).size() );
     }
 
 
+    @Test
     public void testOneTuple() throws Exception
     {
         MicroOperationFilter filter = new MicroOperationFilter();
@@ -83,9 +85,9 @@
         tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
EMPTY_PROTECTED_ITEM_COLLECTION, 
             TUPLE_OPERATIONS, true, 0 ) );
 
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null, null, null, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null, null, null, null,
             null, null, USER_OPERATIONS_A, null ).size() );
-        Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null, null, null, null,
+        assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null, null, null, null,
             null, null, USER_OPERATIONS_B, null ).size() );
     }
 }

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
Mon Aug 31 10:43:05 2009
@@ -29,8 +29,8 @@
 
 import javax.naming.directory.Attribute;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 import org.apache.directory.server.core.authz.support.MostSpecificProtectedItemFilter;
 import org.apache.directory.server.core.authz.support.OperationScope;
@@ -40,6 +40,7 @@
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.junit.Test;
 
 
 /**
@@ -48,7 +49,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class MostSpecificProtectedItemFilterTest extends TestCase
+public class MostSpecificProtectedItemFilterTest
 {
     private static final Collection<String> EMPTY_STRING_COLLECTION = Collections.unmodifiableCollection(
new ArrayList<String>() );
     
@@ -143,21 +144,23 @@
     }
 
 
+    @Test
     public void testZeroOrOneTuple() throws Exception
     {
         MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
 
-        Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null,
+        assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null,
             null, null, null, null, null, null, null, null, null ).size() );
 
         Collection<ACITuple> tuples = new ArrayList<ACITuple>();
         tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, false, 0 ) );
 
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null, null, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null, null, null,
             null, null, null, null, null, null, null ).size() );
     }
 
 
+    @Test
     public void testTuplesA() throws Exception
     {
         MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
@@ -166,14 +169,15 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 4, tuples.size() );
-        Assert.assertSame( TUPLES_A.get( 0 ), tuples.get( 0 ) );
-        Assert.assertSame( TUPLES_A.get( 1 ), tuples.get( 1 ) );
-        Assert.assertSame( TUPLES_A.get( 2 ), tuples.get( 2 ) );
-        Assert.assertSame( TUPLES_A.get( 3 ), tuples.get( 3 ) );
+        assertEquals( 4, tuples.size() );
+        assertSame( TUPLES_A.get( 0 ), tuples.get( 0 ) );
+        assertSame( TUPLES_A.get( 1 ), tuples.get( 1 ) );
+        assertSame( TUPLES_A.get( 2 ), tuples.get( 2 ) );
+        assertSame( TUPLES_A.get( 3 ), tuples.get( 3 ) );
     }
 
 
+    @Test
     public void testTuplesB() throws Exception
     {
         MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
@@ -182,13 +186,14 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 3, tuples.size() );
-        Assert.assertSame( TUPLES_B.get( 0 ), tuples.get( 0 ) );
-        Assert.assertSame( TUPLES_B.get( 1 ), tuples.get( 1 ) );
-        Assert.assertSame( TUPLES_B.get( 2 ), tuples.get( 2 ) );
+        assertEquals( 3, tuples.size() );
+        assertSame( TUPLES_B.get( 0 ), tuples.get( 0 ) );
+        assertSame( TUPLES_B.get( 1 ), tuples.get( 1 ) );
+        assertSame( TUPLES_B.get( 2 ), tuples.get( 2 ) );
     }
 
 
+    @Test
     public void testTuplesC() throws Exception
     {
         MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
@@ -197,12 +202,13 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 2, tuples.size() );
-        Assert.assertSame( TUPLES_C.get( 0 ), tuples.get( 0 ) );
-        Assert.assertSame( TUPLES_C.get( 1 ), tuples.get( 1 ) );
+        assertEquals( 2, tuples.size() );
+        assertSame( TUPLES_C.get( 0 ), tuples.get( 0 ) );
+        assertSame( TUPLES_C.get( 1 ), tuples.get( 1 ) );
     }
 
 
+    @Test
     public void testTuplesD() throws Exception
     {
         MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
@@ -211,11 +217,12 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 1, tuples.size() );
-        Assert.assertSame( TUPLES_D.get( 0 ), tuples.get( 0 ) );
+        assertEquals( 1, tuples.size() );
+        assertSame( TUPLES_D.get( 0 ), tuples.get( 0 ) );
     }
 
 
+    @Test
     public void testTuplesE() throws Exception
     {
         MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
@@ -224,8 +231,8 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 2, tuples.size() );
-        Assert.assertSame( TUPLES_E.get( 0 ), tuples.get( 0 ) );
-        Assert.assertSame( TUPLES_E.get( 1 ), tuples.get( 1 ) );
+        assertEquals( 2, tuples.size() );
+        assertSame( TUPLES_E.get( 0 ), tuples.get( 0 ) );
+        assertSame( TUPLES_E.get( 1 ), tuples.get( 1 ) );
     }
 }

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
Mon Aug 31 10:43:05 2009
@@ -27,8 +27,8 @@
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 import org.apache.directory.server.core.authz.support.MostSpecificUserClassFilter;
 import org.apache.directory.server.core.authz.support.OperationScope;
@@ -39,6 +39,7 @@
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
+import org.junit.Test;
 
 
 /**
@@ -47,7 +48,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class MostSpecificUserClassFilterTest extends TestCase
+public class MostSpecificUserClassFilterTest
 {
     private static final Set<LdapDN> EMPTY_NAME_SET = Collections.unmodifiableSet(
new HashSet<LdapDN>() );
     private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet(
new HashSet<MicroOperation>() );
@@ -105,21 +106,23 @@
     }
 
 
+    @Test
     public void testZeroOrOneTuple() throws Exception
     {
         MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
 
-        Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null,
+        assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null,
             null, null, null, null, null, null, null, null, null ).size() );
 
         Collection<ACITuple> tuples = new ArrayList<ACITuple>();
         tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, false, 0 ) );
 
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null, null, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null, null, null,
             null, null, null, null, null, null, null ).size() );
     }
 
 
+    @Test
     public void testNameAndThisEntry() throws Exception
     {
         MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
@@ -128,12 +131,13 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 2, tuples.size() );
-        Assert.assertSame( TUPLES_A.get( 0 ), tuples.get( 0 ) );
-        Assert.assertSame( TUPLES_A.get( 1 ), tuples.get( 1 ) );
+        assertEquals( 2, tuples.size() );
+        assertSame( TUPLES_A.get( 0 ), tuples.get( 0 ) );
+        assertSame( TUPLES_A.get( 1 ), tuples.get( 1 ) );
     }
 
 
+    @Test
     public void testThisEntry() throws Exception
     {
         MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
@@ -142,11 +146,12 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 1, tuples.size() );
-        Assert.assertSame( TUPLES_B.get( 0 ), tuples.get( 0 ) );
+        assertEquals( 1, tuples.size() );
+        assertSame( TUPLES_B.get( 0 ), tuples.get( 0 ) );
     }
 
 
+    @Test
     public void testUserGroup() throws Exception
     {
         MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
@@ -155,11 +160,12 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 1, tuples.size() );
-        Assert.assertSame( TUPLES_C.get( 0 ), tuples.get( 0 ) );
+        assertEquals( 1, tuples.size() );
+        assertSame( TUPLES_C.get( 0 ), tuples.get( 0 ) );
     }
 
 
+    @Test
     public void testSubtree() throws Exception
     {
         MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
@@ -168,11 +174,12 @@
         tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 1, tuples.size() );
-        Assert.assertSame( TUPLES_D.get( 0 ), tuples.get( 0 ) );
+        assertEquals( 1, tuples.size() );
+        assertSame( TUPLES_D.get( 0 ), tuples.get( 0 ) );
     }
 
 
+    @Test
     public void testOthers() throws Exception
     {
         MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
@@ -181,8 +188,8 @@
         tuples = (List<ACITuple>)filter.filter( null, tuples, OperationScope.ENTRY,
null, null, null, null, null, null, null, null,
             null, null, null );
 
-        Assert.assertEquals( 2, tuples.size() );
-        Assert.assertSame( TUPLES_E.get( 0 ), tuples.get( 0 ) );
-        Assert.assertSame( TUPLES_E.get( 1 ), tuples.get( 1 ) );
+        assertEquals( 2, tuples.size() );
+        assertSame( TUPLES_E.get( 0 ), tuples.get( 0 ) );
+        assertSame( TUPLES_E.get( 1 ), tuples.get( 1 ) );
     }
 }

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java
Mon Aug 31 10:43:05 2009
@@ -21,9 +21,10 @@
 
 
 import org.apache.directory.server.core.authz.support.OperationScope;
+import org.junit.Test;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 
 /**
@@ -33,21 +34,23 @@
  * @version $Rev$, $Date$
  *
  */
-public class OperationScopeTest extends TestCase
+public class OperationScopeTest
 {
+    @Test
     public void testGetName() throws Exception
     {
-        Assert.assertEquals( "Entry", OperationScope.ENTRY.getName() );
-        Assert.assertEquals( "Attribute Type", OperationScope.ATTRIBUTE_TYPE.getName() );
-        Assert.assertEquals( "Attribute Type & Value", OperationScope.ATTRIBUTE_TYPE_AND_VALUE.getName()
);
+        assertEquals( "Entry", OperationScope.ENTRY.getName() );
+        assertEquals( "Attribute Type", OperationScope.ATTRIBUTE_TYPE.getName() );
+        assertEquals( "Attribute Type & Value", OperationScope.ATTRIBUTE_TYPE_AND_VALUE.getName()
);
     }
 
 
+    @Test
     public void testGetNameAndToStringEquality()
     {
-        Assert.assertEquals( OperationScope.ENTRY.getName(), OperationScope.ENTRY.toString()
);
-        Assert.assertEquals( OperationScope.ATTRIBUTE_TYPE.getName(), OperationScope.ATTRIBUTE_TYPE.toString()
);
-        Assert.assertEquals( OperationScope.ATTRIBUTE_TYPE_AND_VALUE.getName(), OperationScope.ATTRIBUTE_TYPE_AND_VALUE
+        assertEquals( OperationScope.ENTRY.getName(), OperationScope.ENTRY.toString() );
+        assertEquals( OperationScope.ATTRIBUTE_TYPE.getName(), OperationScope.ATTRIBUTE_TYPE.toString()
);
+        assertEquals( OperationScope.ATTRIBUTE_TYPE_AND_VALUE.getName(), OperationScope.ATTRIBUTE_TYPE_AND_VALUE
             .toString() );
     }
 }

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
Mon Aug 31 10:43:05 2009
@@ -28,8 +28,8 @@
 
 import javax.naming.NamingException;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 import org.apache.directory.server.core.authz.support.OperationScope;
 import org.apache.directory.server.core.authz.support.RelatedUserClassFilter;
@@ -40,6 +40,7 @@
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.junit.Test;
 
 
 /**
@@ -48,7 +49,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class RelatedUserClassFilterTest extends TestCase
+public class RelatedUserClassFilterTest
 {
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection(
new ArrayList<ACITuple>() );
     private static final Collection<ProtectedItem> EMPTY_PROTECTED_ITEM_COLLECTION
= Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
@@ -84,97 +85,105 @@
     }
 
 
+    @Test
     public void testZeroTuple() throws Exception
     {
-        Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null,
+        assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null,
             null, null, null, null, null, null, null, null, null ).size() );
     }
 
 
+    @Test
     public void testAllUsers() throws Exception
     {
         Collection<ACITuple> tuples = getTuples( UserClass.ALL_USERS );
 
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null,
             AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
     }
 
 
+    @Test
     public void testThisEntry() throws Exception
     {
         Collection<ACITuple> tuples = getTuples( UserClass.THIS_ENTRY );
 
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, USER_NAME, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME,
null,
             AuthenticationLevel.NONE, USER_NAME, null, null, null, null, null ).size() );
-        Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, USER_NAME, null,
+        assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME,
null,
             AuthenticationLevel.NONE, new LdapDN( "ou=unrelated" ), null, null, null, null,
null ).size() );
     }
     
     
+    @Test
     public void testParentOfEntry() throws Exception
     {
         Collection<ACITuple> tuples = getTuples( UserClass.PARENT_OF_ENTRY );
 
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, USER_NAME, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME,
null,
             AuthenticationLevel.NONE, new LdapDN( "ou=phoneBook, ou=test, ou=users, ou=system"
), null, null, null, null, null ).size() );
-        Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, USER_NAME, null,
+        assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME,
null,
             AuthenticationLevel.NONE, new LdapDN( "ou=unrelated" ), null, null, null, null,
null ).size() );
     }
 
 
+    @Test
     public void testName() throws Exception
     {
         Collection<ACITuple> tuples = getTuples( new UserClass.Name( USER_NAMES ) );
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, USER_NAME, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME,
null,
             AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
-        Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null,
null,
+        assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null,
             new LdapDN( "ou=unrelateduser, ou=users" ), null, AuthenticationLevel.NONE, USER_NAME,
null, null, null,
             null, null ).size() );
     }
 
 
+    @Test
     public void testUserGroup() throws Exception
     {
         Collection<ACITuple> tuples = getTuples( new UserClass.UserGroup( GROUP_NAMES
) );
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
GROUP_NAMES, USER_NAME, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, GROUP_NAMES,
USER_NAME, null,
             AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
 
         Set<LdapDN> wrongGroupNames = new HashSet<LdapDN>();
         wrongGroupNames.add( new LdapDN( "ou=unrelatedgroup" ) );
 
-        Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null,
wrongGroupNames, USER_NAME, null,
+        assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, wrongGroupNames,
USER_NAME, null,
             AuthenticationLevel.NONE, USER_NAME, null, null, null, null, null ).size() );
     }
 
 
+    @Test
     public void testSubtree() throws Exception
     {
         // TODO Don't know how to test yet.
     }
 
 
+    @Test
     public void testAuthenticationLevel() throws Exception
     {
         Collection<ACITuple> tuples = getTuples( AuthenticationLevel.SIMPLE, true );
 
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null,
             AuthenticationLevel.STRONG, null, null, null, null, null, null ).size() );
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null,
             AuthenticationLevel.SIMPLE, null, null, null, null, null, null ).size() );
-        Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null,
+        assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null,
             AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
 
         tuples = getTuples( AuthenticationLevel.SIMPLE, false );
 
-        Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null,
+        assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null,
             AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
 
-        Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null,
+        assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null,
             AuthenticationLevel.STRONG, null, null, null, null, null, null ).size() );
 
         tuples = getTuples( AuthenticationLevel.SIMPLE, false );
 
-        Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null,
null, null, null,
+        assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null,
null,
             AuthenticationLevel.SIMPLE, null, null, null, null, null, null ).size() );
     }
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
Mon Aug 31 10:43:05 2009
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.interceptor;
 
 
-import junit.framework.TestCase;
-
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
@@ -45,6 +43,10 @@
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+
 
 import javax.naming.NamingException;
 import javax.naming.ldap.LdapContext;
@@ -64,7 +66,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class InterceptorChainTest extends TestCase
+public class InterceptorChainTest
 {
     private static final int INTERCEPTOR_COUNT = 5;
     private InterceptorChain chain;
@@ -98,6 +100,7 @@
     }
 
 
+    @Test
     public void testNoBypass() throws Exception
     {
         LdapDN dn = new LdapDN( "ou=system" );
@@ -123,6 +126,7 @@
     }
 
 
+    @Test
     public void testSingleBypass() throws Exception
     {
         LdapDN dn = new LdapDN( "ou=system" );
@@ -149,6 +153,7 @@
     }
 
 
+    @Test
     public void testAdjacentDoubleBypass() throws Exception
     {
         LdapDN dn = new LdapDN( "ou=system" );
@@ -178,6 +183,7 @@
     }
 
 
+    @Test
     public void testFrontAndBackDoubleBypass() throws Exception
     {
         LdapDN dn = new LdapDN( "ou=system" );
@@ -206,6 +212,7 @@
     }
 
 
+    @Test
     public void testDoubleBypass() throws Exception
     {
         LdapDN dn = new LdapDN( "ou=system" );
@@ -234,6 +241,7 @@
     }
 
 
+    @Test
     public void testCompleteBypass() throws Exception
     {
         LdapDN dn = new LdapDN( "ou=system" );

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java
Mon Aug 31 10:43:05 2009
@@ -22,16 +22,17 @@
 import java.io.IOException;
 
 import org.apache.commons.lang.RandomStringUtils;
-
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 /**
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class StringSerializerTest extends TestCase
+public class StringSerializerTest
 {
+    @Test
     public void testRandom() throws IOException
     {
         StringSerializer serializer = new StringSerializer();
@@ -62,6 +63,7 @@
     }
 
     
+    @Test
     public void testConversion()
     {
         for ( char ch = 0; ch < 16383; ch++ )

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
Mon Aug 31 10:43:05 2009
@@ -25,8 +25,9 @@
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.prefs.PreferencesUtils;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.junit.Test;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
 
 
 /**
@@ -35,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class PreferencesUtilsTest extends TestCase
+public class PreferencesUtilsTest
 {
     /**
      * Tests to confirm the toSysDn() method can translate an absolute
@@ -43,6 +44,7 @@
      *
      * @throws NamingException if there are problems transforming the name
      */
+    @Test
     public void testToSysDn() throws NamingException
     {
         // simple test

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
Mon Aug 31 10:43:05 2009
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.schema;
 
 
-import junit.framework.TestCase;
-
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
@@ -63,7 +61,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SchemaCheckerTest extends TestCase
+public class SchemaCheckerTest
 {
     static Registries registries;
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
Mon Aug 31 10:43:05 2009
@@ -26,8 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;
 import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
@@ -36,6 +34,9 @@
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 
 /**
@@ -44,22 +45,22 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapSchemaLoaderTest extends TestCase
+public class BootstrapSchemaLoaderTest
 {
     BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
     DefaultRegistries registries;
 
 
+    @Before
     protected void setUp() throws Exception
     {
-        super.setUp();
         registries = new DefaultRegistries( "bootstrap", loader, new OidRegistry() );
     }
 
 
+    @After
     protected void tearDown() throws Exception
     {
-        super.tearDown();
         registries = null;
     }
 
@@ -88,6 +89,7 @@
     }
 
 
+    @Test
     public void testSystemSchemaLoad() throws Exception
     {
         SystemSchema systemSchema = new SystemSchema();
@@ -105,6 +107,7 @@
     }
 
 
+    @Test
     public void testApacheSchemaLoad() throws Exception
     {
         testSystemSchemaLoad();
@@ -123,6 +126,7 @@
     }
 
 
+    @Test
     public void testEveDepsSchemaLoad() throws Exception
     {
         Set<Schema> schemas = new HashSet<Schema>();
@@ -142,6 +146,7 @@
     }
 
 
+    @Test
     public void testCoreSchemaLoad() throws Exception
     {
         testSystemSchemaLoad();
@@ -160,6 +165,7 @@
     }
 
 
+    @Test
     public void testCoreDepsSchemaLoad() throws Exception
     {
         Set<Schema> schemas = new HashSet<Schema>();
@@ -185,6 +191,7 @@
      *
      * @throws NamingException if there are problems.
      */
+    @Test
     public void testReferentialIntegrity() throws Exception
     {
         if ( System.getProperties().containsKey( "ignore.ref.integ.test" ) )

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java
Mon Aug 31 10:43:05 2009
@@ -21,11 +21,12 @@
 
 package org.apache.directory.server.core.sp;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
-public class StoredProcUtilsTest extends TestCase
+public class StoredProcUtilsTest
 {
-
+    @Test
     public void testSPNameTokenization()
     {
         String fullSPName = "Greeter:seyHello";

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=809533&r1=809532&r2=809533&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
Mon Aug 31 10:43:05 2009
@@ -23,8 +23,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.normalization.FilterNormalizingVisitor;
@@ -47,6 +45,9 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
 
 
 /**
@@ -55,7 +56,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubtreeEvaluatorTest extends TestCase
+public class SubtreeEvaluatorTest
 {
     private Registries registries;
     private SubtreeEvaluator evaluator;



Mime
View raw message