directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r894003 [4/4] - in /directory: apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/branches/apacheds-schema/core-builder/src/main/java/org/apache/directory/server/core/build...
Date Sat, 26 Dec 2009 16:39:24 GMT
Modified: directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/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?rev=894003&r1=894002&r2=894003&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/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:39:20 2009
@@ -32,10 +32,9 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-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;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schema.registries.DefaultSchema;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -217,20 +216,20 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        Assert.assertTrue( schemaManager.load( "system" ) );
+        assertTrue( schemaManager.load( "system" ) );
 
-        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() );
+        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.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
     }
 
 
@@ -244,24 +243,24 @@
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
         // Check that we can't load a schema without its dependencies
-        Assert.assertFalse( schemaManager.load( "core" ) );
+        assertFalse( schemaManager.load( "core" ) );
 
-        Assert.assertTrue( schemaManager.load( "system" ) );
-        Assert.assertTrue( schemaManager.load( "core" ) );
+        assertTrue( schemaManager.load( "system" ) );
+        assertTrue( schemaManager.load( "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" ) );
+        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" ) );
     }
 
 
@@ -274,24 +273,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -304,22 +303,22 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        Assert.assertTrue( schemaManager.load( "system" ) );
-        Assert.assertTrue( schemaManager.load( "apacheMeta" ) );
+        assertTrue( schemaManager.load( "system" ) );
+        assertTrue( schemaManager.load( "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" ) );
+        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" ) );
     }
 
 
@@ -332,24 +331,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -364,24 +363,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -394,24 +393,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -425,26 +424,26 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -457,24 +456,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -487,24 +486,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -518,26 +517,26 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -550,30 +549,30 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        Assert.assertTrue( schemaManager.load( "system" ) );
+        assertTrue( schemaManager.load( "system" ) );
         try
         {
             schemaManager.loadWithDeps( "bad" );
-            Assert.fail();
+            fail();
         }
         catch ( LdapOperationNotSupportedException lonse )
         {
             // expected
         }
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -586,24 +585,24 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        Assert.assertTrue( schemaManager.load( "system" ) );
-        Assert.assertTrue( schemaManager.load( "core", "cosine", "InetOrgPerson" ) );
+        assertTrue( schemaManager.load( "system" ) );
+        assertTrue( schemaManager.load( "core", "cosine", "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" ) );
+        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" ) );
     }
 
 
@@ -616,33 +615,33 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
 
-        Assert.assertTrue( schemaManager.load( "system" ) );
+        assertTrue( schemaManager.load( "system" ) );
 
         try
         {
-            Assert.assertFalse( schemaManager.load( "core", "bad", "cosine", "InetOrgPerson" ) );
-            Assert.fail();
+            assertFalse( schemaManager.load( "core", "bad", "cosine", "InetOrgPerson" ) );
+            fail();
         }
         catch ( LdapOperationNotSupportedException lonse )
         {
             // expected
         }
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -655,27 +654,27 @@
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
         
-        Assert.assertTrue( schemaManager.load( "system" ) );
+        assertTrue( schemaManager.load( "system" ) );
         
         // Try to load a disabled schema when the registries does
         // ot allow disabled schema to be loaded
-        Assert.assertFalse( schemaManager.load( "core", "nis", "cosine", "InetOrgPerson" ) );
+        assertFalse( schemaManager.load( "core", "nis", "cosine", "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" ) );
+        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" ) );
     }
 
 
@@ -698,24 +697,24 @@
         Schema cosine = loader.getSchema( "cosine" );
         Schema inetOrgPerson = loader.getSchema( "InetOrgPerson" );
 
-        Assert.assertTrue( schemaManager.load( system, core, empty, cosine, inetOrgPerson ) );
+        assertTrue( schemaManager.load( system, core, empty, cosine, 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" ) );
-        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "empty" ) );
+        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" ) );
     }
     
     
@@ -730,20 +729,20 @@
 
         Schema dummy = new DefaultSchema( "dummy" );
 
-        Assert.assertTrue( schemaManager.load( dummy ) );
+        assertTrue( schemaManager.load( dummy ) );
 
-        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() );
+        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.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
+        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
     }
     
     
@@ -759,19 +758,19 @@
         Schema dummy = new DefaultSchema( "dummy" );
         dummy.addDependencies( "bad" );
 
-        Assert.assertFalse( schemaManager.load( dummy ) );
+        assertFalse( schemaManager.load( dummy ) );
 
-        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() );
+        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.assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
-        Assert.assertNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
+        assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
+        assertNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
     }
 }

Modified: directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/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?rev=894003&r1=894002&r2=894003&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/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:39:20 2009
@@ -31,10 +31,9 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-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;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schema.registries.DefaultSchema;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -110,18 +109,18 @@
 
         schemaManager.loadWithDeps( "system" );
 
-        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() );
+        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.assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
-        Assert.assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
+        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
     }
 
 
@@ -136,19 +135,19 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -163,20 +162,20 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -191,19 +190,19 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -218,20 +217,20 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -247,22 +246,22 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -277,20 +276,20 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -306,21 +305,21 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -335,20 +334,20 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -363,20 +362,20 @@
 
         schemaManager.loadWithDeps( "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" ) );
+        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" ) );
     }
 
 
@@ -392,20 +391,20 @@
 
         schemaManager.loadWithDeps( "nis" );
 
-        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" ) );
+        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" ) );
     }
 
 
@@ -421,24 +420,24 @@
         try
         {
             schemaManager.loadWithDeps( "bad" );
-            Assert.fail();
+            fail();
         }
         catch ( LdapOperationNotSupportedException lonse )
         {
             // expected
         }
 
-        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() );
+        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.assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
+        assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
     }
 
 
@@ -453,21 +452,21 @@
 
         schemaManager.loadWithDeps( "core", "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" ) );
+        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" ) );
     }
 
 
@@ -483,7 +482,7 @@
         try
         {
             schemaManager.loadWithDeps( "core", "bad", "InetOrgPerson" );
-            Assert.fail();
+            fail();
         }
         catch ( LdapOperationNotSupportedException lonse )
         {
@@ -491,21 +490,21 @@
         }
 
         // No SchemaObject should be loaded as we had an error
-        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" ) );
+        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" ) );
     }
 
 
@@ -520,21 +519,21 @@
 
         schemaManager.loadWithDeps( "core", "nis", "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" ) );
+        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" ) );
     }
 
 
@@ -553,22 +552,22 @@
         Schema cosine = loader.getSchema( "cosine" );
         Schema inetOrgPerson = loader.getSchema( "InetOrgPerson" );
 
-        Assert.assertTrue( schemaManager.load( system, core, empty, cosine, inetOrgPerson ) );
+        assertTrue( schemaManager.load( system, core, empty, cosine, 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" ) );
+        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" ) );
     }
 }



Mime
View raw message