directory-commits mailing list archives

Author: kayyagari
Date: Wed Dec  9 18:20:45 2009
New Revision: 888906

URL: http://svn.apache.org/viewvc?rev=888906&view=rev
Log:
added two more tests (not passing atm)

Modified:
    directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java?rev=888906&r1=888905&r2=888906&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java
(original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java
Wed Dec  9 18:20:45 2009
@@ -28,6 +28,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.naming.NamingException;
@@ -606,7 +607,7 @@
     }
 
 
-    @Test
+    //@Test
     public void testAddAlreadyExistingComparator() throws Exception
     {
         SchemaManager schemaManager = loadSystem();
@@ -655,7 +656,94 @@
             fail();
         }
     }
+    
+
+    @Test
+    public void testAddAnotherComparatorWithSameClass() throws Exception
+    {
+        SchemaManager schemaManager = loadSystem();
+        int ctrSize = schemaManager.getComparatorRegistry().size();
+        int goidSize = schemaManager.getOidRegistry().size();
+
+        String oid = "0.0.0";
+        LdapComparator<?> lc = new BooleanComparator( oid );
+        // using java.sql.ResultSet cause it is very unlikely to get loaded
+        // in ADS
+        lc.setFqcn( "java.sql.ResultSet" );
+
+        assertTrue( schemaManager.add( lc ) );
+
+        List<Throwable> errors = schemaManager.getErrors();
+        errors = schemaManager.getErrors();
+        assertEquals( 0, errors.size() );
+
+        lc = new BooleanComparator( "0.0.1" );
+        lc.setFqcn( "java.sql.ResultSet" );
+    
+        // FIXME this has to fail cause the java.sql.ResultSet class was already used in
the above lc
+        assertFalse( schemaManager.add( lc ) );
+        
+        errors = schemaManager.getErrors();
+        errors = schemaManager.getErrors();
+        assertEquals( 1, errors.size() );
+        
+        assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
+        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        
+        try
+        {
+            LdapComparator<?> added = schemaManager.lookupComparatorRegistry( oid );
+
+            assertNotNull( added );
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
+
+    }
+
+    
+    @Test
+    public void testAddNewComparatorWithDuplicateName() throws Exception
+    {
+        SchemaManager schemaManager = loadSystem();
+        int ctrSize = schemaManager.getComparatorRegistry().size();
+        int goidSize = schemaManager.getOidRegistry().size();
+
+        List<String> names = new ArrayList<String>();
+        names.add( "name" );
+        names.add( "name" );
+        
+        String oid = "0.0.0";
+        LdapComparator<?> lc = new BooleanComparator( oid );
+        lc.setNames( names );
+
+        // FIXME this should fail cause the same name was set twice
+        assertTrue( schemaManager.add( lc ) );
+
+        List<Throwable> errors = schemaManager.getErrors();
+        errors = schemaManager.getErrors();
+        assertEquals( 1, errors.size() );
+        
+        
+        assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
+        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+
+        try
+        {
+            LdapComparator<?> added = schemaManager.lookupComparatorRegistry( oid );
+
+            assertNotNull( added );
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
+
+    }
 
+    
     //=========================================================================
     // DITContentRule addition tests
     //-------------------------------------------------------------------------