You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/03/05 14:33:45 UTC
svn commit: r1664343 - in
/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema:
parsers/ syntaxes/parser/
Author: elecharny
Date: Thu Mar 5 13:33:44 2015
New Revision: 1664343
URL: http://svn.apache.org/r1664343
Log:
Fixed the SchemaObject extension key, which should always be considered as case insensitive
Modified:
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitContentRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitStructureRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -30,21 +30,19 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.ldap.model.schema.MutableAttributeType;
import org.apache.directory.api.ldap.model.schema.ObjectClass;
import org.apache.directory.api.ldap.model.schema.ObjectClassTypeEnum;
-import org.apache.directory.api.ldap.model.schema.parsers.ConsoleParserMonitor;
-import org.apache.directory.api.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OpenLdapObjectIdentifierMacro;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the OpenLDAP schema parser.
@@ -267,12 +265,12 @@ public class OpenLdapSchemaParserTest
assertNotNull( extensions );
- List<String> ext1 = extensions.get( "X-extension" );
+ List<String> ext1 = objectClass.getExtension( "X-extension" );
assertNotNull( ext1 );
assertEquals( 1, ext1.size() );
assertTrue( ext1.contains( "test" ) );
- List<String> ext2 = extensions.get( "X-otherExtension" );
+ List<String> ext2 = objectClass.getExtension( "X-otherExtension" );
assertNotNull( ext2 );
assertEquals( 2, ext2.size() );
assertTrue( ext2.contains( "test1" ) );
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -29,9 +29,6 @@ import static org.junit.Assert.fail;
import java.text.ParseException;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.ldap.model.schema.UsageEnum;
import org.apache.directory.api.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
@@ -41,6 +38,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the AttributeTypeDescriptionSchemaParser class.
@@ -691,14 +691,14 @@ public class AttributeTypeDescriptionSch
assertEquals( UsageEnum.DSA_OPERATION, attributeType.getUsage() );
assertEquals( 2, attributeType.getExtensions().size() );
- assertNotNull( attributeType.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, attributeType.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", attributeType.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", attributeType.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( attributeType.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, attributeType.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", attributeType.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", attributeType.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( attributeType.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, attributeType.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", attributeType.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", attributeType.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( attributeType.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, attributeType.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", attributeType.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", attributeType.getExtension( "X-TEST-b" ).get( 1 ) );
}
@@ -970,7 +970,7 @@ public class AttributeTypeDescriptionSch
assertEquals( "bogus description", desc.getDescription() );
assertEquals( "name", desc.getSuperiorOid() );
assertEquals( true, desc.isSingleValued() );
- assertEquals( "blah", desc.getExtensions().get( "X-SCHEMA" ).get( 0 ) );
+ assertEquals( "blah", desc.getExtension( "X-SCHEMA" ).get( 0 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitContentRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitContentRuleDescriptionSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitContentRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitContentRuleDescriptionSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -27,9 +27,6 @@ import static org.junit.Assert.fail;
import java.text.ParseException;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.schema.DitContentRule;
import org.apache.directory.api.ldap.model.schema.parsers.DitContentRuleDescriptionSchemaParser;
import org.junit.After;
@@ -37,6 +34,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the DitContentRuleDescriptionSchemaParser class.
@@ -464,14 +464,14 @@ public class DitContentRuleDescriptionSc
.getNotAttributeTypeOids()
.get( 1 ) );
assertEquals( 2, ditContentRule.getExtensions().size() );
- assertNotNull( ditContentRule.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, ditContentRule.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", ditContentRule.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", ditContentRule.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( ditContentRule.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, ditContentRule.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", ditContentRule.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", ditContentRule.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( ditContentRule.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, ditContentRule.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", ditContentRule.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", ditContentRule.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( ditContentRule.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, ditContentRule.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", ditContentRule.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", ditContentRule.getExtension( "X-TEST-b" ).get( 1 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitStructureRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitStructureRuleDescriptionSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitStructureRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/DitStructureRuleDescriptionSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -27,9 +27,6 @@ import static org.junit.Assert.fail;
import java.text.ParseException;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.schema.DitStructureRule;
import org.apache.directory.api.ldap.model.schema.parsers.DitStructureRuleDescriptionSchemaParser;
import org.junit.After;
@@ -37,6 +34,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the DitStructureRuleDescriptionSchemaParser class.
@@ -379,14 +379,14 @@ public class DitStructureRuleDescription
assertEquals( Integer.valueOf( 1234567890 ), ditStructureRule.getSuperRules().get( 1 ) );
assertEquals( Integer.valueOf( 5 ), ditStructureRule.getSuperRules().get( 2 ) );
assertEquals( 2, ditStructureRule.getExtensions().size() );
- assertNotNull( ditStructureRule.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, ditStructureRule.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", ditStructureRule.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", ditStructureRule.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( ditStructureRule.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, ditStructureRule.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", ditStructureRule.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", ditStructureRule.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( ditStructureRule.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, ditStructureRule.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", ditStructureRule.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", ditStructureRule.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( ditStructureRule.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, ditStructureRule.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", ditStructureRule.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", ditStructureRule.getExtension( "X-TEST-b" ).get( 1 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -25,9 +25,6 @@ import static org.junit.Assert.assertNot
import java.text.ParseException;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.schema.LdapSyntax;
import org.apache.directory.api.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
import org.junit.After;
@@ -35,6 +32,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the LdapSyntaxDescriptionSchemaParser class.
@@ -128,14 +128,14 @@ public class LdapSyntaxDescriptionSchema
assertEquals( "1.2.3.4.5.6.7.8.9.0", ldapSyntax.getOid() );
assertEquals( "Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", ldapSyntax.getDescription() );
assertEquals( 2, ldapSyntax.getExtensions().size() );
- assertNotNull( ldapSyntax.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, ldapSyntax.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", ldapSyntax.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", ldapSyntax.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( ldapSyntax.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, ldapSyntax.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", ldapSyntax.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", ldapSyntax.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( ldapSyntax.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, ldapSyntax.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", ldapSyntax.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", ldapSyntax.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( ldapSyntax.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, ldapSyntax.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", ldapSyntax.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", ldapSyntax.getExtension( "X-TEST-b" ).get( 1 ) );
assertEquals( value, ldapSyntax.getSpecification() );
}
@@ -167,9 +167,9 @@ public class LdapSyntaxDescriptionSchema
assertEquals( "1.3.6.1.4.1.1466.115.121.1.5", ldapSyntax.getOid() );
assertEquals( "Binary", ldapSyntax.getDescription() );
assertEquals( 1, ldapSyntax.getExtensions().size() );
- assertNotNull( ldapSyntax.getExtensions().get( "X-NOT-HUMAN-READABLE" ) );
- assertEquals( 1, ldapSyntax.getExtensions().get( "X-NOT-HUMAN-READABLE" ).size() );
- assertEquals( "TRUE", ldapSyntax.getExtensions().get( "X-NOT-HUMAN-READABLE" ).get( 0 ) );
+ assertNotNull( ldapSyntax.getExtension( "X-NOT-HUMAN-READABLE" ) );
+ assertEquals( 1, ldapSyntax.getExtension( "X-NOT-HUMAN-READABLE" ).size() );
+ assertEquals( "TRUE", ldapSyntax.getExtension( "X-NOT-HUMAN-READABLE" ).get( 0 ) );
assertEquals( value, ldapSyntax.getSpecification() );
}
@@ -184,7 +184,7 @@ public class LdapSyntaxDescriptionSchema
LdapSyntax ldapSyntax = parser.parseLdapSyntaxDescription( substrate );
assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", ldapSyntax.getOid() );
assertEquals( "bogus description", ldapSyntax.getDescription() );
- assertNotNull( ldapSyntax.getExtensions().get( "X-NOT-HUMAN-READABLE" ) );
+ assertNotNull( ldapSyntax.getExtension( "X-NOT-HUMAN-READABLE" ) );
assertEquals( substrate, ldapSyntax.getSpecification() );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -31,9 +31,6 @@ import java.text.ParseException;
import javax.naming.NamingException;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.schema.MatchingRule;
import org.apache.directory.api.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
import org.junit.After;
@@ -41,6 +38,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the MatchingRuleDescriptionSchemaParser class.
@@ -189,14 +189,14 @@ public class MatchingRuleDescriptionSche
assertTrue( matchingRule.isObsolete() );
assertEquals( "0.1.2.3.4.5.6.7.8.9", matchingRule.getSyntaxOid() );
assertEquals( 2, matchingRule.getExtensions().size() );
- assertNotNull( matchingRule.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, matchingRule.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", matchingRule.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", matchingRule.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( matchingRule.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, matchingRule.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", matchingRule.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", matchingRule.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( matchingRule.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, matchingRule.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", matchingRule.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", matchingRule.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( matchingRule.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, matchingRule.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", matchingRule.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", matchingRule.getExtension( "X-TEST-b" ).get( 1 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -29,9 +29,6 @@ import static org.junit.Assert.fail;
import java.text.ParseException;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.schema.MatchingRuleUse;
import org.apache.directory.api.ldap.model.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
import org.junit.After;
@@ -39,6 +36,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the MatchingRuleUseDescriptionSchemaParser class.
@@ -278,14 +278,14 @@ public class MatchingRuleUseDescriptionS
assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", matchingRuleUse
.getApplicableAttributeOids().get( 1 ) );
assertEquals( 2, matchingRuleUse.getExtensions().size() );
- assertNotNull( matchingRuleUse.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, matchingRuleUse.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", matchingRuleUse.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", matchingRuleUse.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( matchingRuleUse.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, matchingRuleUse.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", matchingRuleUse.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", matchingRuleUse.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( matchingRuleUse.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, matchingRuleUse.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", matchingRuleUse.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", matchingRuleUse.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( matchingRuleUse.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, matchingRuleUse.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", matchingRuleUse.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", matchingRuleUse.getExtension( "X-TEST-b" ).get( 1 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -27,9 +27,6 @@ import static org.junit.Assert.fail;
import java.text.ParseException;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.schema.NameForm;
import org.apache.directory.api.ldap.model.schema.parsers.NameFormDescriptionSchemaParser;
@@ -38,6 +35,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the NameFormDescriptionSchemaParser class.
@@ -399,14 +399,14 @@ public class NameFormDescriptionSchemaPa
assertEquals( "defghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789abc", nf.getMayAttributeTypeOids()
.get( 1 ) );
assertEquals( 2, nf.getExtensions().size() );
- assertNotNull( nf.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, nf.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", nf.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", nf.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( nf.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, nf.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", nf.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", nf.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( nf.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, nf.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", nf.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", nf.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( nf.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, nf.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", nf.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", nf.getExtension( "X-TEST-b" ).get( 1 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java Thu Mar 5 13:33:44 2015
@@ -30,9 +30,6 @@ import java.text.ParseException;
import javax.naming.NamingException;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.schema.ObjectClass;
import org.apache.directory.api.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.api.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser;
@@ -41,6 +38,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the ObjectClassDescriptionSchemaParser class.
@@ -483,14 +483,14 @@ public class ObjectClassDescriptionSchem
.getMayAttributeTypeOids()
.get( 1 ) );
assertEquals( 2, objectClass.getExtensions().size() );
- assertNotNull( objectClass.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, objectClass.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", objectClass.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", objectClass.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( objectClass.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, objectClass.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", objectClass.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", objectClass.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( objectClass.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, objectClass.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", objectClass.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", objectClass.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( objectClass.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, objectClass.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", objectClass.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", objectClass.getExtension( "X-TEST-b" ).get( 1 ) );
}
@@ -628,9 +628,9 @@ public class ObjectClassDescriptionSchem
assertEquals( 0, objectClass.getMayAttributeTypeOids().size() );
assertEquals( 1, objectClass.getExtensions().size() );
- assertNotNull( objectClass.getExtensions().get( "X-ORIGIN" ) );
- assertEquals( 1, objectClass.getExtensions().get( "X-ORIGIN" ).size() );
- assertEquals( "RFC 2256", objectClass.getExtensions().get( "X-ORIGIN" ).get( 0 ) );
+ assertNotNull( objectClass.getExtension( "X-ORIGIN" ) );
+ assertEquals( 1, objectClass.getExtension( "X-ORIGIN" ).size() );
+ assertEquals( "RFC 2256", objectClass.getExtension( "X-ORIGIN" ).get( 0 ) );
}
@@ -651,15 +651,15 @@ public class ObjectClassDescriptionSchem
assertEquals( 0, objectClass.getMayAttributeTypeOids().size() );
assertEquals( 3, objectClass.getExtensions().size() );
- assertNotNull( objectClass.getExtensions().get( "X-NDS_NAMING" ) );
- assertEquals( 1, objectClass.getExtensions().get( "X-NDS_NAMING" ).size() );
- assertEquals( "dc", objectClass.getExtensions().get( "X-NDS_NAMING" ).get( 0 ) );
- assertNotNull( objectClass.getExtensions().get( "X-NDS_NOT_CONTAINER" ) );
- assertEquals( 1, objectClass.getExtensions().get( "X-NDS_NOT_CONTAINER" ).size() );
- assertEquals( "1", objectClass.getExtensions().get( "X-NDS_NOT_CONTAINER" ).get( 0 ) );
- assertNotNull( objectClass.getExtensions().get( "X-NDS_NONREMOVABLE" ) );
- assertEquals( 1, objectClass.getExtensions().get( "X-NDS_NONREMOVABLE" ).size() );
- assertEquals( "1", objectClass.getExtensions().get( "X-NDS_NONREMOVABLE" ).get( 0 ) );
+ assertNotNull( objectClass.getExtension( "X-NDS_NAMING" ) );
+ assertEquals( 1, objectClass.getExtension( "X-NDS_NAMING" ).size() );
+ assertEquals( "dc", objectClass.getExtension( "X-NDS_NAMING" ).get( 0 ) );
+ assertNotNull( objectClass.getExtension( "X-NDS_NOT_CONTAINER" ) );
+ assertEquals( 1, objectClass.getExtension( "X-NDS_NOT_CONTAINER" ).size() );
+ assertEquals( "1", objectClass.getExtension( "X-NDS_NOT_CONTAINER" ).get( 0 ) );
+ assertNotNull( objectClass.getExtension( "X-NDS_NONREMOVABLE" ) );
+ assertEquals( 1, objectClass.getExtension( "X-NDS_NONREMOVABLE" ).size() );
+ assertEquals( "1", objectClass.getExtension( "X-NDS_NONREMOVABLE" ).get( 0 ) );
}
@@ -683,29 +683,29 @@ public class ObjectClassDescriptionSchem
assertEquals( "fullName", objectClass.getMayAttributeTypeOids().get( 10 ) );
assertEquals( 5, objectClass.getExtensions().size() );
- assertNotNull( objectClass.getExtensions().get( "X-NDS_NAMING" ) );
- assertEquals( 1, objectClass.getExtensions().get( "X-NDS_NAMING" ).size() );
- assertEquals( "cn", objectClass.getExtensions().get( "X-NDS_NAMING" ).get( 0 ) );
-
- assertNotNull( objectClass.getExtensions().get( "X-NDS_NOT_CONTAINER" ) );
- assertEquals( 1, objectClass.getExtensions().get( "X-NDS_NOT_CONTAINER" ).size() );
- assertEquals( "1", objectClass.getExtensions().get( "X-NDS_NOT_CONTAINER" ).get( 0 ) );
-
- assertNotNull( objectClass.getExtensions().get( "X-NDS_NONREMOVABLE" ) );
- assertEquals( 1, objectClass.getExtensions().get( "X-NDS_NONREMOVABLE" ).size() );
- assertEquals( "1", objectClass.getExtensions().get( "X-NDS_NONREMOVABLE" ).get( 0 ) );
+ assertNotNull( objectClass.getExtension( "X-NDS_NAMING" ) );
+ assertEquals( 1, objectClass.getExtension( "X-NDS_NAMING" ).size() );
+ assertEquals( "cn", objectClass.getExtension( "X-NDS_NAMING" ).get( 0 ) );
+
+ assertNotNull( objectClass.getExtension( "X-NDS_NOT_CONTAINER" ) );
+ assertEquals( 1, objectClass.getExtension( "X-NDS_NOT_CONTAINER" ).size() );
+ assertEquals( "1", objectClass.getExtension( "X-NDS_NOT_CONTAINER" ).get( 0 ) );
+
+ assertNotNull( objectClass.getExtension( "X-NDS_NONREMOVABLE" ) );
+ assertEquals( 1, objectClass.getExtension( "X-NDS_NONREMOVABLE" ).size() );
+ assertEquals( "1", objectClass.getExtension( "X-NDS_NONREMOVABLE" ).get( 0 ) );
// X-NDS_CONTAINMENT ( 'Organization' 'organizationalUnit' 'domain' )
- assertNotNull( objectClass.getExtensions().get( "X-NDS_CONTAINMENT" ) );
- assertEquals( 3, objectClass.getExtensions().get( "X-NDS_CONTAINMENT" ).size() );
- assertEquals( "Organization", objectClass.getExtensions().get( "X-NDS_CONTAINMENT" ).get( 0 ) );
- assertEquals( "organizationalUnit", objectClass.getExtensions().get( "X-NDS_CONTAINMENT" ).get( 1 ) );
- assertEquals( "domain", objectClass.getExtensions().get( "X-NDS_CONTAINMENT" ).get( 2 ) );
+ assertNotNull( objectClass.getExtension( "X-NDS_CONTAINMENT" ) );
+ assertEquals( 3, objectClass.getExtension( "X-NDS_CONTAINMENT" ).size() );
+ assertEquals( "Organization", objectClass.getExtension( "X-NDS_CONTAINMENT" ).get( 0 ) );
+ assertEquals( "organizationalUnit", objectClass.getExtension( "X-NDS_CONTAINMENT" ).get( 1 ) );
+ assertEquals( "domain", objectClass.getExtension( "X-NDS_CONTAINMENT" ).get( 2 ) );
// X-NDS_ACL_TEMPLATES '2#entry#[Root Template]#member'
- assertNotNull( objectClass.getExtensions().get( "X-NDS_ACL_TEMPLATES" ) );
- assertEquals( 1, objectClass.getExtensions().get( "X-NDS_ACL_TEMPLATES" ).size() );
- assertEquals( "2#entry#[Root Template]#member", objectClass.getExtensions().get( "X-NDS_ACL_TEMPLATES" )
+ assertNotNull( objectClass.getExtension( "X-NDS_ACL_TEMPLATES" ) );
+ assertEquals( 1, objectClass.getExtension( "X-NDS_ACL_TEMPLATES" ).size() );
+ assertEquals( "2#entry#[Root Template]#member", objectClass.getExtension( "X-NDS_ACL_TEMPLATES" )
.get( 0 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java?rev=1664343&r1=1664342&r2=1664343&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java Thu Mar 5 13:33:44 2015
@@ -446,70 +446,70 @@ public class SchemaParserTestUtils
value = "( " + oid + " " + required + " X-TEST 'test' )";
asd = parser.parse( value );
assertEquals( 1, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST" ) );
- assertEquals( 1, asd.getExtensions().get( "X-TEST" ).size() );
- assertEquals( "test", asd.getExtensions().get( "X-TEST" ).get( 0 ) );
+ assertNotNull( asd.getExtension( "X-TEST" ) );
+ assertEquals( 1, asd.getExtension( "X-TEST" ).size() );
+ assertEquals( "test", asd.getExtension( "X-TEST" ).get( 0 ) );
// single extension with multiple values
value = "( " + oid + " " + required
+ " X-TEST-ABC ('test1' 'test \u00E4\u00F6\u00FC\u00DF' 'test \u90E8\u9577' ) )";
asd = parser.parse( value );
assertEquals( 1, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST-ABC" ) );
- assertEquals( 3, asd.getExtensions().get( "X-TEST-ABC" ).size() );
- assertEquals( "test1", asd.getExtensions().get( "X-TEST-ABC" ).get( 0 ) );
- assertEquals( "test \u00E4\u00F6\u00FC\u00DF", asd.getExtensions().get( "X-TEST-ABC" ).get( 1 ) );
- assertEquals( "test \u90E8\u9577", asd.getExtensions().get( "X-TEST-ABC" ).get( 2 ) );
+ assertNotNull( asd.getExtension( "X-TEST-ABC" ) );
+ assertEquals( 3, asd.getExtension( "X-TEST-ABC" ).size() );
+ assertEquals( "test1", asd.getExtension( "X-TEST-ABC" ).get( 0 ) );
+ assertEquals( "test \u00E4\u00F6\u00FC\u00DF", asd.getExtension( "X-TEST-ABC" ).get( 1 ) );
+ assertEquals( "test \u90E8\u9577", asd.getExtension( "X-TEST-ABC" ).get( 2 ) );
// multiple extensions
value = "(" + oid + " " + required + " X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2'))";
asd = parser.parse( value );
assertEquals( 2, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( asd.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, asd.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", asd.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", asd.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( asd.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, asd.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", asd.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", asd.getExtension( "X-TEST-b" ).get( 1 ) );
// multiple extensions, no spaces
value = "(" + oid + " " + required + " X-TEST-a('test1-1''test1-2')X-TEST-b('test2-1''test2-2'))";
asd = parser.parse( value );
assertEquals( 2, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( asd.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, asd.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", asd.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", asd.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( asd.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, asd.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", asd.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", asd.getExtension( "X-TEST-b" ).get( 1 ) );
// multiple extensions, tabs, newline, comments
value = "(" + oid + "\n#comment\n" + required
+ "\nX-TEST-a\n(\t'test1-1'\t\n'test1-2'\n\r)\tX-TEST-b\n(\n'test2-1'\t'test2-2'\t)\r)";
asd = parser.parse( value );
assertEquals( 2, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertNotNull( asd.getExtension( "X-TEST-a" ) );
+ assertEquals( 2, asd.getExtension( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", asd.getExtension( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", asd.getExtension( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( asd.getExtension( "X-TEST-b" ) );
+ assertEquals( 2, asd.getExtension( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", asd.getExtension( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", asd.getExtension( "X-TEST-b" ).get( 1 ) );
// some more complicated
value = "(" + oid + " " + required
+ " X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ('\\5C\\27\\5c'))";
asd = parser.parse( value );
assertEquals( 1, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" ) );
- assertEquals( 1, asd.getExtensions().get( "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" )
+ assertNotNull( asd.getExtension( "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" ) );
+ assertEquals( 1, asd.getExtension( "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" )
.size() );
- assertEquals( "\\'\\", asd.getExtensions().get(
+ assertEquals( "\\'\\", asd.getExtension(
"X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" ).get( 0 ) );
// invalid extension, no number allowed