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 2009/08/22 20:45:38 UTC
svn commit: r806880 - in /directory:
apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/
apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/
...
Author: elecharny
Date: Sat Aug 22 18:45:37 2009
New Revision: 806880
URL: http://svn.apache.org/viewvc?rev=806880&view=rev
Log:
Many small fixes
Removed:
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SyntaxImpl.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractLdapSyntax.java
Modified:
directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaNormalizerProducer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java
Modified: directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Sat Aug 22 18:45:37 2009
@@ -549,8 +549,9 @@
ComparatorRegistry comparatorRegistry = registries.getComparatorRegistry();
- for ( String oid : comparatorRegistry )
+ while ( comparatorRegistry.oidsIterator().hasNext() )
{
+ String oid = comparatorRegistry.oidsIterator().next();
String schemaName = comparatorRegistry.getSchemaName( oid );
Schema schema = registries.getLoadedSchemas().get( schemaName );
getLog().info( "\t\t o [" + schemaName + "] - " + oid );
@@ -578,8 +579,9 @@
NormalizerRegistry normalizerRegistry = registries.getNormalizerRegistry();
- for ( String oid : normalizerRegistry )
+ while ( normalizerRegistry.oidsIterator().hasNext() )
{
+ String oid = normalizerRegistry.oidsIterator().next();
String schemaName = normalizerRegistry.getSchemaName( oid );
Schema schema = registries.getLoadedSchemas().get( schemaName );
getLog().info( "\t\t o [" + schemaName + "] - " + oid );
@@ -606,7 +608,7 @@
getLog().info( "------------------------------------------------------------------------" );
getLog().info( "" );
- LdapSyntaxRegistry syntaxRegistry = registries.getSyntaxRegistry();
+ LdapSyntaxRegistry syntaxRegistry = registries.getLdapSyntaxRegistry();
for ( LdapSyntax ldapSyntax : syntaxRegistry )
{
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Sat Aug 22 18:45:37 2009
@@ -177,14 +177,14 @@
/**
* A local Syntax class used for the tests
*/
- static class S extends AbstractSyntax
+ static class S extends LdapSyntax
{
private static final long serialVersionUID = 0L;
SyntaxChecker checker;
public S( String oid, boolean humanReadible )
{
- super( oid, humanReadible );
+ super( oid, "", humanReadible );
}
public void setSyntaxChecker( SyntaxChecker checker )
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=806880&r1=806879&r2=806880&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 Sat Aug 22 18:45:37 2009
@@ -728,7 +728,7 @@
if ( isPresent )
{
assertNotNull( syntaxDescription );
- assertEquals( oid, syntaxDescription.getNumericOid() );
+ assertEquals( oid, syntaxDescription.getOid() );
}
else
{
Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java Sat Aug 22 18:45:37 2009
@@ -31,6 +31,7 @@
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.Normalizer;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
@@ -288,14 +289,14 @@
public static class ObjectClassTypeMatch implements MatchingRule
{
private static final long serialVersionUID = 1L;
- public static final Comparator COMPARATOR = new ApachemetaComparatorProducer.ObjectClassTypeComparator();
+ public static final LdapComparator<?> COMPARATOR = new ApachemetaComparatorProducer.ObjectClassTypeComparator();
public static final Normalizer NORMALIZER = new NoOpNormalizer();
public static final LdapSyntax SYNTAX = new ApachemetaSyntaxProducer.ObjectClassTypeSyntax();
public static final String OID = "1.3.6.1.4.1.18060.0.4.0.1.1";
private static final String[] NAMES = new String[] { "objectClassTypeMatch" };
- public Comparator getComparator() throws NamingException
+ public LdapComparator<?> getComparator() throws NamingException
{
return COMPARATOR;
}
Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaNormalizerProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaNormalizerProducer.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaNormalizerProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaNormalizerProducer.java Sat Aug 22 18:45:37 2009
@@ -59,7 +59,7 @@
Normalizer normalizer = null;
normalizer = new NameOrNumericIdNormalizer( registries.getOidRegistry() );
- cb.schemaObjectProduced( this, "1.3.6.1.4.1.18060.0.4.0.1.0", normalizer );
+ cb.schemaObjectProduced( this, SchemaConstants.NAME"1.3.6.1.4.1.18060.0.4.0.1.0", normalizer );
normalizer = new NoOpNormalizer();
cb.schemaObjectProduced( this, "1.3.6.1.4.1.18060.0.4.0.1.1", normalizer );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java Sat Aug 22 18:45:37 2009
@@ -22,6 +22,8 @@
import javax.naming.NamingException;
+import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
+
/**
@@ -67,32 +69,59 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 437007 $
*/
-public abstract class LdapSyntax extends SchemaObject
+public class LdapSyntax extends SchemaObject
{
/** The serialVersionUID */
public static final long serialVersionUID = 1L;
/** the human readable flag */
- private boolean isHumanReadable = false;
-
+ protected boolean isHumanReadable = false;
+
+ /** The associated SyntaxChecker */
+ protected SyntaxChecker syntaxChecker;
/**
* Creates a Syntax object using a unique OID.
*
* @param oid the OID for this Syntax
*/
- protected LdapSyntax( String oid )
+ public LdapSyntax( String oid )
{
super( SchemaObjectType.LDAP_SYNTAX, oid );
}
/**
+ * Creates a Syntax object using a unique OID.
+ *
+ * @param oid the OID for this Syntax
+ */
+ public LdapSyntax( String oid, String description )
+ {
+ super( SchemaObjectType.LDAP_SYNTAX, oid );
+ this.description = description;
+ }
+
+
+ /**
+ * Creates a Syntax object using a unique OID.
+ *
+ * @param oid the OID for this Syntax
+ */
+ public LdapSyntax( String oid, String description, boolean isHumanReadable )
+ {
+ super( SchemaObjectType.LDAP_SYNTAX, oid );
+ this.description = description;
+ this.isHumanReadable = isHumanReadable;
+ }
+
+
+ /**
* Gets whether or not the Syntax is human readable.
*
* @return true if the syntax can be interpreted by humans, false otherwise
*/
- protected boolean isHumanReadable()
+ public boolean isHumanReadable()
{
return isHumanReadable;
}
@@ -103,9 +132,12 @@
*
* @param isHumanReadable the human readable flag value to set
*/
- protected void setHumanReadable( boolean isHumanReadable )
+ public void setHumanReadable( boolean isHumanReadable )
{
- this.isHumanReadable = isHumanReadable;
+ if ( ! isReadOnly )
+ {
+ this.isHumanReadable = isHumanReadable;
+ }
}
@@ -115,5 +147,22 @@
*
* @return the SyntaxChecker
*/
- public abstract SyntaxChecker getSyntaxChecker() throws NamingException;
+ public SyntaxChecker getSyntaxChecker() throws NamingException
+ {
+ return syntaxChecker;
+ }
+
+
+ /**
+ * Sets the associated SyntaxChecker
+ *
+ * @param syntaxChecker The associated SyntaxChecker
+ */
+ public void setSyntaxChecker( SyntaxChecker syntaxChecker )
+ {
+ if ( ! isReadOnly )
+ {
+ this.syntaxChecker = syntaxChecker;
+ }
+ }
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java Sat Aug 22 18:45:37 2009
@@ -859,7 +859,7 @@
}
buf.append( " X-SCHEMA '" );
- buf.append( syntax.getSchema() );
+ buf.append( syntax.getSchemaName() );
if ( syntax.isHumanReadable() )
{
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java Sat Aug 22 18:45:37 2009
@@ -22,6 +22,8 @@
import java.util.List;
+import org.apache.directory.shared.ldap.schema.LoadableSchemaObject;
+
/**
@@ -213,41 +215,41 @@
* not compared because doing so would raise an exception since syntax
* descriptions do not support the OBSOLETE flag.
*
- * @param asd0 the first schema description to compare
- * @param asd1 the second schema description to compare
+ * @param lsd0 the first schema description to compare
+ * @param lsd1 the second schema description to compare
* @return true if the descriptions match exactly, false otherwise
*/
- public static boolean descriptionsMatch( AbstractSchemaDescription asd0, AbstractSchemaDescription asd1 )
+ public static boolean descriptionsMatch( LoadableSchemaObject lsd0, LoadableSchemaObject lsd1 )
{
// check that the OID matches
- if ( ! asd0.getNumericOid().equals( asd1.getNumericOid() ) )
+ if ( ! lsd0.getOid().equals( lsd1.getOid() ) )
{
return false;
}
// check that the obsolete flag is equal but not for syntaxes
- if ( ( asd0 instanceof LdapSyntaxDescription ) || ( asd1 instanceof LdapSyntaxDescription ) )
+ if ( ( lsd0 instanceof LdapSyntaxDescription ) || ( lsd1 instanceof LdapSyntaxDescription ) )
{
- if ( asd0.isObsolete() != asd1.isObsolete() )
+ if ( lsd0.isObsolete() != lsd1.isObsolete() )
{
return false;
}
}
// check that the description matches
- if ( ! asd0.getDescription().equals( asd1.getDescription() ) )
+ if ( ! lsd0.getDescription().equals( lsd1.getDescription() ) )
{
return false;
}
// check alias names for exact match
- if ( ! aliasNamesMatch( asd0, asd1 ) )
+ if ( ! aliasNamesMatch( lsd0, lsd1 ) )
{
return false;
}
// check extensions for exact match
- if ( ! extensionsMatch( asd0, asd1 ) )
+ if ( ! extensionsMatch( lsd0, lsd1 ) )
{
return false;
}
@@ -261,23 +263,23 @@
* description. The order of the extension values must match for a true
* return.
*
- * @param asd0 the first schema description to compare the extensions of
- * @param asd1 the second schema description to compare the extensions of
+ * @param lsd0 the first schema description to compare the extensions of
+ * @param lsd1 the second schema description to compare the extensions of
* @return true if the extensions match exactly, false otherwise
*/
- public static boolean extensionsMatch( AbstractSchemaDescription asd0, AbstractSchemaDescription asd1 )
+ public static boolean extensionsMatch( LoadableSchemaObject lsd0, LoadableSchemaObject lsd1 )
{
// check sizes first
- if ( asd0.getExtensions().size() != asd1.getExtensions().size() )
+ if ( lsd0.getExtensions().size() != lsd1.getExtensions().size() )
{
return false;
}
// check contents and order of extension values must match
- for ( String key : asd0.getExtensions().keySet() )
+ for ( String key : lsd0.getExtensions().keySet() )
{
- List<String> values0 = asd0.getExtensions().get( key );
- List<String> values1 = asd1.getExtensions().get( key );
+ List<String> values0 = lsd0.getExtensions().get( key );
+ List<String> values1 = lsd1.getExtensions().get( key );
// if the key is not present in asd1
if ( values1 == null )
@@ -306,7 +308,7 @@
* @param asd1 the schema description to compare
* @return true if alias names match exactly, false otherwise
*/
- public static boolean aliasNamesMatch( AbstractSchemaDescription asd0, AbstractSchemaDescription asd1 )
+ public static boolean aliasNamesMatch( LoadableSchemaObject asd0, LoadableSchemaObject asd1 )
{
// check sizes first
if ( asd0.getNames().size() != asd1.getNames().size() )
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java Sat Aug 22 18:45:37 2009
@@ -262,7 +262,7 @@
}
else
{
- normalizer = new NoOpNormalizer();
+ normalizer = new NoOpNormalizer( matchingRule.getOid() );
}
if ( type.getSyntax().isHumanReadable() )
Modified: directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java Sat Aug 22 18:45:37 2009
@@ -149,7 +149,7 @@
}
- static class SyntaxImpl extends AbstractLdapSyntax
+ static class SyntaxImpl extends LdapSyntax
{
private static final long serialVersionUID = 1L;
@@ -159,21 +159,25 @@
}
- protected SyntaxImpl(String oid, boolean isHumanReadable)
+ protected SyntaxImpl( String oid, boolean isHumanReadable )
{
- super( oid, isHumanReadable );
+ super( oid );
+ setHumanReadable( isHumanReadable );
}
protected SyntaxImpl(String oid, String description)
{
- super( oid, description );
+ super( oid );
+ setDescription( description );
}
protected SyntaxImpl(String oid, String description, boolean isHumanReadable)
{
- super( oid, description, isHumanReadable );
+ super( oid );
+ setDescription( description );
+ setHumanReadable( isHumanReadable );
}
Modified: directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java?rev=806880&r1=806879&r2=806880&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java Sat Aug 22 18:45:37 2009
@@ -118,7 +118,7 @@
value = "( 1.2.3.4.5.6.7.8.9.0 DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )";
lsd = parser.parseLdapSyntaxDescription( value );
- assertEquals( "1.2.3.4.5.6.7.8.9.0", lsd.getNumericOid() );
+ assertEquals( "1.2.3.4.5.6.7.8.9.0", lsd.getOid() );
assertEquals( "Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", lsd.getDescription() );
assertEquals( 2, lsd.getExtensions().size() );
assertNotNull( lsd.getExtensions().get( "X-TEST-a" ) );
@@ -156,7 +156,7 @@
String value = "( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' X-NOT-HUMAN-READABLE 'TRUE' )";
LdapSyntaxDescription lsd = parser.parseLdapSyntaxDescription( value );
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.5", lsd.getNumericOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.5", lsd.getOid() );
assertEquals( "Binary", lsd.getDescription() );
assertEquals( 1, lsd.getExtensions().size() );
assertNotNull( lsd.getExtensions().get( "X-NOT-HUMAN-READABLE" ) );
@@ -173,7 +173,7 @@
{
String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 DESC 'bogus description' X-SCHEMA 'blah' X-IS-HUMAN-READABLE 'true' )";
LdapSyntaxDescription desc = parser.parseLdapSyntaxDescription( substrate );
- assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", desc.getNumericOid() );
+ assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", desc.getOid() );
assertEquals( "bogus description", desc.getDescription() );
assertNotNull( desc.getExtensions().get( "X-IS-HUMAN-READABLE" ) );
}