directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062650 - in /directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema: MetaComparatorHandlerIT.java MetaNormalizerHandlerIT.java MetaSyntaxCheckerHandlerIT.java SubschemaSubentryIT.java
Date Mon, 24 Jan 2011 05:21:22 GMT
Author: akarasulu
Date: Mon Jan 24 05:21:22 2011
New Revision: 1062650

URL: http://svn.apache.org/viewvc?rev=1062650&view=rev
Log:
fixing failing tests due to lookups of schema entities with old package names

Modified:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1062650&r1=1062649&r2=1062650&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
Mon Jan 24 05:21:22 2011
@@ -194,7 +194,7 @@ public class MetaComparatorHandlerIT ext
 
         Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass:
metaTop",
             "objectClass: metaComparator",
-            "m-fqcn: org.apache.directory.shared.ldap.schema.comparators.DummyComparator",
"m-bytecode", out
+            "m-fqcn: org.apache.directory.shared.ldap.model.schema.comparators.DummyComparator",
"m-bytecode", out
                 .toByteArray(), "m-oid", OID, "m-description: A test comparator" );
 
         Dn dn = getComparatorContainer( "apachemeta" );
@@ -211,7 +211,7 @@ public class MetaComparatorHandlerIT ext
         assertTrue( schemaManager.getComparatorRegistry().contains( OID ) );
         assertEquals( schemaManager.getComparatorRegistry().getSchemaName( OID ), "apachemeta"
);
         Class<?> clazz = schemaManager.getComparatorRegistry().lookup( OID ).getClass();
-        assertEquals( clazz.getName(), "org.apache.directory.shared.ldap.schema.comparators.DummyComparator"
);
+        assertEquals( clazz.getName(), "org.apache.directory.shared.ldap.model.schema.comparators.DummyComparator"
);
         assertTrue( isOnDisk( dn ) );
     }
 
@@ -229,7 +229,7 @@ public class MetaComparatorHandlerIT ext
 
         Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass:
metaTop",
             "objectClass: metaComparator",
-            "m-fqcn: org.apache.directory.shared.ldap.schema.comparators.DummyComparator",
"m-bytecode", out
+            "m-fqcn: org.apache.directory.shared.ldap.model.schema.comparators.DummyComparator",
"m-bytecode", out
                 .toByteArray(), "m-oid", OID, "m-description: A test comparator" );
 
         // nis is by default inactive

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=1062650&r1=1062649&r2=1062650&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
Mon Jan 24 05:21:22 2011
@@ -174,7 +174,7 @@ public class MetaNormalizerHandlerIT ext
             "objectClass: top",
             "objectClass: metaTop",
             "objectClass: metaNormalizer",
-            "m-fqcn", "org.apache.directory.shared.ldap.schema.normalizers.DummyNormalizer",
+            "m-fqcn", "org.apache.directory.shared.ldap.model.schema.normalizers.DummyNormalizer",
             "m-bytecode", out.toByteArray(),
             "m-oid", OID,
             "m-description: A test normalizer" );
@@ -186,7 +186,7 @@ public class MetaNormalizerHandlerIT ext
         assertTrue( schemaManager.getNormalizerRegistry().contains( OID ) );
         assertEquals( schemaManager.getNormalizerRegistry().getSchemaName( OID ), "apachemeta"
);
         Class<?> clazz = schemaManager.getNormalizerRegistry().lookup( OID ).getClass();
-        assertEquals( clazz.getName(), "org.apache.directory.shared.ldap.schema.normalizers.DummyNormalizer"
);
+        assertEquals( clazz.getName(), "org.apache.directory.shared.ldap.model.schema.normalizers.DummyNormalizer"
);
         assertTrue( isOnDisk( dn ) );
     }
 
@@ -206,7 +206,7 @@ public class MetaNormalizerHandlerIT ext
             "objectClass: top",
             "objectClass: metaTop",
             "objectClass: metaNormalizer",
-            "m-fqcn", "org.apache.directory.shared.ldap.schema.normalizers.DummyNormalizer",
+            "m-fqcn", "org.apache.directory.shared.ldap.model.schema.normalizers.DummyNormalizer",
             "m-bytecode", out.toByteArray(),
             "m-oid", OID,
             "m-description: A test normalizer" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1062650&r1=1062649&r2=1062650&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
Mon Jan 24 05:21:22 2011
@@ -158,7 +158,7 @@ public class MetaSyntaxCheckerHandlerIT 
 
         Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass:
metaTop",
             "objectClass: metaSyntaxChecker", "m-fqcn",
-            "org.apache.directory.shared.ldap.schema.syntaxCheckers.DummySyntaxChecker",
"m-bytecode", out
+            "org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker",
"m-bytecode", out
                 .toByteArray(), "m-oid", OID, "m-description: A test syntaxChecker" );
 
         Dn dn = getSyntaxCheckerContainer( "apachemeta" );
