directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r764131 [14/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/IntegerSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.IntegerSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for IntegerSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class IntegerSyntaxCheckerTest extends TestCase
+public class IntegerSyntaxCheckerTest
 {
     IntegerSyntaxChecker checker = new IntegerSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "f" ) );
@@ -53,6 +58,7 @@
     }
     
     
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "000" ) );
@@ -62,6 +68,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "1" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.JavaByteSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for JavaByteSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JavaByteSyntaxCheckerTest extends TestCase
+public class JavaByteSyntaxCheckerTest
 {
     JavaByteSyntaxChecker checker = new JavaByteSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "f" ) );
@@ -53,6 +58,7 @@
     }
 
 
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "000" ) );
@@ -62,6 +68,7 @@
     }
 
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "1" ) );
@@ -73,6 +80,7 @@
     }
 
 
+    @Test
     public void testMinValueBoundry()
     {
         int min = Byte.MIN_VALUE;
@@ -84,6 +92,7 @@
     }
 
 
+    @Test
     public void testMaxValueBoundry()
     {
         int max = Byte.MAX_VALUE;

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -19,11 +19,12 @@
  */
 package org.apache.directory.shared.ldap.schema.syntax;
 
-import junit.framework.TestCase;
-
 import java.math.BigInteger;
 
 import org.apache.directory.shared.ldap.schema.syntaxes.JavaIntegerSyntaxChecker;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for IntegerSyntaxChecker.
@@ -31,23 +32,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JavaIntegerSyntaxCheckerTest extends TestCase
+public class JavaIntegerSyntaxCheckerTest
 {
     JavaIntegerSyntaxChecker checker = new JavaIntegerSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "f" ) );
@@ -55,6 +59,7 @@
     }
 
 
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "000" ) );
@@ -64,6 +69,7 @@
     }
 
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "1" ) );
@@ -75,6 +81,7 @@
     }
 
 
+    @Test
     public void testMinValueBoundry()
     {
         BigInteger min = new BigInteger( Integer.toString( Integer.MIN_VALUE ) );
@@ -86,6 +93,7 @@
     }
 
 
+    @Test
     public void testMaxValueBoundry()
     {
         BigInteger max = new BigInteger( Integer.toString( Integer.MAX_VALUE ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -19,11 +19,12 @@
  */
 package org.apache.directory.shared.ldap.schema.syntax;
 
-import junit.framework.TestCase;
-
 import java.math.BigInteger;
 
 import org.apache.directory.shared.ldap.schema.syntaxes.JavaLongSyntaxChecker;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for JavaLongSyntaxChecker.
@@ -31,23 +32,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JavaLongSyntaxCheckerTest extends TestCase
+public class JavaLongSyntaxCheckerTest
 {
     JavaLongSyntaxChecker checker = new JavaLongSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "f" ) );
@@ -55,6 +59,7 @@
     }
 
 
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "000" ) );
@@ -64,6 +69,7 @@
     }
 
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "1" ) );
@@ -75,6 +81,7 @@
     }
 
 
+    @Test
     public void testMinValueBoundry()
     {
         BigInteger min = new BigInteger( Long.toString( Long.MIN_VALUE ) );
@@ -86,6 +93,7 @@
     }
 
 
+    @Test
     public void testMaxValueBoundry()
     {
         BigInteger max = new BigInteger( Long.toString( Long.MAX_VALUE ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.JavaShortSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for JavaShortSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JavaShortSyntaxCheckerTest extends TestCase
+public class JavaShortSyntaxCheckerTest
 {
     JavaShortSyntaxChecker checker = new JavaShortSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "f" ) );
@@ -53,6 +58,7 @@
     }
 
 
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "000" ) );
@@ -62,6 +68,7 @@
     }
 
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "1" ) );
@@ -73,6 +80,7 @@
     }
 
 
+    @Test
     public void testMinValueBoundry()
     {
         int min = Short.MIN_VALUE;
@@ -84,6 +92,7 @@
     }
 
 
