directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r764131 [15/16] - in /directory: apacheds/trunk/ apacheds/trunk/core-avl/ apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ apache...
Date Sat, 11 Apr 2009 01:03:25 GMT
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITStructureRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITStructureRuleDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITStructureRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITStructureRuleDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,10 +22,15 @@
 
 import java.text.ParseException;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescription;
 import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescriptionSchemaParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -33,19 +38,21 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DITStructureRuleDescriptionSchemaParserTest extends TestCase
+public class DITStructureRuleDescriptionSchemaParserTest
 {
     /** the parser instance */
     private DITStructureRuleDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new DITStructureRuleDescriptionSchemaParser();
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
@@ -56,6 +63,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNumericRuleId() throws ParseException
     {
         String value = null;
@@ -144,6 +152,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNames() throws ParseException
     {
         SchemaParserTestUtils.testNames( parser, "1", "FORM 1.1" );
@@ -155,6 +164,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1", "FORM 1.1" );
@@ -166,6 +176,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testObsolete() throws ParseException
     {
         SchemaParserTestUtils.testObsolete( parser, "1", "FORM 1.1" );
@@ -177,6 +188,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testForm() throws ParseException
     {
         String value = null;
@@ -263,6 +275,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testSup() throws ParseException
     {
         String value = null;
@@ -324,6 +337,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1", "FORM 1.1" );
@@ -336,6 +350,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testFull() throws ParseException
     {
         String value = null;
@@ -372,6 +387,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         String[] testValues = new String[]
@@ -387,6 +403,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testRequiredElements() throws ParseException
     {
         String value = null;
@@ -413,6 +430,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         String[] testValues = new String[]
@@ -429,6 +447,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         try

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,10 +22,13 @@
 
 import java.text.ParseException;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescription;
 import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -33,19 +36,21 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapSyntaxDescriptionSchemaParserTest extends TestCase
+public class LdapSyntaxDescriptionSchemaParserTest
 {
     /** the parser instance */
     private LdapSyntaxDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new LdapSyntaxDescriptionSchemaParser();
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
@@ -56,6 +61,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNumericOid() throws ParseException
     {
         SchemaParserTestUtils.testNumericOid( parser, "" );
@@ -67,6 +73,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNames() throws ParseException
     {
         SchemaParserTestUtils.testNames( parser, "1.1", "" );
@@ -78,6 +85,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "" );
@@ -89,6 +97,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "" );
@@ -100,6 +109,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testFull() throws ParseException
     {
         String value = null;
@@ -127,6 +137,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         String[] testValues = new String[]
@@ -139,6 +150,7 @@
     //         Some real-world attribute type definitions         //
     ////////////////////////////////////////////////////////////////
 
+    @Test
     public void testRfcBinary() throws ParseException
     {
         String value = "( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' X-NOT-HUMAN-READABLE 'TRUE' )";
@@ -156,6 +168,7 @@
     /**
      * Tests the parse of a simple AttributeType with the schema extension.
      */
+    @Test
     public void testSyntaxWithExtensions() throws ParseException
     {
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 DESC 'bogus description' X-SCHEMA 'blah' X-IS-HUMAN-READABLE 'true' )";
@@ -169,6 +182,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         String[] testValues = new String[]
@@ -184,6 +198,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,10 +22,17 @@
 
 import java.text.ParseException;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
 import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 
 /**
@@ -33,48 +40,55 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class MatchingRuleDescriptionSchemaParserTest extends TestCase
+public class MatchingRuleDescriptionSchemaParserTest
 {
     /** the parser instance */
     private MatchingRuleDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new MatchingRuleDescriptionSchemaParser();
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
 
 
+    @Test
     public void testNumericOid() throws ParseException
     {
         SchemaParserTestUtils.testNumericOid( parser, "SYNTAX 1.1" );
     }
 
 
+    @Test
     public void testNames() throws ParseException
     {
         SchemaParserTestUtils.testNames( parser, "1.1", "SYNTAX 1.1" );
     }
 
 
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "SYNTAX 1.1" );
     }
 
 
+    @Test
     public void testObsolete() throws ParseException
     {
         SchemaParserTestUtils.testObsolete( parser, "1.1", "SYNTAX 1.1" );
     }
 
 
+    @Test
     public void testSyntax() throws ParseException
     {
         String value = null;
@@ -141,12 +155,14 @@
     }
 
 
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "SYNTAX 1.1" );
     }
 
 
+    @Test
     public void testFull() throws ParseException
     {
         String value = null;
@@ -179,6 +195,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         String[] testValues = new String[]
@@ -194,6 +211,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testRequiredElements() throws ParseException
     {
         String value = null;
@@ -223,6 +241,7 @@
     //         Some real-world matching rule descriptons          //
     ////////////////////////////////////////////////////////////////
 
+    @Test
     public void testRfc1() throws ParseException
     {
         String value = "( 2.5.13.5 NAME 'caseExactMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )";
@@ -238,6 +257,7 @@
     }
 
 
+    @Test
     public void testSun1() throws ParseException
     {
         String value = "( 2.5.13.5 NAME 'caseExactMatch' DESC 'Case Exact Matching on Directory String [defined in X.520]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )";
@@ -257,6 +277,7 @@
      * This is a real matching rule from Sun Directory 5.2. It has an invalid 
      * syntax, no DOTs allowed in NAME value. 
      */
+    @Test
     public void testSun2() throws ParseException
     {
         String value = "( 1.3.6.1.4.1.42.2.27.9.4.34.3.6 NAME 'caseExactSubstringMatch-2.16.840.1.113730.3.3.2.11.3' DESC 'en' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )";
@@ -289,6 +310,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         String[] testValues = new String[]
@@ -304,6 +326,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "SYNTAX 1.1" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleUseDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleUseDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleUseDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleUseDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,10 +22,16 @@
 
 import java.text.ParseException;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescription;
 import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -33,48 +39,55 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class MatchingRuleUseDescriptionSchemaParserTest extends TestCase
+public class MatchingRuleUseDescriptionSchemaParserTest
 {
     /** the parser instance */
     private MatchingRuleUseDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new MatchingRuleUseDescriptionSchemaParser();
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
 
 
+    @Test
     public void testNumericOid() throws ParseException
     {
         SchemaParserTestUtils.testNumericOid( parser, "APPLIES 1.1" );
     }
 
 
+    @Test
     public void testNames() throws ParseException
     {
         SchemaParserTestUtils.testNames( parser, "1.1", "APPLIES 1.1" );
     }
 
 
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "APPLIES 1.1" );
     }
 
 
+    @Test
     public void testObsolete() throws ParseException
     {
         SchemaParserTestUtils.testObsolete( parser, "1.1", "APPLIES 1.1" );
     }
 
 
+    @Test
     public void testApplies() throws ParseException
     {
 
@@ -229,12 +242,14 @@
     }
 
 
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "APPLIES 1.1" );
     }
 
 
+    @Test
     public void testFull() throws ParseException
     {
         String value = null;
@@ -270,6 +285,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         String[] testValues = new String[]
@@ -285,6 +301,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testRequiredElements() throws ParseException
     {
         String value = null;
@@ -314,6 +331,7 @@
     //       Some real-world matching rule use descriptons        //
     ////////////////////////////////////////////////////////////////
 
+    @Test
     public void testOpenldap1() throws ParseException
     {
         String value = "( 2.5.13.17 NAME 'octetStringMatch' APPLIES ( javaSerializedData $ userPassword ) )";
@@ -334,6 +352,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         String[] testValues = new String[]
@@ -349,6 +368,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "APPLIES 1.1" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NameFormDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NameFormDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NameFormDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NameFormDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,10 +22,15 @@
 
 import java.text.ParseException;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.parsers.NameFormDescription;
 import org.apache.directory.shared.ldap.schema.parsers.NameFormDescriptionSchemaParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -33,19 +38,21 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class NameFormDescriptionSchemaParserTest extends TestCase
+public class NameFormDescriptionSchemaParserTest
 {
     /** the parser instance */
     private NameFormDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new NameFormDescriptionSchemaParser();
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
@@ -56,6 +63,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNumericOid() throws ParseException
     {
         SchemaParserTestUtils.testNumericOid( parser, "OC o MUST m" );
@@ -67,6 +75,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNames() throws ParseException
     {
         SchemaParserTestUtils.testNames( parser, "1.1", "OC o MUST m" );
@@ -78,6 +87,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "OC o MUST m" );
@@ -89,6 +99,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testObsolete() throws ParseException
     {
         SchemaParserTestUtils.testObsolete( parser, "1.1", "OC o MUST m" );
@@ -100,6 +111,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testOc() throws ParseException
     {
         String value = null;
@@ -201,6 +213,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testMust() throws ParseException
     {
         String value = null;
@@ -279,6 +292,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testMay() throws ParseException
     {
         String value = null;
@@ -338,6 +352,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "OC o MUST m" );
@@ -350,6 +365,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testFull() throws ParseException
     {
         String value = null;
@@ -391,6 +407,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         String[] testValues = new String[]
@@ -407,6 +424,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testRequiredElements() throws ParseException
     {
         String value = null;
@@ -451,6 +469,7 @@
     //     * 
     //     * @throws ParseException
     //     */
+    //    @Test
     //    public void testDisjoint() throws ParseException
     //    {
     //        String value = null;
@@ -488,6 +507,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         String[] testValues = new String[]
@@ -504,6 +524,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "OC o MUST m" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NormalizerDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NormalizerDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NormalizerDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NormalizerDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,10 +22,13 @@
 
 import java.text.ParseException;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescriptionSchemaParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -33,36 +36,41 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class NormalizerDescriptionSchemaParserTest extends TestCase
+public class NormalizerDescriptionSchemaParserTest
 {
     /** the parser instance */
     private NormalizerDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new NormalizerDescriptionSchemaParser();
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
 
 
+    @Test
     public void testNumericOid() throws ParseException
     {
         SchemaParserTestUtils.testNumericOid( parser, "FQCN org.apache.directory.SimpleNormalizer" );
     }
 
 
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "FQCN org.apache.directory.SimpleNormalizer" );
     }
 
 
+    @Test
     public void testFqcn() throws ParseException
     {
         String value = null;
@@ -76,6 +84,7 @@
     }
 
 
+    @Test
     public void testBytecode() throws ParseException
     {
         String value = null;
@@ -89,12 +98,14 @@
     }
 
 
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "FQCN org.apache.directory.SimpleNormalizer" );
     }
 
 
+    @Test
     public void testFull()
     {
         // TODO
@@ -106,6 +117,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         // TODO
@@ -117,6 +129,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testRequiredElements()
     {
         // TODO
@@ -126,6 +139,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         // TODO
@@ -135,6 +149,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "FQCN org.apache.directory.SimpleNormalizer" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,12 +22,17 @@
 
 import java.text.ParseException;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
 import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 
 /**
@@ -35,19 +40,21 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ObjectClassDescriptionSchemaParserTest extends TestCase
+public class ObjectClassDescriptionSchemaParserTest
 {
     /** the parser instance */
     private ObjectClassDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new ObjectClassDescriptionSchemaParser();
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
@@ -58,6 +65,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNumericOid() throws ParseException
     {
         SchemaParserTestUtils.testNumericOid( parser, "" );
@@ -69,6 +77,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNames() throws ParseException
     {
         SchemaParserTestUtils.testNames( parser, "1.1", "" );
@@ -80,6 +89,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "" );
@@ -91,6 +101,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testObsolete() throws ParseException
     {
         SchemaParserTestUtils.testObsolete( parser, "1.1", "" );
@@ -102,6 +113,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testSuperior() throws ParseException
     {
         String value = null;
@@ -239,6 +251,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testKind() throws ParseException
     {
         String value = null;
@@ -289,6 +302,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testMust() throws ParseException
     {
         String value = null;
@@ -358,6 +372,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testMay() throws ParseException
     {
         String value = null;
@@ -414,6 +429,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "" );
@@ -426,6 +442,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testFull() throws ParseException
     {
         String value = null;
@@ -470,6 +487,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         String[] testValues = new String[]
@@ -486,6 +504,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testIgnoreElementOrder() throws ParseException
     {
         String value = "( 2.5.6.6 STRUCTURAL MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) SUP top DESC 'RFC2256: a person' MUST ( sn $ cn ) NAME 'person' )";
@@ -515,6 +534,7 @@
     //          Some real-world object class definitions          //
     ////////////////////////////////////////////////////////////////
 
+    @Test
     public void testRfcTop() throws ParseException
     {
         String value = "( 2.5.6.0 NAME 'top' DESC 'top of the superclass chain' ABSTRACT MUST objectClass )";
@@ -533,6 +553,7 @@
     }
 
 
+    @Test
     public void testRfcPerson() throws ParseException
     {
         String value = "( 2.5.6.6 NAME 'person' DESC 'RFC2256: a person' SUP top STRUCTURAL MUST ( sn $ cn ) MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) )";
@@ -557,6 +578,7 @@
     }
 
 
+    @Test
     public void testRfcSimpleSecurityObject() throws ParseException
     {
         String value = "( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject' DESC 'RFC1274: simple security object' SUP top AUXILIARY MUST userPassword )";
@@ -576,6 +598,7 @@
     }
 
 
+    @Test
     public void testSunAlias() throws ParseException
     {
         String value = "( 2.5.6.1 NAME 'alias' DESC 'Standard LDAP objectclass' SUP top ABSTRACT MUST aliasedObjectName X-ORIGIN 'RFC 2256' )";
@@ -599,6 +622,7 @@
     }
 
 
+    @Test
     public void testNovellDcObject() throws ParseException
     {
         String value = "( 1.3.6.1.4.1.1466.344 NAME 'dcObject' AUXILIARY MUST dc X-NDS_NAMING 'dc' X-NDS_NOT_CONTAINER '1' X-NDS_NONREMOVABLE '1' )";
@@ -627,6 +651,7 @@
     }
 
 
+    @Test
     public void testNovellList() throws ParseException
     {
         String value = "( 2.16.840.1.113719.1.1.6.1.30 NAME 'List' SUP Top STRUCTURAL MUST cn MAY ( description $ l $ member $ ou $ o $ eMailAddress $ mailboxLocation $ mailboxID $ owner $ seeAlso $ fullName ) X-NDS_NAMING 'cn' X-NDS_CONTAINMENT ( 'Organization' 'organizationalUnit' 'domain' ) X-NDS_NOT_CONTAINER '1' X-NDS_NONREMOVABLE '1' X-NDS_ACL_TEMPLATES '2#entry#[Root Template]#member' )";
@@ -672,6 +697,7 @@
     }
 
 
+    @Test
     public void testMicrosoftAds2000Locality() throws ParseException
     {
         String value = "( 2.5.6.3 NAME 'locality' SUP top STRUCTURAL MUST (l ) MAY (st $ street $ searchGuide $ seeAlso ) )";
@@ -695,6 +721,7 @@
     }
 
 
+    @Test
     public void testMicrosoftAds2003Msieee() throws ParseException
     {
         String value = "( 1.2.840.113556.1.5.240 NAME 'msieee80211-Policy' SUP top STRUCTURAL MAY (msieee80211-Data $ msieee80211-DataType $ msieee80211-ID ) )";
@@ -716,6 +743,7 @@
     }
 
 
+    @Test
     public void testSiemensDirxX500Subschema() throws ParseException
     {
         String value = "( 2.5.20.1 NAME 'x500subSchema' AUXILIARY MAY (dITStructureRules $ nameForms $ dITContentRules $ x500objectClasses $ x500attributeTypes $ matchingRules $ matchingRuleUse) )";
@@ -738,6 +766,7 @@
     /**
      * Tests the multi-threaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         String[] testValues = new String[]
@@ -753,6 +782,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "" );
@@ -790,8 +820,8 @@
             // NAME with special chars
             value = "( 1.2.3 NAME 't-e_s.t;' )";
             ocd = parser.parseObjectClassDescription( value );
-            Assert.assertEquals( 1, ocd.getNames().size() );
-            Assert.assertEquals( "t-e_s.t;", ocd.getNames().get( 0 ) );
+            assertEquals( 1, ocd.getNames().size() );
+            assertEquals( "t-e_s.t;", ocd.getNames().get( 0 ) );
 
             // SUP with underscore
             value = "( 1.1 SUP te_st )";

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SyntaxCheckerDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SyntaxCheckerDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SyntaxCheckerDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SyntaxCheckerDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,10 +22,14 @@
 
 import java.text.ParseException;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 
 /**
@@ -34,7 +38,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SyntaxCheckerDescriptionSchemaParserTest extends TestCase
+public class SyntaxCheckerDescriptionSchemaParserTest
 {
     private static final String OID = "1.3.6.1.4.1.18060.0.4.0.2.10000";
     private static final String FQCN = "org.foo.Bar";
@@ -45,30 +49,35 @@
     private SyntaxCheckerDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new SyntaxCheckerDescriptionSchemaParser();
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
 
 
+    @Test
     public void testNumericOid() throws ParseException
     {
         SchemaParserTestUtils.testNumericOid( parser, "FQCN org.apache.directory.SimpleComparator" );
     }
 
 
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "FQCN org.apache.directory.SimpleComparator" );
     }
 
 
+    @Test
     public void testFqcn() throws ParseException
     {
         String value = null;
@@ -82,6 +91,7 @@
     }
 
 
+    @Test
     public void testBytecode() throws ParseException
     {
         String value = null;
@@ -95,12 +105,14 @@
     }
 
 
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "FQCN org.apache.directory.SimpleComparator" );
     }
 
 
+    @Test
     public void testFull()
     {
         // TODO
@@ -112,6 +124,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         // TODO
@@ -123,12 +136,14 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testRequiredElements()
     {
         // TODO
     }
 
 
+    @Test
     public void testSimpleSyntaxChecker() throws ParseException
     {
         String simple = "( " + OID + " FQCN " + FQCN + " )";
@@ -141,6 +156,7 @@
     }
 
 
+    @Test
     public void testSyntaxCheckerWithDesc() throws ParseException
     {
         String simple = "( " + OID + " DESC '" + DESC + "' FQCN " + FQCN + " )";
@@ -153,6 +169,7 @@
     }
 
 
+    @Test
     public void testSyntaxCheckerWithDescAndByteCode() throws ParseException
     {
         String simple = "( " + OID + " DESC '" + DESC + "' FQCN " + FQCN + " BYTECODE " + BYTECODE + " )";
@@ -165,6 +182,7 @@
     }
 
 
+    @Test
     public void testSyntaxCheckerExample() throws ParseException
     {
         String simple = "( 1.3.6.1.4.1.18060.0.4.1.0.10000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker )";
@@ -173,6 +191,7 @@
     }
 
 
+    @Test
     public void testRealByteCodeExample() throws ParseException
     {
         String simple = "( 1.3.6.1.4.1.18060.0.4.1.0.10002 DESC 'bogus desc' "
@@ -201,6 +220,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         // TODO
@@ -210,6 +230,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "FQCN org.apache.directory.SimpleComparator" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java Sat Apr 11 01:03:00 2009
@@ -25,8 +25,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -39,6 +37,12 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationParser;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -47,7 +51,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubtreeSpecificationParserTest extends TestCase
+public class SubtreeSpecificationParserTest
 {
     /** A valid empty specification with single white space between brackets */
     private static final String EMPTY_SPEC = "{ }";
@@ -122,7 +126,6 @@
      */
     public SubtreeSpecificationParserTest(String s)
     {
-        super( s );
         parser = new SubtreeSpecificationParser( null );
     }
 
@@ -130,6 +133,7 @@
     /**
      * Tests the parser with a valid empty specification.
      */
+    @Test
     public void testEmptySpec() throws Exception
     {
         SubtreeSpecification ss = parser.parse( EMPTY_SPEC );
@@ -148,6 +152,7 @@
     /**
      * Tests the parser with a valid specification with base set.
      */
+    @Test
     public void testSpecWithBase() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE );
@@ -161,6 +166,7 @@
      * Tests the parser with an invalid specification with missing white spaces
      * and base set.
      */
+    @Test
     public void testInvalidSpecWithBaseAndMissingWS() throws Exception
     {
         try
@@ -179,6 +185,7 @@
      * Tests the parser with a valid specification with some specific exclusions
      * set.
      */
+    @Test
     public void testSpecWithSpecificExclusions() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_SPECIFICEXCLUSIONS );
@@ -207,6 +214,7 @@
      * Tests the parser with a valid specification with an empty specific
      * exclusions set.
      */
+    @Test
     public void testSpecWithEmptySpecificExclusions() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_EMPTY_SPECIFICEXCLUSIONS );
@@ -219,6 +227,7 @@
     /**
      * Tests the parser with a valid specification with minimum and maximum set.
      */
+    @Test
     public void testSpecWithMinimumAndMaximum() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_MINIMUM_AND_MAXIMUM );
@@ -241,6 +250,7 @@
      * Tests the parser with a valid specification with base and minimum and
      * maximum set.
      */
+    @Test
     public void testWithBaseAndMinimumAndMaximum() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE_AND_MINIMUM_AND_MAXIMUM );
@@ -255,6 +265,7 @@
      * Tests the parser with a valid specification with base and specific
      * exclusions and minimum and maximum set.
      */
+    @Test
     public void testSpecWithBaseAndSpecificExclusionsAndMinimumAndMaximum() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE_AND_SPECIFICEXCLUSIONS_AND_MINIMUM_AND_MAXIMUM );
@@ -273,6 +284,7 @@
     /**
      * Tests the parser with a valid specification with refinement set.
      */
+    @Test
     public void testSpecWithRefinement() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_REFINEMENT );
@@ -301,6 +313,7 @@
      * Tests the parser with a valid specification with base and empty
      * refinement set.
      */
+    @Test
     public void testSpecWithBaseAndEmptyRefinement() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE_AND_EMPTY_REFINEMENT );
@@ -312,6 +325,7 @@
     /**
      * Tests the parser with a valid specification with all components set.
      */
+    @Test
     public void testSpecWithAllInOne() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_ALL_IN_ONE );
@@ -323,6 +337,7 @@
      * Tests the parser with a valid specification with unordinary component
      * order.
      */
+    @Test
     public void testSpecOrderOfComponentsDoesNotMatter() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_ORDER_OF_COMPONENTS_DOES_NOT_MATTER );
@@ -333,6 +348,7 @@
     /**
      * Tests the parser with an invalid specification with silly things in.
      */
+    @Test
     public void testInvalidSillyThing() throws Exception
     {
         try
@@ -350,6 +366,7 @@
     /**
      * Tests the parser with a valid specification with refinement set.
      */
+    @Test
     public void testSpecWithFilter() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_FILTER );
@@ -363,6 +380,7 @@
     /**
      * Test reusability, especially if the state is resetted.
      */
+    @Test
     public void testReusabiltiy() throws Exception
     {
         LdapDN firstDN = new LdapDN("k=l");
@@ -383,6 +401,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws Exception
     {
         // start up and track all threads (40 threads)

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java Sat Apr 11 01:03:00 2009
@@ -25,8 +25,11 @@
 
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.trigger.TriggerSpecification.SPSpec;
+import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-import junit.framework.TestCase;
 
 
 /**
@@ -35,7 +38,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:$, $Date:$
  */
-public class TriggerSpecificationParserTest extends TestCase
+public class TriggerSpecificationParserTest
 {
 
     /** The Trigger Specification parser */
@@ -57,10 +60,10 @@
      */
     public TriggerSpecificationParserTest( String s )
     {
-        super( s );
         parser = new TriggerSpecificationParser();
     }
 
+    @Test
     public void testWithOperationParameters() throws Exception
     {        
         TriggerSpecification triggerSpecification = null;
@@ -85,6 +88,7 @@
             StoredProcedureParameter.Delete_DELETED_ENTRY.instance() ) );
     }
     
+    @Test
     public void testWithGenericParameters() throws Exception
     {        
         TriggerSpecification triggerSpecification = null;
@@ -111,6 +115,7 @@
             StoredProcedureParameter.Generic_OPERATION_PRINCIPAL.instance() ) );
     }
     
+    @Test
     public void testWithLanguageSchemeOption() throws Exception
     {        
         TriggerSpecification triggerSpecification = null;
@@ -133,6 +138,7 @@
         assertEquals( theSpec.getParameters().size(),  0 );
     }
     
+    @Test
     public void testWithSearchContextOption() throws Exception
     {        
         TriggerSpecification triggerSpecification = null;
@@ -162,6 +168,7 @@
             StoredProcedureParameter.ModifyDN_NEW_RDN.instance() ) );
     }
     
+    @Test
     public void testWithLdapContextParameter() throws Exception
     {        
         TriggerSpecification triggerSpecification = null;
@@ -188,6 +195,7 @@
             StoredProcedureParameter.Generic_LDAP_CONTEXT.instance( new LdapDN( "ou=Backup,ou=System" ) ) ) );
     }
     
+    @Test
     public void testMultipleSPCalls() throws Exception
     {        
         TriggerSpecification triggerSpecification = null;

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java Sat Apr 11 01:03:00 2009
@@ -23,8 +23,11 @@
 import java.util.NoSuchElementException;
 
 import org.apache.directory.shared.ldap.util.ArrayEnumeration;
-
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -33,8 +36,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ArrayEnumerationTest extends TestCase
+public class ArrayEnumerationTest
 {
+    @Test
     public void testAll()
     {
         // test with null array

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java Sat Apr 11 01:03:00 2009
@@ -20,7 +20,8 @@
 package org.apache.directory.shared.ldap.util;
 
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 
 /**
@@ -29,8 +30,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ByteBufferTest extends TestCase
+public class ByteBufferTest
 {
+    @Test
     public void testByteBufferGrowth()
     {
         ByteBuffer buf = new ByteBuffer();

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/DNUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/DNUtilsTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/DNUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/DNUtilsTest.java Sat Apr 11 01:03:00 2009
@@ -21,9 +21,9 @@
 
 
 import org.apache.directory.shared.ldap.util.StringTools;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DNUtilsTest extends TestCase
+public class DNUtilsTest
 {
     // ~ Methods
     // ------------------------------------------------------------------------------------
@@ -39,114 +39,125 @@
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsFull()
     {
         // Full compare
-        Assert.assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 0, "azerty" ) );
+        assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 0, "azerty" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsDiff()
     {
         // First character is !=
-        Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "Azerty" ) );
+        assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "Azerty" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsEmpty()
     {
         // Compare to an empty string
-        Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "" ) );
+        assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsFirstCharDiff()
     {
         // First character is !=
-        Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "Azerty" ) );
+        assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "Azerty" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsMiddleCharDiff()
     {
         // First character is !=
-        Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azeRty" ) );
+        assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azeRty" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsLastCharDiff()
     {
         // First character is !=
-        Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azertY" ) );
+        assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azertY" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsCharByChar()
     {
         // Index must be incremented after each comparison
-        Assert.assertEquals( 1, StringTools.areEquals( "azerty".getBytes(), 0, "a" ) );
-        Assert.assertEquals( 2, StringTools.areEquals( "azerty".getBytes(), 1, "z" ) );
-        Assert.assertEquals( 3, StringTools.areEquals( "azerty".getBytes(), 2, "e" ) );
-        Assert.assertEquals( 4, StringTools.areEquals( "azerty".getBytes(), 3, "r" ) );
-        Assert.assertEquals( 5, StringTools.areEquals( "azerty".getBytes(), 4, "t" ) );
-        Assert.assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 5, "y" ) );
+        assertEquals( 1, StringTools.areEquals( "azerty".getBytes(), 0, "a" ) );
+        assertEquals( 2, StringTools.areEquals( "azerty".getBytes(), 1, "z" ) );
+        assertEquals( 3, StringTools.areEquals( "azerty".getBytes(), 2, "e" ) );
+        assertEquals( 4, StringTools.areEquals( "azerty".getBytes(), 3, "r" ) );
+        assertEquals( 5, StringTools.areEquals( "azerty".getBytes(), 4, "t" ) );
+        assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 5, "y" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsTooShort()
     {
         // length too short
-        Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azertyiop" ) );
+        assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azertyiop" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsTooShortMiddle()
     {
         // length too short
-        Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "ertyiop" ) );
+        assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "ertyiop" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsLastChar()
     {
         // last character
-        Assert.assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 5, "y" ) );
+        assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 5, "y" ) );
     }
 
 
     /**
      * Test the DNUtils AreEquals method
      */
+    @Test
     public void testAreEqualsMiddle()
     {
         // In the middle
-        Assert.assertEquals( 4, StringTools.areEquals( "azerty".getBytes(), 2, "er" ) );
+        assertEquals( 4, StringTools.areEquals( "azerty".getBytes(), 2, "er" ) );
     }
 }

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java Sat Apr 11 01:03:00 2009
@@ -24,7 +24,10 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -33,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:$
  */
-public class DirectoryClassUtilsTest extends TestCase
+public class DirectoryClassUtilsTest
 {
     private static class TestClass
     {
@@ -48,6 +51,7 @@
         }
     }
     
+    @Test
     public void testSameBehaviourOfStandardGetMethod()
     {
         Method m1 = null;
@@ -82,6 +86,7 @@
         
     }
     
+    @Test
     public void testNewBehaviourOfAssignmentCompatibleGetMethod()
     {
         Method m2 = null;

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/GeneralizedTimeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/GeneralizedTimeTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/GeneralizedTimeTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/GeneralizedTimeTest.java Sat Apr 11 01:03:00 2009
@@ -24,11 +24,14 @@
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.syntax.GeneralizedTimeSyntaxCheckerTest;
 import org.apache.directory.shared.ldap.util.GeneralizedTime.Format;
 import org.apache.directory.shared.ldap.util.GeneralizedTime.TimeZoneFormat;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 
 /**
@@ -37,7 +40,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 542077 $
  */
-public class GeneralizedTimeTest extends TestCase
+public class GeneralizedTimeTest
 {
 
     // Test all valid variants:
@@ -48,6 +51,7 @@
     /**
      * Tests yyyyMMddHHmmssZ.
      */
+    @Test
     public void testYearMonthDayHourMinSecZulu() throws ParseException
     {
         String gt = "20080102121314Z";
@@ -60,6 +64,7 @@
     /**
      * Tests yyyyMMddHHmmss+04.
      */
+    @Test
     public void testYearMonthDayHourMinSecPlusHour() throws ParseException
     {
         String gt = "20080102121314+04";
@@ -72,6 +77,7 @@
     /**
      * Tests yyyyMMddHHmmss-1030.
      */
+    @Test
     public void testYearMonthDayHourMinSecMinusHourMin() throws ParseException
     {
         String gt = "20080102121314-1030";
@@ -84,6 +90,7 @@
     /**
      * Tests yyyyMMddHHmmss.SSSZ.
      */
+    @Test
     public void testYearMonthDayHourMinSecDotFractionZulu() throws ParseException
     {
         String gt = "20080102121314.987Z";
@@ -96,6 +103,7 @@
     /**
      * Tests yyyyMMddHHmmss.SSS+0100.
      */
+    @Test
     public void testYearMonthDayHourMinSecDotFractionPlusHour() throws ParseException
     {
         String gt = "20080102121314.987+0100";
@@ -108,6 +116,7 @@
     /**
      * Tests yyyyMMddHHmmss.SSS-1030.
      */
+    @Test
     public void testYearMonthDayHourMinSecDotFractionMinusHourMin() throws ParseException
     {
         String gt = "20080102121314.987-1030";
@@ -120,6 +129,7 @@
     /**
      * Tests yyyyMMddHHmmss,SSSZ.
      */
+    @Test
     public void testYearMonthDayHourMinSecCommaFractionZulu() throws ParseException
     {
         String gt = "20080102121314,987Z";
@@ -132,6 +142,7 @@
     /**
      * Tests yyyyMMddHHmmss,SSS+0100.
      */
+    @Test
     public void testYearMonthDayHourMinSecCommaFractionPlusHour() throws ParseException
     {
         String gt = "20080102121314,987+0100";
@@ -144,6 +155,7 @@
     /**
      * Tests yyyyMMddHHmmss,SSS-1030.
      */
+    @Test
     public void testYearMonthDayHourMinSecCommaFractionMinusHourMin() throws ParseException
     {
         String gt = "20080102121314,987-1030";
@@ -156,6 +168,7 @@
     /**
      * Tests yyyyMMddHHmmZ.
      */
+    @Test
     public void testYearMonthDayHourMinZulu() throws ParseException
     {
         String gt = "200801021213Z";
@@ -168,6 +181,7 @@
     /**
      * Tests yyyyMMddHHmm+HH.
      */
+    @Test
     public void testYearMonthDayHourMinPlusHour() throws ParseException
     {
         String gt = "200801021213+04";
@@ -180,6 +194,7 @@
     /**
      * Tests yyyyMMddHHmm-HHmm.
      */
+    @Test
     public void testYearMonthDayHourMinMinusHourMin() throws ParseException
     {
         String gt = "200801021213-1030";
@@ -192,6 +207,7 @@
     /**
      * Tests yyyyMMddHHmm.SSSZ.
      */
+    @Test
     public void testYearMonthDayHourMinDotFractionZulu() throws ParseException
     {
         String gt = "200801021213.987Z";
@@ -204,6 +220,7 @@
     /**
      * Tests yyyyMMddHHmm.SSS+0100.
      */
+    @Test
     public void testYearMonthDayHourMinDotFractionPlusHour() throws ParseException
     {
         String gt = "200801021213.987+0100";
@@ -216,6 +233,7 @@
     /**
      * Tests yyyyMMddHHmm.SSS-1030.
      */
+    @Test
     public void testYearMonthDayHourMinDotFractionMinusHourMin() throws ParseException
     {
         String gt = "200801021213.987-1030";
@@ -228,6 +246,7 @@
     /**
      * Tests yyyyMMddHHmm,SSSZ.
      */
+    @Test
     public void testYearMonthDayHourMinCommaFractionZulu() throws ParseException
     {
         String gt = "200801021213,987Z";
@@ -240,6 +259,7 @@
     /**
      * Tests yyyyMMddHHmm,SSS+0100.
      */
+    @Test
     public void testYearMonthDayHourMinCommaFractionPlusHour() throws ParseException
     {
         String gt = "200801021213,987+0100";
@@ -252,6 +272,7 @@
     /**
      * Tests yyyyMMddHHmm,SSS-1030.
      */
+    @Test
     public void testYearMonthDayHourMinCommaFractionMinusHourMin() throws ParseException
     {
         String gt = "200801021213,987-1030";
@@ -264,6 +285,7 @@
     /**
      * Tests yyyyMMddHHZ.
      */
+    @Test
     public void testYearMonthDayHourZulu() throws ParseException
     {
         String gt = "2008010212Z";
@@ -276,6 +298,7 @@
     /**
      * Tests yyyyMMddHH+HH.
      */
+    @Test
     public void testYearMonthDayHourPlusHour() throws ParseException
     {
         String gt = "2008010212+04";
@@ -288,6 +311,7 @@
     /**
      * Tests yyyyMMddHH-HHmm.
      */
+    @Test
     public void testYearMonthDayHourMinusHourMin() throws ParseException
     {
         String gt = "2008010212-1030";
@@ -300,6 +324,7 @@
     /**
      * Tests yyyyMMddHH.SSSZ.
      */
+    @Test
     public void testYearMonthDayHourDotFractionZulu() throws ParseException
     {
         String gt = "200801021213.987Z";
@@ -312,6 +337,7 @@
     /**
      * Tests yyyyMMddHH.SSS+0100.
      */
+    @Test
     public void testYearMonthDayHourDotFractionPlusHour() throws ParseException
     {
         String gt = "2008010212.987+0100";
@@ -324,6 +350,7 @@
     /**
      * Tests yyyyMMddHH.SSS-1030.
      */
+    @Test
     public void testYearMonthDayHourDotFractionMinusHourMin() throws ParseException
     {
         String gt = "2008010212.987-1030";
@@ -336,6 +363,7 @@
     /**
      * Tests yyyyMMddHH,SSSZ.
      */
+    @Test
     public void testYearMonthDayHourCommaFractionZulu() throws ParseException
     {
         String gt = "2008010212,987Z";
@@ -348,6 +376,7 @@
     /**
      * Tests yyyyMMddHH,SSS+0100.
      */
+    @Test
     public void testYearMonthDayHourCommaFractionPlusHour() throws ParseException
     {
         String gt = "2008010212,987+0100";
@@ -360,6 +389,7 @@
     /**
      * Tests yyyyMMddHH,SSS-1030.
      */
+    @Test
     public void testYearMonthDayHourCommaFractionMinusHourMin() throws ParseException
     {
         String gt = "2008010212,987-1030";
@@ -372,6 +402,7 @@
     /**
      * Tests fraction of a second.
      */
+    @Test
     public void testFractionOfSecond() throws ParseException
     {
         String gt = "20080102121314,987Z";
@@ -385,6 +416,7 @@
     /**
      * Tests fraction of a minute.
      */
+    @Test
     public void testFractionOfMinute1() throws ParseException
     {
         String gt = "200801021213,5Z";
@@ -399,6 +431,7 @@
     /**
      * Tests fraction of a minute.
      */
+    @Test
     public void testFractionOfMinute2() throws ParseException
     {
         String gt = "200801021213,125Z";
@@ -413,6 +446,7 @@
     /**
      * Tests fraction of an hour.
      */
+    @Test
     public void testFractionOfHour1() throws ParseException
     {
         String gt = "2008010212,5Z";
@@ -428,6 +462,7 @@
     /**
      * Tests fraction of an hour.
      */
+    @Test
     public void testFractionOfHour2() throws ParseException
     {
         String gt = "2008010212,125Z";
@@ -443,6 +478,7 @@
     /**
      * Test formatting
      */
+    @Test
     public void testFormatting() throws ParseException
     {
         String gt = "20080102121314Z";
@@ -469,6 +505,7 @@
     /**
      * Testcases from {@link GeneralizedTimeSyntaxCheckerTest#testCorrectCase()}.
      */
+    @Test
     public void testGeneralizedTimeSyntaxCheckerTestCorrectCase() throws ParseException
     {
         new GeneralizedTime( "20061205184527Z" );
@@ -483,6 +520,7 @@
     /**
      * Testcases from {@link GeneralizedTimeSyntaxCheckerTest#testErrorCase()}.
      */
+    @Test
     public void testGeneralizedTimeSyntaxCheckerTestErrorCase()
     {
         try
@@ -609,6 +647,7 @@
      * Tests leap second.
      * The GeneralizedTime class does not support leap seconds!
      */
+    @Test
     public void testLeapSecond() throws ParseException
     {
         String gt = "20051231235960Z";
@@ -627,6 +666,7 @@
     /**
      * Tests Feb 29 in a leap year.
      */
+    @Test
     public void testFebruary29inLeapYear() throws ParseException
     {
         String gt = "20080229000000Z";
@@ -639,6 +679,7 @@
     /**
      * Tests Feb 29 in a non-leap year.
      */
+    @Test
     public void testFebruary29inNonLeapYear() throws ParseException
     {
         String gt = "20070229000000Z";
@@ -657,6 +698,7 @@
     /**
      * Tests null.
      */
+    @Test
     public void testNull() throws ParseException
     {
         try
@@ -687,6 +729,7 @@
     /**
      * Tests empty string.
      */
+    @Test
     public void testEmpty() throws ParseException
     {
         String gt = "";
@@ -705,6 +748,7 @@
     /**
      * Tests invalid cases.
      */
+    @Test
     public void testInvalid() throws ParseException
     {
         // too short year
@@ -976,6 +1020,7 @@
     /**
      * Tests constructor with calendar object.
      */
+    @Test
     public void testCalendar() throws ParseException
     {
         Calendar calendar = Calendar.getInstance();
@@ -996,6 +1041,7 @@
     /**
      * Tests a complete round trip.
      */
+    @Test
     public void testRoundTrip() throws ParseException
     {
         Calendar calendar = Calendar.getInstance( TimeZone.getTimeZone( "GMT" ) );
@@ -1029,6 +1075,7 @@
     /**
      * Tests the compareTo() method.
      */
+    @Test
     public void testCompareTo() throws ParseException
     {
         String gt1 = "20080102121313,999Z";
@@ -1057,6 +1104,7 @@
     /**
      * Tests the equals() method.
      */
+    @Test
     public void testEquals() throws ParseException
     {
         String gt1 = "20080102121314Z";

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java Sat Apr 11 01:03:00 2009
@@ -26,8 +26,13 @@
 import java.util.List;
 
 import org.apache.directory.shared.ldap.util.JoinIterator;
+import org.junit.Test;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertFalse;
 
 
 /**
@@ -36,8 +41,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JoinIteratorTest extends TestCase
+public class JoinIteratorTest
 {
+    @Test
     public void testNullArgument()
     {
         try
@@ -52,6 +58,7 @@
     }
 
 
+    @Test
     public void testSingleArgument()
     {
         Iterator<?>[] iterators = new Iterator<?>[]
@@ -69,6 +76,7 @@
     }
 
 
+    @Test
     public void testTwoArguments()
     {
         Iterator<?>[] iterators = new Iterator<?>[]
@@ -83,6 +91,7 @@
     }
 
 
+    @Test
     public void testSeveralArguments()
     {
         List<String> multivalued = new ArrayList<String>();



Mime
View raw message