directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r893999 [3/3] - in /directory/shared/branches/shared-schema/ldap-schema-manager/src: main/java/org/apache/directory/shared/ldap/schema/ main/java/org/apache/directory/shared/ldap/schema/manager/ main/java/org/apache/directory/shared/ldap/sc...
Date Sat, 26 Dec 2009 16:08:38 GMT
Copied: directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/SchemaManagerLoadTest.java (from r893998, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/SchemaManagerLoadTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/SchemaManagerLoadTest.java?p2=directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/SchemaManagerLoadTest.java&p1=directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/SchemaManagerLoadTest.java&r1=893998&r2=893999&rev=893999&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/SchemaManagerLoadTest.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/SchemaManagerLoadTest.java Sat Dec 26 16:08:37 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.lap.schema;
+package org.apache.directory.shared.ldap.schema.manager.impl;
 
 
 import static org.junit.Assert.assertEquals;
@@ -32,7 +32,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.schema.DefaultSchemaManager;
+import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -217,20 +217,20 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
 
-        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
     }
 
 
@@ -244,24 +244,24 @@
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
         // Check that we can't load a schema without its dependencies
-        assertFalse( schemaManager.load( "core" ) );
+        Assert.assertFalse( schemaManager.load( "core" ) );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 92, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 92, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
     }
 
 
@@ -274,24 +274,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
-        assertTrue( schemaManager.load( "apache" ) );
-
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 145, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 43, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 43, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 307, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apache" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "apache" ) );
+
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 145, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 43, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 43, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 307, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apache" ) );
     }
 
 
@@ -304,22 +304,22 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "apacheMeta" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "apacheMeta" ) );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 69, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 40, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 40, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 42, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 195, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apachemeta" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 69, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 40, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 40, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 42, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 195, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apachemeta" ) );
     }
 
 
@@ -332,24 +332,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
-        assertTrue( schemaManager.load( "Java" ) );
-
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 99, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 41, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 234, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "Java" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "Java" ) );
+
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 99, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 41, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 234, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "Java" ) );
     }
 
 
@@ -364,24 +364,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
-        assertTrue( schemaManager.load( "other" ) );
-
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 92, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "other" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "other" ) );
+
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 92, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "other" ) );
     }
 
 
@@ -394,24 +394,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
-        assertTrue( schemaManager.load( "cosine" ) );
-
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "cosine" ) );
+
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
     }
 
 
@@ -425,26 +425,26 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
-        assertTrue( schemaManager.load( "cosine" ) );
-        assertTrue( schemaManager.load( "InetOrgPerson" ) );
-
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "cosine" ) );
+        Assert.assertTrue( schemaManager.load( "InetOrgPerson" ) );
+
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 
 
@@ -457,24 +457,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
-        assertTrue( schemaManager.load( "Collective" ) );
-
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 105, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 235, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "collective" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "Collective" ) );
+
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 105, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 235, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "collective" ) );
     }
 
 
@@ -487,24 +487,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
-        assertTrue( schemaManager.load( "Krb5Kdc" ) );
-
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 107, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 39, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 240, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "Krb5Kdc" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "Krb5Kdc" ) );
+
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 107, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 39, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 240, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "Krb5Kdc" ) );
     }
 
 
@@ -518,26 +518,26 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core" ) );
-        assertTrue( schemaManager.load( "cosine" ) );
-        assertTrue( schemaManager.load( "nis" ) );
-
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core" ) );
+        Assert.assertTrue( schemaManager.load( "cosine" ) );
+        Assert.assertTrue( schemaManager.load( "nis" ) );
+
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
     }
 
 
@@ -550,30 +550,30 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
         try
         {
             schemaManager.loadWithDeps( "bad" );
-            fail();
+            Assert.fail();
         }
         catch ( LdapOperationNotSupportedException lonse )
         {
             // expected
         }
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "bad" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "bad" ) );
     }
 
 
@@ -586,24 +586,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
-        assertTrue( schemaManager.load( "core", "cosine", "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "core", "cosine", "InetOrgPerson" ) );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 
 
@@ -616,33 +616,33 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
 
         try
         {
-            assertFalse( schemaManager.load( "core", "bad", "cosine", "InetOrgPerson" ) );
-            fail();
+            Assert.assertFalse( schemaManager.load( "core", "bad", "cosine", "InetOrgPerson" ) );
+            Assert.fail();
         }
         catch ( LdapOperationNotSupportedException lonse )
         {
             // expected
         }
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 
 
@@ -655,27 +655,27 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
         
-        assertTrue( schemaManager.load( "system" ) );
+        Assert.assertTrue( schemaManager.load( "system" ) );
         
         // Try to load a disabled schema when the registries does
         // ot allow disabled schema to be loaded
-        assertFalse( schemaManager.load( "core", "nis", "cosine", "InetOrgPerson" ) );
+        Assert.assertFalse( schemaManager.load( "core", "nis", "cosine", "InetOrgPerson" ) );
 
-        assertFalse( schemaManager.getErrors().isEmpty() );
-        assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertFalse( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 
 
@@ -698,24 +698,24 @@
         Schema cosine = loader.getSchema( "cosine" );
         Schema inetOrgPerson = loader.getSchema( "InetOrgPerson" );
 
-        assertTrue( schemaManager.load( system, core, empty, cosine, inetOrgPerson ) );
+        Assert.assertTrue( schemaManager.load( system, core, empty, cosine, inetOrgPerson ) );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "empty" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "empty" ) );
     }
     
     