+    @Test
     public void testMaxValueBoundry()
     {
         int max = Short.MAX_VALUE;

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.JpegSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for JpegSyntaxChecker.
@@ -30,27 +32,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JpegSyntaxCheckerTest extends TestCase
+public class JpegSyntaxCheckerTest
 {
     JpegSyntaxChecker checker = new JpegSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax(  "this is not a jpeg file..." ) );
     }
 
+    @Test
     public void testCorrectCase()
     {
         byte[] array = new byte[256];

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.LdapSyntaxDescriptionSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 
 /**
@@ -33,11 +35,12 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class LdapSyntaxDescriptionSyntaxCheckerTest extends TestCase
+public class LdapSyntaxDescriptionSyntaxCheckerTest
 {
     private LdapSyntaxDescriptionSyntaxChecker checker = new LdapSyntaxDescriptionSyntaxChecker();
 
 
+    @Test
     public void testValid()
     {
         assertTrue( checker.isValidSyntax( ( "( 1.3.6.1.4.1.1466.115.121.1.15 )" ) ) );
@@ -55,6 +58,7 @@
     }
 
 
+    @Test
     public void testInvalid()
     {
         // null 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.MHSORAddressSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for MHSORAddressSyntaxChecker.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class MHSORAddressSyntaxCheckerTest extends TestCase
+public class MHSORAddressSyntaxCheckerTest
 {
     MHSORAddressSyntaxChecker checker = new MHSORAddressSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.33", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.MailPreferenceSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for MailPreferenceSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class MailPreferenceSyntaxCheckerTest extends TestCase
+public class MailPreferenceSyntaxCheckerTest
 {
     MailPreferenceSyntaxChecker checker = new MailPreferenceSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "f" ) );
@@ -55,6 +60,7 @@
     }
     
     
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "any-list" ) );
@@ -64,6 +70,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "ANY-LIST" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.MasterAndShadowAccessPointSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for MasterAndShadowAccessPointSyntaxChecker.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class MasterAndShadowAccessPointSyntaxCheckerTest extends TestCase
+public class MasterAndShadowAccessPointSyntaxCheckerTest
 {
     MasterAndShadowAccessPointSyntaxChecker checker = new MasterAndShadowAccessPointSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.29", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleDescriptionSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 
 /**
@@ -33,10 +35,11 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class MatchingRuleDescriptionSyntaxCheckerTest extends TestCase
+public class MatchingRuleDescriptionSyntaxCheckerTest
 {
     private MatchingRuleDescriptionSyntaxChecker checker = new MatchingRuleDescriptionSyntaxChecker();
 
+    @Test
     public void testValid()
     {
         assertTrue( checker.isValidSyntax( ( "( 2.5.13.5 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )" ) ) );
@@ -50,6 +53,7 @@
     }
 
 
+    @Test
     public void testInvalid()
     {
         // null 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleUseDescriptionSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 
 /**
@@ -33,11 +35,12 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class MatchingRuleUseDescriptionSyntaxCheckerTest extends TestCase
+public class MatchingRuleUseDescriptionSyntaxCheckerTest
 {
     private MatchingRuleUseDescriptionSyntaxChecker checker = new MatchingRuleUseDescriptionSyntaxChecker();
 
 
+    @Test
     public void testValid()
     {
         assertTrue( checker.isValidSyntax( ( "( 2.5.13.17 APPLIES userPassword )" ) ) );
@@ -59,6 +62,7 @@
     }
 
 
+    @Test
     public void testInvalid()
     {
         // null 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.NameAndOptionalUIDSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for NameAndOptionalUIDSyntaxChecker.
@@ -30,23 +32,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class NameAndOptionalUIDSyntaxCheckerTest extends TestCase
+public class NameAndOptionalUIDSyntaxCheckerTest
 {
     NameAndOptionalUIDSyntaxChecker checker = new NameAndOptionalUIDSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "0" ) );
@@ -56,6 +61,7 @@
     }
     
     
+    @Test
     public void testWrongDN()
     {
         assertFalse( checker.isValidSyntax( "a=b," ) );
@@ -64,6 +70,7 @@
         assertFalse( checker.isValidSyntax( "a=b,c=d," ) );
     }
     
+    @Test
     public void testWrongUID()
     {
         assertFalse( checker.isValidSyntax( "#'0101'B" ) );
@@ -73,6 +80,7 @@
     }
     
     
+    @Test
     public void testCorrectDN()
     {
         assertTrue( checker.isValidSyntax( "a=b" ) );
@@ -82,6 +90,7 @@
         assertTrue( checker.isValidSyntax( "a=b\\,c = d, e=f" ) );
     }
 
+    @Test
     public void testCorrectDNAndUID()
     {
         assertTrue( checker.isValidSyntax( "a=b#'1010'B" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.NameFormDescriptionSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 
 /**
@@ -33,10 +35,11 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class NameFormDescriptionSyntaxCheckerTest extends TestCase
+public class NameFormDescriptionSyntaxCheckerTest
 {
     private NameFormDescriptionSyntaxChecker checker = new NameFormDescriptionSyntaxChecker();
 
+    @Test
     public void testValid()
     {
         assertTrue( checker.isValidSyntax( "( 2.5.15.3 OC o MUST m )" ) );
@@ -52,6 +55,7 @@
         assertTrue( checker.isValidSyntax( "(   2.5.15.3   NAME   'orgNameForm'    DESC    'orgNameForm'   OC   organization   MUST   (o)   MAY   (ou$cn))" ) );
     }
 
+    @Test
     public void testInvalid()
     {
         // null 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameOrNumericIdSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameOrNumericIdSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameOrNumericIdSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameOrNumericIdSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.NumericOidSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 
 /**
@@ -31,22 +33,25 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class NameOrNumericIdSyntaxCheckerTest extends TestCase
+public class NameOrNumericIdSyntaxCheckerTest
 {
     NumericOidSyntaxChecker checker = new NumericOidSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testNumericIds()
     {
         assertFalse( checker.isValidSyntax( "111" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.NumericStringSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for NumericStringSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class NumericStringSyntaxCheckerTest extends TestCase
+public class NumericStringSyntaxCheckerTest
 {
     NumericStringSyntaxChecker checker = new NumericStringSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "f" ) );
@@ -53,6 +58,7 @@
     }
     
     
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "123 456 f" ) );
@@ -61,6 +67,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "1" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassDescriptionSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 
 /**
@@ -33,10 +35,11 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ObjectClassDescriptionSyntaxCheckerTest extends TestCase
+public class ObjectClassDescriptionSyntaxCheckerTest
 {
     private ObjectClassDescriptionSyntaxChecker checker = new ObjectClassDescriptionSyntaxChecker();
 
+    @Test
     public void testValid()
     {
         assertTrue( checker.isValidSyntax( "( 2.5.6.6 )" ) );
@@ -53,6 +56,7 @@
     }
 
 
+    @Test
     public void testInvalid()
     {
         // null 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassTypeSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for ObjectClassTypeSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ObjectClassTypeSyntaxCheckerTest extends TestCase
+public class ObjectClassTypeSyntaxCheckerTest
 {
     ObjectClassTypeSyntaxChecker checker = new ObjectClassTypeSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "0" ) );
@@ -55,6 +60,7 @@
     }
     
     
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "auxiliary" ) );
@@ -63,6 +69,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "AUXILIARY" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.ObjectNameSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for ObjectNameSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ObjectNameSyntaxCheckerTest extends TestCase
+public class ObjectNameSyntaxCheckerTest
 {
     ObjectNameSyntaxChecker checker = new ObjectNameSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testName()
     {
         assertTrue( checker.isValidSyntax( "a" ) );
@@ -57,6 +62,7 @@
     }
     
     
+    @Test
     public void testWrongName()
     {
         assertFalse( checker.isValidSyntax( "1test" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.OctetStringSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for BitStringSyntaxChecker.
@@ -30,23 +32,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class OctetStringSyntaxCheckerTest extends TestCase
+public class OctetStringSyntaxCheckerTest
 {
     OctetStringSyntaxChecker checker = new OctetStringSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testCorrectCase()
     {
         byte[] array = new byte[256];

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OtherMailboxSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OtherMailboxSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OtherMailboxSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OtherMailboxSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.OtherMailboxSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for OtherMailboxSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class OtherMailboxSyntaxCheckerTest extends TestCase
+public class OtherMailboxSyntaxCheckerTest
 {
     OtherMailboxSyntaxChecker checker = new OtherMailboxSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testWrongCase() throws Exception
     {
         assertFalse( checker.isValidSyntax( "mailType" ) );
@@ -56,6 +61,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "SMTP$dev@directory.apache.org" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PostalAddressSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PostalAddressSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PostalAddressSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PostalAddressSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.PostalAddressSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for PostalAddressSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class PostalAddressSyntaxCheckerTest extends TestCase
+public class PostalAddressSyntaxCheckerTest
 {
     PostalAddressSyntaxChecker checker = new PostalAddressSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "$" ) );
@@ -55,6 +60,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "test" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PresentationAddressSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PresentationAddressSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PresentationAddressSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PresentationAddressSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.PresentationAddressSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for PresentationAddress.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class PresentationAddressSyntaxCheckerTest extends TestCase
+public class PresentationAddressSyntaxCheckerTest
 {
     PresentationAddressSyntaxChecker checker = new PresentationAddressSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.43", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.PrintableStringSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for PrintableStringSyntaxChecker.
@@ -29,17 +31,19 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class PrintableStringSyntaxCheckerTest extends TestCase
+public class PrintableStringSyntaxCheckerTest
 {
     PrintableStringSyntaxChecker checker = new PrintableStringSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
@@ -53,6 +57,7 @@
      * printable chars.
      *
      */
+    @Test
     public void testWrongStrings()
     {
         for ( int i = 0; i < 0x1F; i++ )
@@ -83,6 +88,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "0123456789" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ProtocolInformationSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ProtocolInformationSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ProtocolInformationSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ProtocolInformationSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.ProtocolInformationSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for ProtocolInformationSyntaxChecker.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ProtocolInformationSyntaxCheckerTest extends TestCase
+public class ProtocolInformationSyntaxCheckerTest
 {
     ProtocolInformationSyntaxChecker checker = new ProtocolInformationSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.42", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubstringAssertionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubstringAssertionSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubstringAssertionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubstringAssertionSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.SubstringAssertionSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for SubstringAssertionSyntaxChecker.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubstringAssertionSyntaxCheckerTest extends TestCase
+public class SubstringAssertionSyntaxCheckerTest
 {
     SubstringAssertionSyntaxChecker checker = new SubstringAssertionSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.58", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubtreeSpecificationSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubtreeSpecificationSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubtreeSpecificationSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubtreeSpecificationSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,10 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.SubtreeSpecificationSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for SubtreeSpecificationSyntaxChecker.
@@ -29,27 +32,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubtreeSpecificationSyntaxCheckerTest extends TestCase
+public class SubtreeSpecificationSyntaxCheckerTest
 {
     SubtreeSpecificationSyntaxChecker checker = new SubtreeSpecificationSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.45", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
     }
@@ -107,6 +114,7 @@
     /**
      * Tests the parser with a valid empty specification.
      */
+    @Test
     public void testEmptySpec() throws Exception
     {
         assertTrue( checker.isValidSyntax( EMPTY_SPEC ) );
@@ -122,6 +130,7 @@
     /**
      * Tests the parser with a valid specification with base set.
      */
+    @Test
     public void testSpecWithBase() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_BASE ) );
@@ -132,6 +141,7 @@
      * Tests the parser with an invalid specification with missing white spaces
      * and base set.
      */
+    @Test
     public void testInvalidSpecWithBaseAndMissingWS() throws Exception
     {
         assertFalse( checker.isValidSyntax( INVALID_SPEC_WITH_BASE_AND_MISSING_WS ) );
@@ -142,6 +152,7 @@
      * Tests the parser with a valid specification with some specific exclusions
      * set.
      */
+    @Test
     public void testSpecWithSpecificExclusions() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_SPECIFICEXCLUSIONS ) );
@@ -152,6 +163,7 @@
      * Tests the parser with a valid specification with an empty specific
      * exclusions set.
      */
+    @Test
     public void testSpecWithEmptySpecificExclusions() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_EMPTY_SPECIFICEXCLUSIONS ) );