@@ -168,7 +168,7 @@ public class MetaSyntaxCheckerHandlerIT 
         assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         assertEquals( schemaManager.getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta"
);
         Class<?> clazz = schemaManager.getSyntaxCheckerRegistry().lookup( OID ).getClass();
-        assertEquals( clazz.getName(), "org.apache.directory.shared.ldap.schema.syntaxCheckers.DummySyntaxChecker"
);
+        assertEquals( clazz.getName(), "org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker"
);
         assertTrue( isOnDisk( dn ) );
     }
 
@@ -186,7 +186,7 @@ public class MetaSyntaxCheckerHandlerIT 
 
         Attributes attrs = LdifUtils.createAttributes("objectClass: top", "objectClass: metaTop",
                 "objectClass: metaSyntaxChecker", "m-fqcn",
-                "org.apache.directory.shared.ldap.schema.syntaxCheckers.DummySyntaxChecker",
"m-bytecode", out
+                "org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker",
"m-bytecode", out
                 .toByteArray(), "m-oid", OID, "m-description: A test syntaxChecker");
 
         Dn dn = getSyntaxCheckerContainer( "nis" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1062650&r1=1062649&r2=1062650&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
Mon Jan 24 05:21:22 2011
@@ -379,7 +379,7 @@ public class SubschemaSubentryIT extends
 
         descriptions.clear();
         descriptions
-            .add( "( 1.3.6.1.4.1.18060.0.4.1.0.10002 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.schema.syntaxCheckers.DummySyntaxChecker
BYTECODE "
+            .add( "( 1.3.6.1.4.1.18060.0.4.1.0.10002 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker
BYTECODE "
                 + getByteCode( "DummySyntaxChecker.bytecode" ) + " X-SCHEMA 'nis' )" );
 
         // 4th change
@@ -399,7 +399,7 @@ public class SubschemaSubentryIT extends
         // -------------------------------------------------------------------
         descriptions.clear();
         descriptions
-            .add( "( 1.3.6.1.4.1.18060.0.4.1.0.10002 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.schema.syntaxCheckers.DummySyntaxChecker
BYTECODE "
+            .add( "( 1.3.6.1.4.1.18060.0.4.1.0.10002 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker
BYTECODE "
                 + getByteCode( "DummySyntaxChecker.bytecode" ) + " )" );
 
         // 6th change
@@ -543,7 +543,7 @@ public class SubschemaSubentryIT extends
 
         descriptions.clear();
         descriptions
-            .add( "( 1.3.6.1.4.1.18060.0.4.0.1.100000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.schema.comparators.DummyComparator
BYTECODE "
+            .add( "( 1.3.6.1.4.1.18060.0.4.0.1.100000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.model.schema.comparators.DummyComparator
BYTECODE "
                 + getByteCode( "DummyComparator.bytecode" ) + " X-SCHEMA 'nis' )" );
 
         modify( DirContext.ADD_ATTRIBUTE, descriptions, "comparators" );
@@ -562,7 +562,7 @@ public class SubschemaSubentryIT extends
 
         descriptions.clear();
         descriptions
-            .add( "( 1.3.6.1.4.1.18060.0.4.0.1.100000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.schema.comparators.DummyComparator
BYTECODE "
+            .add( "( 1.3.6.1.4.1.18060.0.4.0.1.100000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.model.schema.comparators.DummyComparator
BYTECODE "
                 + getByteCode( "DummyComparator.bytecode" ) + " )" );
 
         modify( DirContext.ADD_ATTRIBUTE, descriptions, "comparators" );
@@ -698,7 +698,7 @@ public class SubschemaSubentryIT extends
 
         descriptions.clear();
         descriptions
-            .add( "( 1.3.6.1.4.1.18060.0.4.0.1.100000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.schema.normalizers.DummyNormalizer
BYTECODE "
+            .add( "( 1.3.6.1.4.1.18060.0.4.0.1.100000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.model.schema.normalizers.DummyNormalizer
BYTECODE "
                 + getByteCode( "DummyNormalizer.bytecode" ) + " X-SCHEMA 'nis' )" );
 
         modify( DirContext.ADD_ATTRIBUTE, descriptions, "normalizers" );
@@ -717,7 +717,7 @@ public class SubschemaSubentryIT extends
 
         descriptions.clear();
         descriptions
-            .add( "( 1.3.6.1.4.1.18060.0.4.0.1.100000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.schema.normalizers.DummyNormalizer
BYTECODE "
+            .add( "( 1.3.6.1.4.1.18060.0.4.0.1.100000 DESC 'bogus desc' FQCN org.apache.directory.shared.ldap.model.schema.normalizers.DummyNormalizer
BYTECODE "
                 + getByteCode( "DummyNormalizer.bytecode" ) + " )" );
 
         modify( DirContext.ADD_ATTRIBUTE, descriptions, "normalizers" );



Mime
View raw message