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 2010/01/06 18:52:31 UTC
svn commit: r896579 [11/14] - in /directory/shared/trunk: ./ ldap/
ldap/src/main/antlr/ ldap/src/main/java/org/apache/directory/shared/ldap/
ldap/src/main/java/org/apache/directory/shared/ldap/codec/
ldap/src/main/java/org/apache/directory/shared/ldap/...
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassTypeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.ObjectClassTypeSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.ObjectNameSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.ObjectNameSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,13 +20,13 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.OctetStringSyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
-
-import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker;
+import org.apache.directory.shared.ldap.util.StringTools;
+import org.junit.Test;
+
/**
* Test cases for OctetStringSyntaxChecker.
*
@@ -55,7 +55,7 @@
@Test
public void testStringOctetString()
{
- assertFalse( checker.isValidSyntax( "" ) );
+ assertTrue( checker.isValidSyntax( "" ) );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OtherMailboxSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OtherMailboxSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OtherMailboxSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/OtherMailboxSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.OtherMailboxSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.OtherMailboxSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PostalAddressSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PostalAddressSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PostalAddressSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PostalAddressSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.PostalAddressSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.PostalAddressSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PresentationAddressSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PresentationAddressSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PresentationAddressSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PresentationAddressSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.PresentationAddressSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.PresentationAddressSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.43", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.43", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.PrintableStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.PrintableStringSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ProtocolInformationSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ProtocolInformationSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ProtocolInformationSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ProtocolInformationSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.ProtocolInformationSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.ProtocolInformationSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.42", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.42", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubstringAssertionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubstringAssertionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubstringAssertionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubstringAssertionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.SubstringAssertionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.SubstringAssertionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.58", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.58", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubtreeSpecificationSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubtreeSpecificationSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubtreeSpecificationSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SubtreeSpecificationSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.SubtreeSpecificationSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.SubtreeSpecificationSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -53,7 +53,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.45", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.45", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierAndConsumerSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierAndConsumerSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierAndConsumerSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierAndConsumerSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.SupplierAndConsumerSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.SupplierAndConsumerSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.48", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.48", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierInformationSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierInformationSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierInformationSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierInformationSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.SupplierInformationSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.SupplierInformationSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.46", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.46", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierOrConsumerSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierOrConsumerSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierOrConsumerSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupplierOrConsumerSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.SupplierOrConsumerSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.SupplierOrConsumerSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.47", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.47", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupportedAlgorithmSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupportedAlgorithmSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupportedAlgorithmSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/SupportedAlgorithmSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.SupportedAlgorithmSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.SupportedAlgorithmSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.49", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.49", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.TelephoneNumberSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.TelephoneNumberSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -46,7 +46,7 @@
@Test
public void testOID()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.50", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.50", checker.getOid() );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TeletexTerminalIdentifierSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TeletexTerminalIdentifierSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TeletexTerminalIdentifierSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TeletexTerminalIdentifierSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.TeletexTerminalIdentifierSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.TeletexTerminalIdentifierSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelexNumberSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelexNumberSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelexNumberSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/TelexNumberSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.TelexNumberSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.TelexNumberSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.UtcTimeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.UtcTimeSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UuidSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UuidSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UuidSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/UuidSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.UuidSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.UuidSyntaxChecker;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java Wed Jan 6 17:52:15 2010
@@ -24,7 +24,7 @@
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.directory.shared.ldap.schema.parser.ConsoleParserMonitor;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
@@ -120,48 +120,48 @@
public void testSuperType() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// no SUP
value = "( 1.1 SYNTAX 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertNull( atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertNull( attributeType.getSuperiorOid() );
// SUP numericoid
value = "( 1.1 SYNTAX 1.1 SUP 1.2.3.4.5.6.7.8.9.0 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4.5.6.7.8.9.0", atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4.5.6.7.8.9.0", attributeType.getSuperiorOid() );
// SUP descr, no space
value = "(1.1 SYNTAX1.1 SUPabcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789)";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType.getSuperiorOid() );
// SUP descr, newline
value = "\t(\t1.1\tSYNTAX\t1.1\tSUP\tabcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789\t)\t";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType.getSuperiorOid() );
// quoted SUP value
value = "( 1.1 SYNTAX 1.1 SUP 'name' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "name", atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "name", attributeType.getSuperiorOid() );
// quoted SUP value
value = "( 1.1 SYNTAX 1.1 SUP '1.2.3.4' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4", atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4", attributeType.getSuperiorOid() );
// quoted SUP value
value = "( 1.1 SYNTAX 1.1 SUP ('1.2.3.4') )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4", atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4", attributeType.getSuperiorOid() );
// invalid character
value = "( 1.1 SYNTAX 1.1 SUP 1.2.3.4.A )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid SUP '1.2.3.4.A' (invalid character)" );
}
catch ( ParseException pe )
@@ -173,7 +173,7 @@
value = "( 1.1 SYNTAX 1.1 SUP ( name1 $ name2 ) )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, only single SUP allowed" );
}
catch ( ParseException pe )
@@ -185,7 +185,7 @@
value = "( 1.1 SYNTAX 1.1 SUP )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, no SUP value" );
}
catch ( ParseException pe )
@@ -205,37 +205,37 @@
public void testEquality() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// no EQUALITY
value = "( 1.1 SYNTAX 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertNull( atd.getEqualityMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertNull( attributeType.getEqualityOid() );
// EQUALITY numericoid
value = "( 1.1 SYNTAX 1.1 EQUALITY 1.2.3.4567.8.9.0 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4567.8.9.0", atd.getEqualityMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4567.8.9.0", attributeType.getEqualityOid() );
// EQUALITY descr, no space
value = "(1.1 SYNTAX1.1 EQUALITYabcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789)";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd.getEqualityMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType.getEqualityOid() );
// EQUALITY descr, newline
value = "\n(\n1.1\nSYNTAX\n1.1\nEQUALITY\nabcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789\n)\n";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd.getEqualityMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType.getEqualityOid() );
// quoted value
value = "( 1.1 SYNTAX 1.1 EQUALITY 'caseExcactMatch' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "caseExcactMatch", atd.getEqualityMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "caseExcactMatch", attributeType.getEqualityOid() );
// quote value in parentheses
value = "( 1.1 SYNTAX 1.1 EQUALITY ('caseExcactMatch') )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "caseExcactMatch", atd.getEqualityMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "caseExcactMatch", attributeType.getEqualityOid() );
}
@@ -249,37 +249,37 @@
public void testOrdering() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// no ORDERING
value = "( 1.1 SYNTAX 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertNull( atd.getOrderingMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertNull( attributeType.getOrderingOid() );
// ORDERING numericoid
value = "( 1.1 SYNTAX 1.1 ORDERING 1.2.3.4567.8.9.0 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4567.8.9.0", atd.getOrderingMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4567.8.9.0", attributeType.getOrderingOid() );
// ORDERING descr, no space
value = "(1.1 SYNTAX1.1 ORDERINGabcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789)";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd.getOrderingMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType.getOrderingOid() );
// ORDERING descr, newline
value = "\r(\r1.1\rSYNTAX\r1.1\rORDERING\rabcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789\r)\r";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd.getOrderingMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType.getOrderingOid() );
// quoted value
value = "( 1.1 SYNTAX 1.1 ORDERING 'generalizedTimeOrderingMatch' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "generalizedTimeOrderingMatch", atd.getOrderingMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "generalizedTimeOrderingMatch", attributeType.getOrderingOid() );
// quote value in parentheses
value = "( 1.1 SYNTAX 1.1 ORDERING ('generalizedTimeOrderingMatch') )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "generalizedTimeOrderingMatch", atd.getOrderingMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "generalizedTimeOrderingMatch", attributeType.getOrderingOid() );
}
@@ -293,39 +293,39 @@
public void testSubstring() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// no SUBSTR
value = "( 1.1 SYNTAX 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertNull( atd.getSubstringsMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertNull( attributeType.getSubstringOid() );
// SUBSTR numericoid
value = "( 1.1 SYNTAX 1.1 SUBSTR 1.2.3.4567.8.9.0 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4567.8.9.0", atd.getSubstringsMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4567.8.9.0", attributeType.getSubstringOid() );
// SUBSTR descr, no space
value = "(1.1 SYNTAX1.1 SUBSTRabcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789)";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd
- .getSubstringsMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType
+ .getSubstringOid() );
// SUBSTR descr, newline
value = "\r\n(\r\n1.1\r\nSYNTAX\r\n1.1\r\nSUBSTR\r\nabcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789\r\n)\r\n";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd
- .getSubstringsMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType
+ .getSubstringOid() );
// quoted value
value = "( 1.1 SYNTAX 1.1 SUBSTR 'caseIgnoreSubstringsMatch' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "caseIgnoreSubstringsMatch", atd.getSubstringsMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "caseIgnoreSubstringsMatch", attributeType.getSubstringOid() );
// quote value in parentheses
value = "( 1.1 SYNTAX 1.1 SUBSTR ('caseIgnoreSubstringsMatch') )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "caseIgnoreSubstringsMatch", atd.getSubstringsMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "caseIgnoreSubstringsMatch", attributeType.getSubstringOid() );
}
@@ -338,73 +338,73 @@
public void testSyntax() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// no SYNTAX
value = "( 1.1 SUP 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertNull( atd.getSyntax() );
- assertEquals( 0, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertNull( attributeType.getSyntaxOid() );
+ assertEquals( 0, attributeType.getSyntaxLength() );
// SYNTAX string
value = "( 1.1 SYNTAX IA5String )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "IA5String", atd.getSyntax() );
- assertEquals( 0, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "IA5String", attributeType.getSyntaxOid() );
+ assertEquals( 0, attributeType.getSyntaxLength() );
// SYNTAX numericoid
value = "( 1.1 SYNTAX 1.2.3.4567.8.9.0 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4567.8.9.0", atd.getSyntax() );
- assertEquals( 0, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4567.8.9.0", attributeType.getSyntaxOid() );
+ assertEquals( 0, attributeType.getSyntaxLength() );
// quoted numericoid
value = "( 1.1 SYNTAX '1.2.3.4567.8.9.0' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4567.8.9.0", atd.getSyntax() );
- assertEquals( 0, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4567.8.9.0", attributeType.getSyntaxOid() );
+ assertEquals( 0, attributeType.getSyntaxLength() );
// quoted numericoid
value = "( 1.1 SYNTAX ('1.2.3.4567.8.9.0') )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4567.8.9.0", atd.getSyntax() );
- assertEquals( 0, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4567.8.9.0", attributeType.getSyntaxOid() );
+ assertEquals( 0, attributeType.getSyntaxLength() );
// SYNTAX numericoid and length, no spaces
value = "(1.1 SYNTAX1.2.3.4567.8.9.0{1234567890})";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4567.8.9.0", atd.getSyntax() );
- assertEquals( 1234567890, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4567.8.9.0", attributeType.getSyntaxOid() );
+ assertEquals( 1234567890, attributeType.getSyntaxLength() );
// SYNTAX, with tabs
value = "\t(\t1.1\tSYNTAX\t1.2.3.4567.8.9.0\t{1234567890}\t)\t";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4567.8.9.0", atd.getSyntax() );
- assertEquals( 1234567890, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4567.8.9.0", attributeType.getSyntaxOid() );
+ assertEquals( 1234567890, attributeType.getSyntaxLength() );
// SYNTAX numericoid and zero length
value = "( 1.1 SYNTAX 1.2.3 {0} )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3", atd.getSyntax() );
- assertEquals( 0, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3", attributeType.getSyntaxOid() );
+ assertEquals( 0, attributeType.getSyntaxLength() );
// quoted value
value = "( 1.1 SYNTAX '1.2.3{32}' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3", atd.getSyntax() );
- assertEquals( 32, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3", attributeType.getSyntaxOid() );
+ assertEquals( 32, attributeType.getSyntaxLength() );
// quote value in parentheses
value = "( 1.1 SYNTAX ( '1.2.3{32}' ) )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3", atd.getSyntax() );
- assertEquals( 32, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3", attributeType.getSyntaxOid() );
+ assertEquals( 32, attributeType.getSyntaxLength() );
// empty length
value = "( 1.1 SYNTAX 1.2.3.4{} )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid SYNTAX 1.2.3.4{} (empty length)" );
}
catch ( ParseException pe )
@@ -414,15 +414,15 @@
// leading zero in length
value = "( 1.1 SYNTAX 1.2.3.4{01} )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4", atd.getSyntax() );
- assertEquals( 1, atd.getSyntaxLength() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "1.2.3.4", attributeType.getSyntaxOid() );
+ assertEquals( 1, attributeType.getSyntaxLength() );
// invalid syntax length
value = "( 1.1 SYNTAX 1.2.3.4{X} )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid SYNTAX 1.2.3.4{X} (invalid length)" );
}
catch ( ParseException pe )
@@ -434,7 +434,7 @@
value = "( 1.1 SYNTAX {32} )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid SYNTAX {32} (no syntax)" );
}
catch ( ParseException pe )
@@ -446,7 +446,7 @@
value = "( 1.1 SYNTAX 1.2.3.4{123456789012} )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid SYNTAX 1.2.3.4{123456789012} (length overflow)" );
}
catch ( NumberFormatException nfe )
@@ -466,28 +466,28 @@
public void testSingleValue() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// not single-value
value = "( 1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertFalse( atd.isSingleValued() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertFalse( attributeType.isSingleValued() );
// single-value
value = "(1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' SINGLE-VALUE)";
- atd = parser.parseAttributeTypeDescription( value );
- assertTrue( atd.isSingleValued() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertTrue( attributeType.isSingleValued() );
// single-value
value = "(1.1 SYNTAX 1.1 SINGLE-VALUE)";
- atd = parser.parseAttributeTypeDescription( value );
- assertTrue( atd.isSingleValued() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertTrue( attributeType.isSingleValued() );
// invalid
value = "(1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' SINGLE-VALU )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid SINGLE-VALUE value" );
}
catch ( ParseException pe )
@@ -506,28 +506,28 @@
public void testCollective() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// not collective
value = "( 1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertFalse( atd.isCollective() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertFalse( attributeType.isCollective() );
// single-value
value = "(1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' COLLECTIVE )";
- atd = parser.parseAttributeTypeDescription( value );
- assertTrue( atd.isCollective() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertTrue( attributeType.isCollective() );
// single-value
value = "(1.1 SYNTAX 1.1 COLLECTIVE)";
- atd = parser.parseAttributeTypeDescription( value );
- assertTrue( atd.isCollective() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertTrue( attributeType.isCollective() );
// ivalid
value = "(1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' COLLECTIV )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid COLLECTIVE value" );
}
catch ( ParseException pe )
@@ -546,28 +546,28 @@
public void testNoUserModification() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// not NO-USER-MODIFICATION
value = "( 1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertTrue( atd.isUserModifiable() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertTrue( attributeType.isUserModifiable() );
// NO-USER-MODIFICATION
value = "(1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' NO-USER-MODIFICATION USAGE directoryOperation )";
- atd = parser.parseAttributeTypeDescription( value );
- assertFalse( atd.isUserModifiable() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertFalse( attributeType.isUserModifiable() );
// NO-USER-MODIFICATION
value = "(1.1 SYNTAX 1.1 NO-USER-MODIFICATION USAGE directoryOperation )";
- atd = parser.parseAttributeTypeDescription( value );
- assertFalse( atd.isUserModifiable() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertFalse( attributeType.isUserModifiable() );
// ivalid
value = "(1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' NO-USER-MODIFICATIO USAGE directoryOperation )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid NO-USER-MODIFICATION value" );
}
catch ( ParseException pe )
@@ -586,43 +586,43 @@
public void testUsage() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
// DEFAULT is userApplications
value = "( 1.1 SYNTAX 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( UsageEnum.USER_APPLICATIONS, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( UsageEnum.USER_APPLICATIONS, attributeType.getUsage() );
// userApplications
value = "( 1.1 SYNTAX 1.1 USAGE userApplications )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( UsageEnum.USER_APPLICATIONS, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( UsageEnum.USER_APPLICATIONS, attributeType.getUsage() );
// directoryOperation
value = "( 1.1 SYNTAX 1.1 USAGE directoryOperation )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( UsageEnum.DIRECTORY_OPERATION, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( UsageEnum.DIRECTORY_OPERATION, attributeType.getUsage() );
// distributedOperation, tabs
value = "\t(\t1.1\tSYNTAX\t1.1\tUSAGE\tdistributedOperation\t)\t";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( UsageEnum.DISTRIBUTED_OPERATION, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( UsageEnum.DISTRIBUTED_OPERATION, attributeType.getUsage() );
// dSAOperation, no space
value = "(1.1 SYNTAX1.1 USAGEdSAOperation)";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( UsageEnum.DSA_OPERATION, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( UsageEnum.DSA_OPERATION, attributeType.getUsage() );
// directoryOperation, case insensitivity
value = "( 1.1 SYNTAX 1.1 USAGE DiReCtOrYoPeRaTiOn )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( UsageEnum.DIRECTORY_OPERATION, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( UsageEnum.DIRECTORY_OPERATION, attributeType.getUsage() );
// ivalid
value = "( 1.1 SYNTAX 1.1 USAGE abc )";
try
{
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
fail( "Exception expected, invalid USAGE value" );
}
catch ( ParseException pe )
@@ -653,38 +653,38 @@
public void testFull() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
value = "( 1.2.3.4.5.6.7.8.9.0 NAME ( 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' 'test' ) DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' OBSOLETE SUP abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789 EQUALITY 2.3.4.5.6.7.8.9.0.1 ORDERING 3.4.5.6.7.8.9.0.1.2 SUBSTR 4.5.6.7.8.9.0.1.2.3 SYNTAX 5.6.7.8.9.0.1.2.3.4{1234567890} SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )";
- atd = parser.parseAttributeTypeDescription( value );
+ attributeType = parser.parseAttributeTypeDescription( value );
- assertEquals( "1.2.3.4.5.6.7.8.9.0", atd.getNumericOid() );
- assertEquals( 2, atd.getNames().size() );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd.getNames().get( 0 ) );
- assertEquals( "test", atd.getNames().get( 1 ) );
- assertEquals( "Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", atd.getDescription() );
- assertTrue( atd.isObsolete() );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", atd.getSuperType() );
- assertEquals( "2.3.4.5.6.7.8.9.0.1", atd.getEqualityMatchingRule() );
- assertEquals( "3.4.5.6.7.8.9.0.1.2", atd.getOrderingMatchingRule() );
- assertEquals( "4.5.6.7.8.9.0.1.2.3", atd.getSubstringsMatchingRule() );
- assertEquals( "5.6.7.8.9.0.1.2.3.4", atd.getSyntax() );
- assertEquals( 1234567890, atd.getSyntaxLength() );
-
- assertTrue( atd.isSingleValued() );
- assertFalse( atd.isCollective() );
- assertFalse( atd.isUserModifiable() );
- assertEquals( UsageEnum.DSA_OPERATION, atd.getUsage() );
-
- assertEquals( 2, atd.getExtensions().size() );
- assertNotNull( atd.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, atd.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", atd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", atd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( atd.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, atd.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", atd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", atd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ assertEquals( "1.2.3.4.5.6.7.8.9.0", attributeType.getOid() );
+ assertEquals( 2, attributeType.getNames().size() );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType.getNames().get( 0 ) );
+ assertEquals( "test", attributeType.getNames().get( 1 ) );
+ assertEquals( "Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", attributeType.getDescription() );
+ assertTrue( attributeType.isObsolete() );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", attributeType.getSuperiorOid() );
+ assertEquals( "2.3.4.5.6.7.8.9.0.1", attributeType.getEqualityOid() );
+ assertEquals( "3.4.5.6.7.8.9.0.1.2", attributeType.getOrderingOid() );
+ assertEquals( "4.5.6.7.8.9.0.1.2.3", attributeType.getSubstringOid() );
+ assertEquals( "5.6.7.8.9.0.1.2.3.4", attributeType.getSyntaxOid() );
+ assertEquals( 1234567890, attributeType.getSyntaxLength() );
+
+ assertTrue( attributeType.isSingleValued() );
+ assertFalse( attributeType.isCollective() );
+ assertFalse( attributeType.isUserModifiable() );
+ 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 ) );
}
@@ -718,22 +718,22 @@
public void testRequiredElements() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
value = "( 1.2.3.4.5.6.7.8.9.0 SYNTAX 1.1 SUP 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertNotNull( atd.getSyntax() );
- assertNotNull( atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertNotNull( attributeType.getSyntaxOid() );
+ assertNotNull( attributeType.getSuperiorOid() );
value = "( 1.2.3.4.5.6.7.8.9.0 SYNTAX 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertNotNull( atd.getSyntax() );
- assertNull( atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertNotNull( attributeType.getSyntaxOid() );
+ assertNull( attributeType.getSuperiorOid() );
value = "( 1.2.3.4.5.6.7.8.9.0 SUP 1.1 )";
- atd = parser.parseAttributeTypeDescription( value );
- assertNull( atd.getSyntax() );
- assertNotNull( atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertNull( attributeType.getSyntaxOid() );
+ assertNotNull( attributeType.getSuperiorOid() );
if ( !parser.isQuirksMode() )
{
@@ -761,17 +761,17 @@
public void testCollecitveConstraint() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
value = "( 1.1 SYNTAX 1.1 COLLECTIVE )";
- atd = parser.parseAttributeTypeDescription( value );
- assertTrue( atd.isCollective() );
- assertEquals( UsageEnum.USER_APPLICATIONS, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertTrue( attributeType.isCollective() );
+ assertEquals( UsageEnum.USER_APPLICATIONS, attributeType.getUsage() );
value = "( 1.1 SYNTAX 1.1 COLLECTIVE USAGE userApplications )";
- atd = parser.parseAttributeTypeDescription( value );
- assertTrue( atd.isCollective() );
- assertEquals( UsageEnum.USER_APPLICATIONS, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertTrue( attributeType.isCollective() );
+ assertEquals( UsageEnum.USER_APPLICATIONS, attributeType.getUsage() );
if ( !parser.isQuirksMode() )
{
@@ -821,22 +821,22 @@
public void testNoUserModificatonConstraint() throws ParseException
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
value = "( 1.1 SYNTAX 1.1 NO-USER-MODIFICATION USAGE directoryOperation )";
- atd = parser.parseAttributeTypeDescription( value );
- assertFalse( atd.isUserModifiable() );
- assertEquals( UsageEnum.DIRECTORY_OPERATION, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertFalse( attributeType.isUserModifiable() );
+ assertEquals( UsageEnum.DIRECTORY_OPERATION, attributeType.getUsage() );
value = "( 1.1 SYNTAX 1.1 NO-USER-MODIFICATION USAGE dSAOperation )";
- atd = parser.parseAttributeTypeDescription( value );
- assertFalse( atd.isUserModifiable() );
- assertEquals( UsageEnum.DSA_OPERATION, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertFalse( attributeType.isUserModifiable() );
+ assertEquals( UsageEnum.DSA_OPERATION, attributeType.getUsage() );
value = "( 1.1 SYNTAX 1.1 NO-USER-MODIFICATION USAGE distributedOperation )";
- atd = parser.parseAttributeTypeDescription( value );
- assertFalse( atd.isUserModifiable() );
- assertEquals( UsageEnum.DISTRIBUTED_OPERATION, atd.getUsage() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertFalse( attributeType.isUserModifiable() );
+ assertEquals( UsageEnum.DISTRIBUTED_OPERATION, attributeType.getUsage() );
if ( !parser.isQuirksMode() )
{
@@ -874,19 +874,19 @@
public void testIgnoreElementOrder() throws ParseException
{
String value = "( 2.5.4.3 SUP name SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE userApplications DESC 'RFC2256: common name(s) for which the entity is known by' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch NAME ( 'cn' 'commonName' ) )";
- AttributeTypeDescription atd = parser.parseAttributeTypeDescription( value );
+ AttributeType attributeType = parser.parseAttributeTypeDescription( value );
- assertEquals( "2.5.4.3", atd.getNumericOid() );
- assertEquals( 2, atd.getNames().size() );
- assertEquals( "cn", atd.getNames().get( 0 ) );
- assertEquals( "commonName", atd.getNames().get( 1 ) );
- assertEquals( "RFC2256: common name(s) for which the entity is known by", atd.getDescription() );
- assertEquals( "name", atd.getSuperType() );
- assertEquals( "caseIgnoreMatch", atd.getEqualityMatchingRule() );
- assertEquals( "caseIgnoreSubstringsMatch", atd.getSubstringsMatchingRule() );
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", atd.getSyntax() );
- assertEquals( UsageEnum.USER_APPLICATIONS, atd.getUsage() );
- assertEquals( 0, atd.getExtensions().size() );
+ assertEquals( "2.5.4.3", attributeType.getOid() );
+ assertEquals( 2, attributeType.getNames().size() );
+ assertEquals( "cn", attributeType.getNames().get( 0 ) );
+ assertEquals( "commonName", attributeType.getNames().get( 1 ) );
+ assertEquals( "RFC2256: common name(s) for which the entity is known by", attributeType.getDescription() );
+ assertEquals( "name", attributeType.getSuperiorOid() );
+ assertEquals( "caseIgnoreMatch", attributeType.getEqualityOid() );
+ assertEquals( "caseIgnoreSubstringsMatch", attributeType.getSubstringOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", attributeType.getSyntaxOid() );
+ assertEquals( UsageEnum.USER_APPLICATIONS, attributeType.getUsage() );
+ assertEquals( 0, attributeType.getExtensions().size() );
}
@@ -898,28 +898,28 @@
public void testRfcUid() throws ParseException
{
String value = "( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) DESC 'RFC1274: user identifier' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} USAGE userApplications )";
- AttributeTypeDescription atd = parser.parseAttributeTypeDescription( value );
+ AttributeType attributeType = parser.parseAttributeTypeDescription( value );
- assertEquals( "0.9.2342.19200300.100.1.1", atd.getNumericOid() );
- assertEquals( 2, atd.getNames().size() );
- assertEquals( "uid", atd.getNames().get( 0 ) );
- assertEquals( "userid", atd.getNames().get( 1 ) );
- assertEquals( "RFC1274: user identifier", atd.getDescription() );
- assertNull( atd.getSuperType() );
-
- assertEquals( "caseIgnoreMatch", atd.getEqualityMatchingRule() );
- assertEquals( "caseIgnoreSubstringsMatch", atd.getSubstringsMatchingRule() );
- assertNull( atd.getOrderingMatchingRule() );
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", atd.getSyntax() );
- assertEquals( 256, atd.getSyntaxLength() );
- assertEquals( UsageEnum.USER_APPLICATIONS, atd.getUsage() );
-
- assertFalse( atd.isObsolete() );
- assertFalse( atd.isCollective() );
- assertFalse( atd.isSingleValued() );
- assertTrue( atd.isUserModifiable() );
+ assertEquals( "0.9.2342.19200300.100.1.1", attributeType.getOid() );
+ assertEquals( 2, attributeType.getNames().size() );
+ assertEquals( "uid", attributeType.getNames().get( 0 ) );
+ assertEquals( "userid", attributeType.getNames().get( 1 ) );
+ assertEquals( "RFC1274: user identifier", attributeType.getDescription() );
+ assertNull( attributeType.getSuperiorOid() );
+
+ assertEquals( "caseIgnoreMatch", attributeType.getEqualityOid() );
+ assertEquals( "caseIgnoreSubstringsMatch", attributeType.getSubstringOid() );
+ assertNull( attributeType.getOrderingOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", attributeType.getSyntaxOid() );
+ assertEquals( 256, attributeType.getSyntaxLength() );
+ assertEquals( UsageEnum.USER_APPLICATIONS, attributeType.getUsage() );
+
+ assertFalse( attributeType.isObsolete() );
+ assertFalse( attributeType.isCollective() );
+ assertFalse( attributeType.isSingleValued() );
+ assertTrue( attributeType.isUserModifiable() );
- assertEquals( 0, atd.getExtensions().size() );
+ assertEquals( 0, attributeType.getExtensions().size() );
}
@@ -931,12 +931,12 @@
{
String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) "
+ "DESC 'bogus description' SUP name SINGLE-VALUE )";
- AttributeTypeDescription desc = parser.parseAttributeTypeDescription( substrate );
- assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", desc.getNumericOid() );
+ AttributeType desc = parser.parseAttributeTypeDescription( substrate );
+ assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", desc.getOid() );
assertEquals( "bogus", desc.getNames().get( 0 ) );
assertEquals( "bogusName", desc.getNames().get( 1 ) );
assertEquals( "bogus description", desc.getDescription() );
- assertEquals( "name", desc.getSuperType() );
+ assertEquals( "name", desc.getSuperiorOid() );
assertEquals( true, desc.isSingleValued() );
}
@@ -949,12 +949,12 @@
{
String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) "
+ "DESC 'bogus description' SUP name SINGLE-VALUE X-SCHEMA 'blah' )";
- AttributeTypeDescription desc = parser.parseAttributeTypeDescription( substrate );
- assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", desc.getNumericOid() );
+ AttributeType desc = parser.parseAttributeTypeDescription( substrate );
+ assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", desc.getOid() );
assertEquals( "bogus", desc.getNames().get( 0 ) );
assertEquals( "bogusName", desc.getNames().get( 1 ) );
assertEquals( "bogus description", desc.getDescription() );
- assertEquals( "name", desc.getSuperType() );
+ assertEquals( "name", desc.getSuperiorOid() );
assertEquals( true, desc.isSingleValued() );
assertEquals( "blah", desc.getExtensions().get( "X-SCHEMA" ).get( 0 ) );
}
@@ -987,7 +987,7 @@
try
{
String value = null;
- AttributeTypeDescription atd = null;
+ AttributeType attributeType = null;
parser.setQuirksMode( true );
@@ -1018,41 +1018,41 @@
// NAME with special chars
value = "( 1.2.3 SYNTAX te_st NAME 't-e_s.t;' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( 1, atd.getNames().size() );
- assertEquals( "t-e_s.t;", atd.getNames().get( 0 ) );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( 1, attributeType.getNames().size() );
+ assertEquals( "t-e_s.t;", attributeType.getNames().get( 0 ) );
// SYNTAX with underscore
value = "( 1.1 SYNTAX te_st )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "te_st", atd.getSyntax() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "te_st", attributeType.getSyntaxOid() );
// SUPERTYPE with underscore
value = "( 1.1 SYNTAX 1.1 SUP te_st )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "te_st", atd.getSuperType() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "te_st", attributeType.getSuperiorOid() );
// EQUALITY with underscore
value = "( 1.1 SYNTAX 1.1 EQUALITY te_st )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "te_st", atd.getEqualityMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "te_st", attributeType.getEqualityOid() );
// SUBSTR with underscore
value = "( 1.1 SYNTAX 1.1 SUBSTR te_st )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "te_st", atd.getSubstringsMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "te_st", attributeType.getSubstringOid() );
// ORDERING with underscore
value = "( 1.1 SYNTAX 1.1 ORDERING te_st )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "te_st", atd.getOrderingMatchingRule() );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "te_st", attributeType.getOrderingOid() );
// Netscape attribute
value = "( nsAdminGroupName-oid NAME 'nsAdminGroupName' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'Netscape' )";
- atd = parser.parseAttributeTypeDescription( value );
- assertEquals( "nsAdminGroupName-oid", atd.getNumericOid() );
- assertEquals( 1, atd.getNames().size() );
- assertEquals( "nsAdminGroupName", atd.getNames().get( 0 ) );
+ attributeType = parser.parseAttributeTypeDescription( value );
+ assertEquals( "nsAdminGroupName-oid", attributeType.getOid() );
+ assertEquals( 1, attributeType.getNames().size() );
+ assertEquals( "nsAdminGroupName", attributeType.getNames().get( 0 ) );
}
finally
{
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java Wed Jan 6 17:52:15 2010
@@ -22,8 +22,8 @@
import java.text.ParseException;
-import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -39,13 +39,13 @@
public class ComparatorDescriptionSchemaParserTest
{
/** the parser instance */
- private ComparatorDescriptionSchemaParser parser;
+ private LdapComparatorDescriptionSchemaParser parser;
@Before
public void setUp() throws Exception
{
- parser = new ComparatorDescriptionSchemaParser();
+ parser = new LdapComparatorDescriptionSchemaParser();
}
@@ -74,13 +74,13 @@
public void testFqcn() throws ParseException
{
String value = null;
- ComparatorDescription cd = null;
+ LdapComparatorDescription ldapComparatorDescription = null;
// FQCN simple
value = "( 1.1 FQCN org.apache.directory.SimpleComparator )";
- cd = parser.parseComparatorDescription( value );
- assertNotNull( cd.getFqcn() );
- assertEquals( "org.apache.directory.SimpleComparator", cd.getFqcn() );
+ ldapComparatorDescription = parser.parseComparatorDescription( value );
+ assertNotNull( ldapComparatorDescription.getFqcn() );
+ assertEquals( "org.apache.directory.SimpleComparator", ldapComparatorDescription.getFqcn() );
}
@@ -88,25 +88,28 @@
public void testBytecode() throws ParseException
{
String value = null;
- ComparatorDescription cd = null;
+ LdapComparatorDescription ldapComparatorDescription = null;
// FQCN simple p
value = "( 1.1 FQCN org.apache.directory.SimpleComparator BYTECODE ABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789==== )";
- cd = parser.parseComparatorDescription( value );
- assertNotNull( cd.getBytecode() );
- assertEquals( "ABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789====", cd.getBytecode() );
+ ldapComparatorDescription = parser.parseComparatorDescription( value );
+ assertNotNull( ldapComparatorDescription.getBytecode() );
+ assertEquals( "ABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789====",
+ ldapComparatorDescription.getBytecode() );
// FQCN simple, no spaces
value = "(1.1 FQCNorg.apache.directory.SimpleComparator BYTECODEABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789====)";
- cd = parser.parseComparatorDescription( value );
- assertNotNull( cd.getBytecode() );
- assertEquals( "ABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789====", cd.getBytecode() );
+ ldapComparatorDescription = parser.parseComparatorDescription( value );
+ assertNotNull( ldapComparatorDescription.getBytecode() );
+ assertEquals( "ABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789====",
+ ldapComparatorDescription.getBytecode() );
// FQCN simple, tabs
value = "\t(\t1.1\tFQCN\torg.apache.directory.SimpleComparator\tBYTECODE\tABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789====\t)\t";
- cd = parser.parseComparatorDescription( value );
- assertNotNull( cd.getBytecode() );
- assertEquals( "ABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789====", cd.getBytecode() );
+ ldapComparatorDescription = parser.parseComparatorDescription( value );
+ assertNotNull( ldapComparatorDescription.getBytecode() );
+ assertEquals( "ABCDEFGHIJKLMNOPQRSTUVWXYZ+/abcdefghijklmnopqrstuvwxyz0123456789====",
+ ldapComparatorDescription.getBytecode() );
}