@@ -161,6 +173,7 @@
     /**
      * Tests the parser with a valid specification with minimum and maximum set.
      */
+    @Test
     public void testSpecWithMinimumAndMaximum() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_MINIMUM_AND_MAXIMUM ) );
@@ -171,6 +184,7 @@
      * Tests the parser with a valid specification with base and minimum and
      * maximum set.
      */
+    @Test
     public void testWithBaseAndMinimumAndMaximum() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_BASE_AND_MINIMUM_AND_MAXIMUM ) );
@@ -181,6 +195,7 @@
      * Tests the parser with a valid specification with base and specific
      * exclusions and minimum and maximum set.
      */
+    @Test
     public void testSpecWithBaseAndSpecificExclusionsAndMinimumAndMaximum() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_BASE_AND_SPECIFICEXCLUSIONS_AND_MINIMUM_AND_MAXIMUM ) );
@@ -190,6 +205,7 @@
     /**
      * Tests the parser with a valid specification with refinement set.
      */
+    @Test
     public void testSpecWithRefinement() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_REFINEMENT ) );
@@ -200,6 +216,7 @@
      * Tests the parser with a valid specification with base and empty
      * refinement set.
      */
+    @Test
     public void testSpecWithBaseAndEmptyRefinement() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_BASE_AND_EMPTY_REFINEMENT ) );