@@ -730,20 +730,20 @@
 
         Schema dummy = new DefaultSchema( "dummy" );
 
-        assertTrue( schemaManager.load( dummy ) );
+        Assert.assertTrue( schemaManager.load( dummy ) );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 0, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
 
-        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
+        Assert.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
     }
     
     
@@ -759,19 +759,19 @@
         Schema dummy = new DefaultSchema( "dummy" );
         dummy.addDependencies( "bad" );
 
-        assertFalse( schemaManager.load( dummy ) );
+        Assert.assertFalse( schemaManager.load( dummy ) );
 
-        assertFalse( schemaManager.getErrors().isEmpty() );
-        assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 0, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
+        Assert.assertFalse( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
 
-        assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
+        Assert.assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
     }
 }

Copied: directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/SchemaManagerLoadWithDepsTest.java (from r893998, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/SchemaManagerLoadWithDepsTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/SchemaManagerLoadWithDepsTest.java?p2=directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/SchemaManagerLoadWithDepsTest.java&p1=directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/SchemaManagerLoadWithDepsTest.java&r1=893998&r2=893999&rev=893999&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/SchemaManagerLoadWithDepsTest.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/SchemaManagerLoadWithDepsTest.java Sat Dec 26 16:08:37 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.lap.schema;
+package org.apache.directory.shared.ldap.schema.manager.impl;
 
 
 import static org.junit.Assert.assertEquals;
@@ -31,7 +31,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.schema.DefaultSchemaManager;
+import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -110,18 +110,18 @@
 
         schemaManager.loadWithDeps( "system" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 38, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
 
-        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
     }
 
 
@@ -136,19 +136,19 @@
 
         schemaManager.loadWithDeps( "core" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 92, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 92, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
     }
 
 
@@ -163,20 +163,20 @@
 
         schemaManager.loadWithDeps( "apache" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 145, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 43, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 43, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 307, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apache" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 145, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 43, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 43, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 307, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apache" ) );
     }
 
 
@@ -191,19 +191,19 @@
 
         schemaManager.loadWithDeps( "apacheMeta" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 69, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 40, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 40, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 42, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 195, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apachemeta" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 69, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 40, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 40, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 42, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 195, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apachemeta" ) );
     }
 
 
@@ -218,20 +218,20 @@
 
         schemaManager.loadWithDeps( "Java" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 99, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 41, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 234, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "Java" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 99, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 41, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 234, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "Java" ) );
     }
 
 
@@ -247,22 +247,22 @@
 
         schemaManager.loadWithDeps( "other" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 176, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 48, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 50, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 66, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 361, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apache" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apacheMeta" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "other" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 176, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 48, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 50, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 66, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 361, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apache" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "apacheMeta" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "other" ) );
     }
 
 
@@ -277,20 +277,20 @@
 
         schemaManager.loadWithDeps( "cosine" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
     }
 
 
@@ -306,21 +306,21 @@
 
         schemaManager.loadWithDeps( "InetOrgPerson" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 
 
@@ -335,20 +335,20 @@
 
         schemaManager.loadWithDeps( "Collective" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 105, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 235, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "collective" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 105, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 235, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "collective" ) );
     }
 
 
@@ -363,20 +363,20 @@
 
         schemaManager.loadWithDeps( "Krb5Kdc" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 107, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 39, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 240, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "Krb5Kdc" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 107, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 39, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 240, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "Krb5Kdc" ) );
     }
 
 
@@ -392,20 +392,20 @@
 
         schemaManager.loadWithDeps( "nis" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 0, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
     }
 
 
@@ -421,24 +421,24 @@
         try
         {
             schemaManager.loadWithDeps( "bad" );
-            fail();
+            Assert.fail();
         }
         catch ( LdapOperationNotSupportedException lonse )
         {
             // expected
         }
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 0, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
 
-        assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
     }
 
 
@@ -453,21 +453,21 @@
 
         schemaManager.loadWithDeps( "core", "InetOrgPerson" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 
 
@@ -483,7 +483,7 @@
         try
         {
             schemaManager.loadWithDeps( "core", "bad", "InetOrgPerson" );
-            fail();
+            Assert.fail();
         }
         catch ( LdapOperationNotSupportedException lonse )
         {
@@ -491,21 +491,21 @@
         }
 
         // No SchemaObject should be loaded as we had an error
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 0, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 
 
@@ -520,21 +520,21 @@
 
         schemaManager.loadWithDeps( "core", "nis", "InetOrgPerson" );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 
 
@@ -553,22 +553,22 @@
         Schema cosine = loader.getSchema( "cosine" );
         Schema inetOrgPerson = loader.getSchema( "InetOrgPerson" );
 
-        assertTrue( schemaManager.load( system, core, empty, cosine, inetOrgPerson ) );
+        Assert.assertTrue( schemaManager.load( system, core, empty, cosine, inetOrgPerson ) );
 
-        assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( 35, schemaManager.getComparatorRegistry().size() );
-        assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
-
-        assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
-        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
+        Assert.assertTrue( schemaManager.getErrors().isEmpty() );
+        Assert.assertEquals( 142, schemaManager.getAttributeTypeRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getComparatorRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getMatchingRuleRegistry().size() );
+        Assert.assertEquals( 35, schemaManager.getNormalizerRegistry().size() );
+        Assert.assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
+        Assert.assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
+        Assert.assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
+
+        Assert.assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
+        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
     }
 }



Mime
View raw message