directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r807561 - /directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
Date Tue, 25 Aug 2009 11:17:25 GMT
Author: elecharny
Date: Tue Aug 25 11:17:24 2009
New Revision: 807561

URL: http://svn.apache.org/viewvc?rev=807561&view=rev
Log:
Removed e reference to the MatchingRuleDescription class

Modified:
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=807561&r1=807560&r2=807561&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
Tue Aug 25 11:17:24 2009
@@ -34,6 +34,7 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer;
 import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
@@ -886,25 +887,26 @@
         
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "matchingRules" );
-        MatchingRuleDescription matchingRuleDescription = null; 
+        MatchingRule matchingRule = null; 
+        
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {
             String desc = ( String ) attrTypes.get( ii );
             if ( desc.indexOf( oid ) != -1 )
             {
-                matchingRuleDescription = matchingRuleDescriptionSchemaParser.parseMatchingRuleDescription(
desc );
+                matchingRule = matchingRuleDescriptionSchemaParser.parseMatchingRuleDescription(
desc );
                 break;
             }
         }
      
         if ( isPresent )
         {
-            assertNotNull( matchingRuleDescription );
-            assertEquals( oid, matchingRuleDescription.getOid() );
+            assertNotNull( matchingRule );
+            assertEquals( oid, matchingRule.getOid() );
         }
         else
         {
-            assertNull( matchingRuleDescription );
+            assertNull( matchingRule );
         }
 
         // -------------------------------------------------------------------



Mime
View raw message