@@ -209,6 +226,7 @@
     /**
      * Tests the parser with a valid specification with all components set.
      */
+    @Test
     public void testSpecWithAllInOne() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_ALL_IN_ONE ) );
@@ -220,6 +238,7 @@
      * Tests the parser with a valid specification with unordinary component
      * order.
      */
+    @Test
     public void testSpecOrderOfComponentsDoesNotMatter() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_ORDER_OF_COMPONENTS_DOES_NOT_MATTER ) );
@@ -229,6 +248,7 @@
      * Tests the parser with a valid specification with unordinary component
      * order.
      */
+    @Test
     public void testBadAssertion() throws Exception
     {
         assertFalse( checker.isValidSyntax( INVALID_SILLY_THING ) );
@@ -238,6 +258,7 @@
     /**
      * Tests the parser with a valid specification with refinement set.
      */
+    @Test
     public void testSpecWithFilter() throws Exception
     {
         assertTrue( checker.isValidSyntax( SPEC_WITH_FILTER ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierAndConsumerSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierAndConsumerSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierAndConsumerSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierAndConsumerSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.SupplierAndConsumerSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for SupplierAndConsumerSyntaxChecker.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SupplierAndConsumerSyntaxCheckerTest extends TestCase
+public class SupplierAndConsumerSyntaxCheckerTest
 {
     SupplierAndConsumerSyntaxChecker checker = new SupplierAndConsumerSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.48", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierInformationSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierInformationSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierInformationSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierInformationSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.SupplierInformationSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for SupplierInformationSyntaxChecker.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SupplierInformationSyntaxCheckerTest extends TestCase
+public class SupplierInformationSyntaxCheckerTest
 {
     SupplierInformationSyntaxChecker checker = new SupplierInformationSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.46", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierOrConsumerSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierOrConsumerSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierOrConsumerSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierOrConsumerSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.SupplierOrConsumerSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for SupplierOrConsumerSyntaxChecker.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SupplierOrConsumerSyntaxCheckerTest extends TestCase
+public class SupplierOrConsumerSyntaxCheckerTest
 {
     SupplierOrConsumerSyntaxChecker checker = new SupplierOrConsumerSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.47", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupportedAlgorithmSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupportedAlgorithmSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupportedAlgorithmSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupportedAlgorithmSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.SupportedAlgorithmSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for SupportedAlgorithmSyntaxChecker.
@@ -29,27 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SupportedAlgorithmSyntaxCheckerTest extends TestCase
+public class SupportedAlgorithmSyntaxCheckerTest
 {
     SupportedAlgorithmSyntaxChecker checker = new SupportedAlgorithmSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertTrue( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertTrue( checker.isValidSyntax( "" ) );
     }
 
+    @Test
     public void testOid()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.49", checker.getSyntaxOid() );
     }
 
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "FALSE" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,10 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.TelephoneNumberSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases for NumericStringSyntaxChecker.
@@ -29,28 +32,32 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class TelephoneNumberSyntaxCheckerTest extends TestCase
+public class TelephoneNumberSyntaxCheckerTest
 {
     TelephoneNumberSyntaxChecker checker = new TelephoneNumberSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
     
+    @Test
     public void testOID()
     {
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.50", checker.getSyntaxOid() );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "A" ) );
@@ -58,6 +65,7 @@
     }
     
     
+    @Test
     public void testWrongCase()
     {
         assertFalse( checker.isValidSyntax( "123 456 f" ) );
@@ -66,6 +74,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "1" ) );
@@ -75,6 +84,7 @@
         assertTrue( checker.isValidSyntax( " 12 34 56 78 90 " ) );
     }
     
+    @Test
     public void testWithNewMandatoryRegexp()
     {
         // Adding french telephone number regexp

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TeletexTerminalIdentifierSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TeletexTerminalIdentifierSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TeletexTerminalIdentifierSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TeletexTerminalIdentifierSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.TeletexTerminalIdentifierSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for TeletexTerminalIdentifierSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class TeletexTerminalIdentifierSyntaxCheckerTest extends TestCase
+public class TeletexTerminalIdentifierSyntaxCheckerTest
 {
     TeletexTerminalIdentifierSyntaxChecker checker = new TeletexTerminalIdentifierSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testWrongCase() throws Exception
     {
         assertFalse( checker.isValidSyntax( "test$" ) );
@@ -63,6 +68,7 @@
     }
     
     
+    @Test
     public void testCorrectCase() throws Exception
     {
         assertTrue( checker.isValidSyntax( "test" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelexNumberSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelexNumberSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelexNumberSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelexNumberSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,9 @@
 
 import org.apache.directory.shared.ldap.schema.syntaxes.TelexNumberSyntaxChecker;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for TelexNumberSyntaxChecker.
@@ -29,23 +31,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class TelexNumberSyntaxCheckerTest extends TestCase
+public class TelexNumberSyntaxCheckerTest
 {
     TelexNumberSyntaxChecker checker = new TelexNumberSyntaxChecker();
 
 
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testWrongCase() throws Exception
     {
         assertFalse( checker.isValidSyntax( "test" ) );
@@ -58,6 +63,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "test$test$test" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxCheckerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxCheckerTest.java Sat Apr 11 01:03:00 2009
@@ -21,8 +21,10 @@
 
 
 import org.apache.directory.shared.ldap.schema.syntaxes.UtcTimeSyntaxChecker;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import junit.framework.TestCase;
 
 /**
  * Test cases for UtcTimeSyntaxChecker.
@@ -30,23 +32,25 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class UtcTimeSyntaxCheckerTest extends TestCase
+public class UtcTimeSyntaxCheckerTest
 {
     UtcTimeSyntaxChecker checker = new UtcTimeSyntaxChecker();
 
-
+    @Test
     public void testNullString()
     {
         assertFalse( checker.isValidSyntax( null ) );
     }
 
 
+    @Test
     public void testEmptyString()
     {
         assertFalse( checker.isValidSyntax( "" ) );
     }
 
 
+    @Test
     public void testOneCharString()
     {
         assertFalse( checker.isValidSyntax( "0" ) );
@@ -55,6 +59,7 @@
         assertFalse( checker.isValidSyntax( "B" ) );
     }
     
+    @Test
     public void testErrorCase()
     {
         assertFalse( checker.isValidSyntax( "060005184527Z" ) );
@@ -74,6 +79,7 @@
     }
     
     
+    @Test
     public void testCorrectCase()
     {
         assertTrue( checker.isValidSyntax( "061205184527Z" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java Sat Apr 11 01:03:00 2009
@@ -22,13 +22,19 @@
 
 import java.text.ParseException;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 import org.apache.directory.shared.ldap.schema.parser.ConsoleParserMonitor;
 import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
 import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
+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;
 
 
 /**
@@ -36,20 +42,22 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AttributeTypeDescriptionSchemaParserTest extends TestCase
+public class AttributeTypeDescriptionSchemaParserTest
 {
     /** the parser instance */
     private AttributeTypeDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new AttributeTypeDescriptionSchemaParser();
         parser.setParserMonitor( new ConsoleParserMonitor() );
     }
 
 
-    protected void tearDown() throws Exception
+    @After
+    public void tearDown() throws Exception
     {
         parser = null;
     }
@@ -60,6 +68,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNumericOid() throws ParseException
     {
         SchemaParserTestUtils.testNumericOid( parser, "SYNTAX 1.1" );
@@ -71,6 +80,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNames() throws ParseException
     {
         SchemaParserTestUtils.testNames( parser, "1.1", "SYNTAX 1.1" );
@@ -82,6 +92,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "SYNTAX 1.1" );
@@ -93,6 +104,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testObsolete() throws ParseException
     {
         SchemaParserTestUtils.testObsolete( parser, "1.1", "SYNTAX 1.1" );
@@ -104,6 +116,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testSuperType() throws ParseException
     {
         String value = null;
@@ -188,6 +201,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testEquality() throws ParseException
     {
         String value = null;
@@ -231,6 +245,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testOrdering() throws ParseException
     {
         String value = null;
@@ -274,6 +289,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testSubstring() throws ParseException
     {
         String value = null;
@@ -318,6 +334,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testSyntax() throws ParseException
     {
         String value = null;
@@ -445,6 +462,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testSingleValue() throws ParseException
     {
         String value = null;
@@ -484,6 +502,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testCollective() throws ParseException
     {
         String value = null;
@@ -523,6 +542,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNoUserModification() throws ParseException
     {
         String value = null;
@@ -562,6 +582,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUsage() throws ParseException
     {
         String value = null;
@@ -616,6 +637,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "SYNTAX 1.1" );
@@ -627,6 +649,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testFull() throws ParseException
     {
         String value = null;
@@ -670,6 +693,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         String[] testValues = new String[]
@@ -690,6 +714,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testRequiredElements() throws ParseException
     {
         String value = null;
@@ -732,6 +757,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testCollecitveConstraint() throws ParseException
     {
         String value = null;
@@ -791,6 +817,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNoUserModificatonConstraint() throws ParseException
     {
         String value = null;
@@ -843,6 +870,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testIgnoreElementOrder() throws ParseException
     {
         String value = "( 2.5.4.3 SUP name SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE userApplications DESC 'RFC2256: common name(s) for which the entity is known by'  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch NAME ( 'cn' 'commonName' )  )";
@@ -866,6 +894,7 @@
     //         Some real-world attribute type definitions         //
     ////////////////////////////////////////////////////////////////
 
+    @Test
     public void testRfcUid() throws ParseException
     {
         String value = "( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) DESC 'RFC1274: user identifier' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} USAGE userApplications )";
@@ -897,6 +926,7 @@
     /**
      * Tests the parse of a simple AttributeType
      */
+    @Test
     public void testAddAttributeType() throws ParseException
     {
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) "
@@ -914,6 +944,7 @@
     /**
      * Tests the parse of a simple AttributeType with the schema extension.
      */
+    @Test
     public void testAttributeTypeWithSchemaExtension() throws ParseException
     {
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) "
@@ -932,6 +963,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         String[] testValues = new String[]
@@ -947,6 +979,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "SYNTAX 1.1" );
@@ -986,8 +1019,8 @@
             // NAME with special chars
             value = "( 1.2.3 SYNTAX te_st NAME 't-e_s.t;' )";
             atd = parser.parseAttributeTypeDescription( value );
-            Assert.assertEquals( 1, atd.getNames().size() );
-            Assert.assertEquals( "t-e_s.t;", atd.getNames().get( 0 ) );
+            assertEquals( 1, atd.getNames().size() );
+            assertEquals( "t-e_s.t;", atd.getNames().get( 0 ) );
 
             // SYNTAX with underscore
             value = "( 1.1 SYNTAX te_st )";

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.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.ComparatorDescription;
 import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescriptionSchemaParser;
+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 ComparatorDescriptionSchemaParserTest extends TestCase
+public class ComparatorDescriptionSchemaParserTest
 {
     /** the parser instance */
     private ComparatorDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new ComparatorDescriptionSchemaParser();
     }
 
 
-    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;
@@ -76,6 +84,7 @@
     }
 
 
+    @Test
     public void testBytecode() throws ParseException
     {
         String value = null;
@@ -101,12 +110,14 @@
     }
 
 
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "FQCN org.apache.directory.SimpleComparator" );
     }
 
 
+    @Test
     public void testFull()
     {
         // TODO
@@ -118,6 +129,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         // TODO
@@ -129,6 +141,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testRequiredElements()
     {
         // TODO
@@ -138,6 +151,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         // TODO
@@ -147,6 +161,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/schema/syntax/parser/DITContentRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITContentRuleDescriptionSchemaParserTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITContentRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITContentRuleDescriptionSchemaParserTest.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.DITContentRuleDescription;
 import org.apache.directory.shared.ldap.schema.parsers.DITContentRuleDescriptionSchemaParser;
+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 DITContentRuleDescriptionSchemaParserTest extends TestCase
+public class DITContentRuleDescriptionSchemaParserTest
 {
     /** the parser instance */
     private DITContentRuleDescriptionSchemaParser parser;
 
 
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
         parser = new DITContentRuleDescriptionSchemaParser();
     }
 
 
-    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, "" );
@@ -67,6 +75,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNames() throws ParseException
     {
         SchemaParserTestUtils.testNames( parser, "1.1", "" );
@@ -78,6 +87,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testDescription() throws ParseException
     {
         SchemaParserTestUtils.testDescription( parser, "1.1", "" );
@@ -89,6 +99,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testObsolete() throws ParseException
     {
         SchemaParserTestUtils.testObsolete( parser, "1.1", "" );
@@ -100,6 +111,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testAux() throws ParseException
     {
         String value = null;
@@ -238,6 +250,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testMust() throws ParseException
     {
         String value = null;
@@ -298,6 +311,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testMay() throws ParseException
     {
         String value = null;
@@ -346,6 +360,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testNot() throws ParseException
     {
         String value = null;
@@ -393,6 +408,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testExtensions() throws ParseException
     {
         SchemaParserTestUtils.testExtensions( parser, "1.1", "" );
@@ -405,6 +421,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testFull() throws ParseException
     {
         String value = null;
@@ -452,6 +469,7 @@
      * 
      * @throws ParseException
      */
+    @Test
     public void testUniqueElements()
     {
         String[] testValues = new String[]
@@ -465,6 +483,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws ParseException
     {
         String[] testValues = new String[]
@@ -481,6 +500,7 @@
     /**
      * Tests quirks mode.
      */
+    @Test
     public void testQuirksMode() throws ParseException
     {
         SchemaParserTestUtils.testQuirksMode( parser, "" );



Mime
View raw message