Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java Thu Dec 17 12:08:31 2009
@@ -147,7 +147,7 @@
     {
         SchemaManager schemaManager = loadSchema( "Core" );
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -161,7 +161,7 @@
         assertFalse( errors.isEmpty() );
 
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -174,7 +174,7 @@
         // First inject such an AT
         SchemaManager schemaManager = loadSchema( "Core" );
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "generationQualifier" );
         attributeType.setOid( "2.5.4.44" );
@@ -184,7 +184,7 @@
 
         assertFalse( isATPresent( schemaManager, "generationQualifier" ) );
         assertEquals( atrSize - 1, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize - 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize - 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -197,7 +197,7 @@
         SchemaManager schemaManager = loadSchema( "Core" );
 
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // Try to delete an AT which is referenced by at least one OC
         // (modifiersName has one descendant : schemaModifiersName)
@@ -208,7 +208,7 @@
 
         assertTrue( isATPresent( schemaManager, "cn" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -221,7 +221,7 @@
         SchemaManager schemaManager = loadSchema( "Core" );
 
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // Try to delete an AT which is contained by a disabled schema
         AttributeType attributeType = new AttributeType( "gecos" );
@@ -232,7 +232,7 @@
 
         assertFalse( isATPresent( schemaManager, "gecos" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -245,7 +245,7 @@
         SchemaManager schemaManager = loadSchema( "Apache" );
 
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // Try to delete an AT which has descendant 
         // (modifiersName has one descendant : schemaModifiersName)
@@ -256,7 +256,7 @@
 
         assertTrue( isATPresent( schemaManager, "modifiersName" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -269,13 +269,13 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int ctrSize = schemaManager.getComparatorRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         LdapComparator<?> lc = new BooleanComparator( "0.1.1" );
         assertTrue( schemaManager.add( lc ) );
 
         assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         lc = schemaManager.lookupComparatorRegistry( "0.1.1" );
         assertNotNull( lc );
@@ -292,7 +292,7 @@
         }
 
         assertEquals( ctrSize, schemaManager.getComparatorRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -301,7 +301,7 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int ctrSize = schemaManager.getComparatorRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         LdapComparator<?> lc = new BooleanComparator( "0.0" );
         assertFalse( schemaManager.delete( lc ) );
@@ -310,7 +310,7 @@
         assertFalse( errors.isEmpty() );
 
         assertEquals( ctrSize, schemaManager.getComparatorRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -319,7 +319,7 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int ctrSize = schemaManager.getComparatorRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         LdapComparator<?> lc = schemaManager.lookupComparatorRegistry( "2.5.13.0" );
         
@@ -332,7 +332,7 @@
 
         assertNotNull( schemaManager.lookupComparatorRegistry( "2.5.13.0" ) );
         assertEquals( ctrSize, schemaManager.getComparatorRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
     
 
@@ -355,13 +355,13 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int mrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
         
         MatchingRule mr = new MatchingRule( "2.5.13.33" );
         assertTrue( schemaManager.delete( mr ) );
         
         assertEquals( mrSize - 1, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize - 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize - 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
     
@@ -370,13 +370,13 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int mrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
         
         MatchingRule mr = new MatchingRule( "0.1.1" );
         assertFalse( schemaManager.delete( mr ) );
         
         assertEquals( mrSize, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
     
@@ -385,14 +385,14 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int mrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // AT with OID 2.5.18.4 has syntax 1.3.6.1.4.1.1466.115.121.1.12 which is used by MR 2.5.13.1
         MatchingRule mr = new MatchingRule( "2.5.13.1" );
         assertFalse( schemaManager.delete( mr ) );
         
         assertEquals( mrSize, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
     //=========================================================================
@@ -414,14 +414,14 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int nrSize = schemaManager.getNormalizerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         Normalizer nr = new BooleanNormalizer();
         nr.setOid( "0.1.1" );
         assertTrue( schemaManager.add( nr ) );
 
         assertEquals( nrSize + 1, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         // FIXME this lookup is failing ! but it shouldn't be
         nr = schemaManager.lookupNormalizerRegistry( "0.1.1" );
@@ -439,7 +439,7 @@
         }
 
         assertEquals( nrSize, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
     
     
@@ -448,7 +448,7 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int nrSize = schemaManager.getNormalizerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         Normalizer nr = new BooleanNormalizer();
         nr.setOid( "0.0" ); 
@@ -458,7 +458,7 @@
         assertFalse( errors.isEmpty() );
 
         assertEquals( nrSize, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
     
@@ -467,7 +467,7 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int nrSize = schemaManager.getNormalizerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         Normalizer nr = schemaManager.lookupNormalizerRegistry( "2.5.13.0" );
         // shouldn't be deleted cause there is a MR associated with it
@@ -479,7 +479,7 @@
 
         assertNotNull( schemaManager.lookupNormalizerRegistry( "2.5.13.0" ) );
         assertEquals( nrSize, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
     //=========================================================================
@@ -491,14 +491,14 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int ocSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
         
         ObjectClass oc = new ObjectClass( "2.5.17.2" );
         
         assertTrue( schemaManager.delete( oc ) );
         
         assertEquals( ocSize - 1, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize - 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize - 1, schemaManager.getGlobalOidRegistry().size() );
         
         try
         {
@@ -517,14 +517,14 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int ocSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
         
         ObjectClass oc = new ObjectClass( "0.1.1" );
         
         assertFalse( schemaManager.delete( oc ) );
         
         assertEquals( ocSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
     
 
@@ -533,7 +533,7 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int ocSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
         
         ObjectClass oc = new ObjectClass( "2.5.6.0" );
         
@@ -545,7 +545,7 @@
         assertTrue( errors.get( 0 ) instanceof LdapSchemaViolationException );
 
         assertEquals( ocSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
     
 
@@ -558,21 +558,21 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // delete a existing syntax not used by AT and MR
         LdapSyntax syntax = schemaManager.lookupLdapSyntaxRegistry( "1.3.6.1.4.1.1466.115.121.1.10" );
         assertTrue( schemaManager.delete( syntax ) );
         
         assertEquals( sSize - 1, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( goidSize -1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize -1, schemaManager.getGlobalOidRegistry().size() );
 
         // add a syntax and then delete (should behave same as above )
         syntax = new LdapSyntax( "0.1.1" );
         assertTrue( schemaManager.add( syntax ) );
 
         assertEquals( sSize, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
         
         syntax = schemaManager.lookupLdapSyntaxRegistry( "0.1.1" );
         assertTrue( schemaManager.delete( syntax ) );
@@ -588,7 +588,7 @@
         }
         
         assertEquals( sSize - 1, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( goidSize - 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize - 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
     
@@ -597,14 +597,14 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         LdapSyntax syntax = new LdapSyntax( "0.1.1" );
         
         assertFalse( schemaManager.delete( syntax ) );
         
         assertEquals( sSize, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
     
@@ -614,7 +614,7 @@
 
         SchemaManager schemaManager = loadSchema( "system" );
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         //1.3.6.1.4.1.1466.115.121.1.26 is used by MR 1.3.6.1.4.1.1466.109.114.2
         LdapSyntax syntax = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.26" );
@@ -626,7 +626,7 @@
         assertFalse( schemaManager.delete( syntax ) );
         
         assertEquals( sSize, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
     
@@ -637,14 +637,14 @@
 
         SchemaManager schemaManager = loadSchema( "system" );
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         LdapSyntax syntax = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.15" );
         
         assertFalse( schemaManager.delete( syntax ) );
         
         assertEquals( sSize, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
     //=========================================================================
@@ -656,14 +656,14 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int scrSize = schemaManager.getSyntaxCheckerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         SyntaxChecker sc = new BooleanSyntaxChecker();
         sc.setOid( "0.1.1" );
         assertTrue( schemaManager.add( sc ) );
 
         assertEquals( scrSize + 1, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         sc = schemaManager.lookupSyntaxCheckerRegistry( "0.1.1" );
         assertNotNull( sc );
@@ -680,7 +680,7 @@
         }
 
         assertEquals( scrSize, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
     
     
@@ -689,7 +689,7 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int scrSize = schemaManager.getSyntaxCheckerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         SyntaxChecker sc = new BooleanSyntaxChecker();
         sc.setOid( "0.0" ); 
@@ -699,7 +699,7 @@
         assertFalse( errors.isEmpty() );
 
         assertEquals( scrSize, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
     
@@ -708,7 +708,7 @@
     {
         SchemaManager schemaManager = loadSchema( "system" );
         int scrSize = schemaManager.getSyntaxCheckerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         SyntaxChecker sc = schemaManager.lookupSyntaxCheckerRegistry( "1.3.6.1.4.1.1466.115.121.1.1" );
         
@@ -720,6 +720,6 @@
         assertTrue( errors.get( 0 ) instanceof LdapSchemaViolationException );
 
         assertEquals( scrSize, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 }

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerEnableDisableLoadTest.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerEnableDisableLoadTest.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerEnableDisableLoadTest.java Thu Dec 17 12:08:31 2009
@@ -153,7 +153,7 @@
         assertEquals( 88, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 468, schemaManager.getOidRegistry().size() );
+        assertEquals( 468, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 10, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -198,7 +198,7 @@
         assertEquals( 101, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 511, schemaManager.getOidRegistry().size() );
+        assertEquals( 511, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 11, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -238,7 +238,7 @@
         assertEquals( 88, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 468, schemaManager.getOidRegistry().size() );
+        assertEquals( 468, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 10, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadTest.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadTest.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadTest.java Thu Dec 17 12:08:31 2009
@@ -224,7 +224,7 @@
         assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 141, schemaManager.getOidRegistry().size() );
+        assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -254,7 +254,7 @@
         assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 222, schemaManager.getOidRegistry().size() );
+        assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -283,7 +283,7 @@
         assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 307, schemaManager.getOidRegistry().size() );
+        assertEquals( 307, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -312,7 +312,7 @@
         assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 195, schemaManager.getOidRegistry().size() );
+        assertEquals( 195, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -341,7 +341,7 @@
         assertEquals( 41, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 234, schemaManager.getOidRegistry().size() );
+        assertEquals( 234, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -373,7 +373,7 @@
         assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 222, schemaManager.getOidRegistry().size() );
+        assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -403,7 +403,7 @@
         assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 276, schemaManager.getOidRegistry().size() );
+        assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -435,7 +435,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -466,7 +466,7 @@
         assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 235, schemaManager.getOidRegistry().size() );
+        assertEquals( 235, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -496,7 +496,7 @@
         assertEquals( 39, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 240, schemaManager.getOidRegistry().size() );
+        assertEquals( 240, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -528,7 +528,7 @@
         assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 276, schemaManager.getOidRegistry().size() );
+        assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -558,7 +558,7 @@
         assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 141, schemaManager.getOidRegistry().size() );
+        assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -586,7 +586,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -616,7 +616,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -646,7 +646,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -685,7 +685,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadWithDepsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadWithDepsTest.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadWithDepsTest.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadWithDepsTest.java Thu Dec 17 12:08:31 2009
@@ -115,7 +115,7 @@
         assertEquals( 9, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 141, schemaManager.getOidRegistry().size() );
+        assertEquals( 141, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -141,7 +141,7 @@
         assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 222, schemaManager.getOidRegistry().size() );
+        assertEquals( 222, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -168,7 +168,7 @@
         assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 307, schemaManager.getOidRegistry().size() );
+        assertEquals( 307, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -196,7 +196,7 @@
         assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 195, schemaManager.getOidRegistry().size() );
+        assertEquals( 195, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -223,7 +223,7 @@
         assertEquals( 41, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 234, schemaManager.getOidRegistry().size() );
+        assertEquals( 234, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -252,7 +252,7 @@
         assertEquals( 66, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 361, schemaManager.getOidRegistry().size() );
+        assertEquals( 361, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -282,7 +282,7 @@
         assertEquals( 49, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 276, schemaManager.getOidRegistry().size() );
+        assertEquals( 276, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -311,7 +311,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -340,7 +340,7 @@
         assertEquals( 36, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 235, schemaManager.getOidRegistry().size() );
+        assertEquals( 235, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -368,7 +368,7 @@
         assertEquals( 39, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 240, schemaManager.getOidRegistry().size() );
+        assertEquals( 240, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -397,7 +397,7 @@
         assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 0, schemaManager.getOidRegistry().size() );
+        assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -425,7 +425,7 @@
         assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 0, schemaManager.getOidRegistry().size() );
+        assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
     }
@@ -450,7 +450,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -479,7 +479,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -508,7 +508,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 4, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -543,7 +543,7 @@
         assertEquals( 50, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 59, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 59, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 286, schemaManager.getOidRegistry().size() );
+        assertEquals( 286, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java Thu Dec 17 12:08:31 2009
@@ -769,11 +769,11 @@
 
 
     /**
-     * Returns a reference to the OidRegistry
+     * Returns a reference to the global OidRegistry
      *
-     * @return The OidRegistry
+     * @return The the global OidRegistry
      */
-    OidRegistry getOidRegistry();
+    OidRegistry getGlobalOidRegistry();
 
 
     /**