You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/24 04:46:30 UTC
svn commit: r1062635 [2/2] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/
apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/
apacheds/trunk/core/src/main/java/org/apache/dir...
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java Mon Jan 24 03:46:27 2011
@@ -24,7 +24,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java Mon Jan 24 03:46:27 2011
@@ -24,7 +24,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java Mon Jan 24 03:46:27 2011
@@ -24,7 +24,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java Mon Jan 24 03:46:27 2011
@@ -24,7 +24,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.NameFormDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.NameFormDescriptionSchemaParser;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java Mon Jan 24 03:46:27 2011
@@ -24,7 +24,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java (from r1062631, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParserTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParserTest.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
import static org.junit.Assert.assertEquals;
@@ -35,6 +35,8 @@ import org.apache.directory.junit.tools.
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
+import org.apache.directory.shared.ldap.model.schema.parsers.ConsoleParserMonitor;
+import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OpenLdapObjectIdentifierMacro;
import org.junit.After;
import org.junit.Before;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -33,9 +33,8 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.ConsoleParserMonitor;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.ConsoleParserMonitor;
+import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -27,9 +27,8 @@ import java.text.ParseException;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -30,8 +30,7 @@ import java.text.ParseException;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.schema.DITContentRule;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.DITContentRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.DITContentRuleDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -30,8 +30,7 @@ import java.text.ParseException;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.DITStructureRuleDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -28,8 +28,7 @@ import java.text.ParseException;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -34,8 +34,7 @@ import javax.naming.NamingException;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -32,8 +32,7 @@ import java.text.ParseException;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -31,8 +31,7 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.NameForm;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.NameFormDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.NameFormDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -27,9 +27,8 @@ import java.text.ParseException;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -34,8 +34,7 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java Mon Jan 24 03:46:27 2011
@@ -31,7 +31,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
-import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.AbstractSchemaParser;
/**
@@ -57,7 +57,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, null");
+ fail("Exception expected, null");
}
catch ( ParseException pe )
{
@@ -69,7 +69,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, no NUMERICOID");
+ fail("Exception expected, no NUMERICOID");
}
catch ( ParseException pe )
{
@@ -79,44 +79,44 @@ public class SchemaParserTestUtils
// simple
value = "( 0.1.2.3.4.5.6.7.8.9 " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
// simple
value = "( 123.4567.890 " + required + ")";
asd = parser.parse( value );
- Assert.assertEquals("123.4567.890", asd.getOid());
+ assertEquals("123.4567.890", asd.getOid());
// simple with multiple spaces
value = "( 0.1.2.3.4.5.6.7.8.9 " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
// simple w/o spaces
value = "(0.1.2.3.4.5.6.7.8.9 " + required + ")";
asd = parser.parse( value );
- Assert.assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
// simple with tabs, newline, comment.
value = "(\t0.1.2.3.4.5.6.7.8.9\n#comment\n" + required + "\r\n)\r";
asd = parser.parse( value );
- Assert.assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
// quoted OID
value = "( '0.1.2.3.4.5.6.7.8.9' " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
// quoted OID in parentheses
value = "( ('0.1.2.3.4.5.6.7.8.9') " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
// too short
value = "( 1 " + required + " )";
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NUMERICOID 1");
+ fail("Exception expected, invalid NUMERICOID 1");
}
catch ( ParseException pe )
{
@@ -128,7 +128,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NUMERICOID .");
+ fail("Exception expected, invalid NUMERICOID .");
}
catch ( ParseException pe )
{
@@ -140,7 +140,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NUMERICOID 1.1.");
+ fail("Exception expected, invalid NUMERICOID 1.1.");
}
catch ( ParseException pe )
{
@@ -152,7 +152,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid multiple OIDs not allowed.)");
+ fail("Exception expected, invalid multiple OIDs not allowed.)");
}
catch ( ParseException pe )
{
@@ -166,7 +166,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NUMERICOID test");
+ fail("Exception expected, invalid NUMERICOID test");
}
catch ( ParseException pe )
{
@@ -178,7 +178,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NUMERICOID 01.1 (leading zero)");
+ fail("Exception expected, invalid NUMERICOID 01.1 (leading zero)");
}
catch ( ParseException pe )
{
@@ -190,7 +190,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NUMERICOID 1.2.a.4 (alpha not allowed)");
+ fail("Exception expected, invalid NUMERICOID 1.2.a.4 (alpha not allowed)");
}
catch ( ParseException pe )
{
@@ -214,86 +214,86 @@ public class SchemaParserTestUtils
// alpha
value = "( " + oid + " " + required + " NAME 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' )";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getNames().size());
- Assert.assertEquals("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", asd.getNames().get(0));
+ assertEquals(1, asd.getNames().size());
+ assertEquals("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", asd.getNames().get(0));
// alpha-num-hypen
value = "( " + oid + " " + required
+ " NAME 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' )";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getNames().size());
- Assert.assertEquals("abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", asd.getNames().get(0));
+ assertEquals(1, asd.getNames().size());
+ assertEquals("abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", asd.getNames().get(0));
// with parentheses
value = "( " + oid + " " + required + " NAME ( 'a-z-0-9' ) )";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getNames().size());
- Assert.assertEquals("a-z-0-9", asd.getNames().get(0));
+ assertEquals(1, asd.getNames().size());
+ assertEquals("a-z-0-9", asd.getNames().get(0));
// with parentheses, without space
value = "(" + oid + " " + required + " NAME('a-z-0-9'))";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getNames().size());
- Assert.assertEquals("a-z-0-9", asd.getNames().get(0));
+ assertEquals(1, asd.getNames().size());
+ assertEquals("a-z-0-9", asd.getNames().get(0));
// multi with space
value = " ( " + oid + " " + required + " NAME ( 'test1' 'test2' ) ) ";
asd = parser.parse( value );
- Assert.assertEquals(2, asd.getNames().size());
- Assert.assertEquals("test1", asd.getNames().get(0));
- Assert.assertEquals("test2", asd.getNames().get(1));
+ assertEquals(2, asd.getNames().size());
+ assertEquals("test1", asd.getNames().get(0));
+ assertEquals("test2", asd.getNames().get(1));
// multi without space
value = "(" + oid + " " + required + " NAME('test1''test2''test3'))";
asd = parser.parse( value );
- Assert.assertEquals(3, asd.getNames().size());
- Assert.assertEquals("test1", asd.getNames().get(0));
- Assert.assertEquals("test2", asd.getNames().get(1));
- Assert.assertEquals("test3", asd.getNames().get(2));
+ assertEquals(3, asd.getNames().size());
+ assertEquals("test1", asd.getNames().get(0));
+ assertEquals("test2", asd.getNames().get(1));
+ assertEquals("test3", asd.getNames().get(2));
// multi with many spaces
value = "( " + oid + " " + required
+ " NAME ( 'test1' 'test2' 'test3' ) )";
asd = parser.parse( value );
- Assert.assertEquals(3, asd.getNames().size());
- Assert.assertEquals("test1", asd.getNames().get(0));
- Assert.assertEquals("test2", asd.getNames().get(1));
- Assert.assertEquals("test3", asd.getNames().get(2));
+ assertEquals(3, asd.getNames().size());
+ assertEquals("test1", asd.getNames().get(0));
+ assertEquals("test2", asd.getNames().get(1));
+ assertEquals("test3", asd.getNames().get(2));
// multi with tabs, newline, comment, etc.
value = "(\r\n" + oid + "\r" + required
+ "\nNAME\t(\t\t\t'test1'\t\n\t'test2'\t\r\t'test3'\t\r\n\t)\n#comment\n)";
asd = parser.parse( value );
- Assert.assertEquals(3, asd.getNames().size());
- Assert.assertEquals("test1", asd.getNames().get(0));
- Assert.assertEquals("test2", asd.getNames().get(1));
- Assert.assertEquals("test3", asd.getNames().get(2));
+ assertEquals(3, asd.getNames().size());
+ assertEquals("test1", asd.getNames().get(0));
+ assertEquals("test2", asd.getNames().get(1));
+ assertEquals("test3", asd.getNames().get(2));
// lowercase NAME
value = "( " + oid + " " + required + " name 'test' )";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getNames().size());
- Assert.assertEquals("test", asd.getNames().get(0));
+ assertEquals(1, asd.getNames().size());
+ assertEquals("test", asd.getNames().get(0));
// unquoted NAME value
value = "( " + oid + " " + required + " NAME test )";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getNames().size());
- Assert.assertEquals("test", asd.getNames().get(0));
+ assertEquals(1, asd.getNames().size());
+ assertEquals("test", asd.getNames().get(0));
// multi unquoted NAME values
value = " ( " + oid + " " + required + " NAME (test1 test2) ) ";
asd = parser.parse( value );
- Assert.assertEquals(2, asd.getNames().size());
- Assert.assertEquals("test1", asd.getNames().get(0));
- Assert.assertEquals("test2", asd.getNames().get(1));
+ assertEquals(2, asd.getNames().size());
+ assertEquals("test1", asd.getNames().get(0));
+ assertEquals("test2", asd.getNames().get(1));
// NAM unknown
value = "( " + oid + " " + required + " NAM 'test' )";
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid token NAM");
+ fail("Exception expected, invalid token NAM");
}
catch ( ParseException pe )
{
@@ -307,7 +307,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NAME 1test (starts with number)");
+ fail("Exception expected, invalid NAME 1test (starts with number)");
}
catch ( ParseException pe )
{
@@ -319,7 +319,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NAME -test (starts with hypen)");
+ fail("Exception expected, invalid NAME -test (starts with hypen)");
}
catch ( ParseException pe )
{
@@ -331,7 +331,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NAME te_st (contains invalid character)");
+ fail("Exception expected, invalid NAME te_st (contains invalid character)");
}
catch ( ParseException pe )
{
@@ -343,7 +343,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid NAME te_st (contains invalid character)");
+ fail("Exception expected, invalid NAME te_st (contains invalid character)");
}
catch ( ParseException pe )
{
@@ -367,58 +367,58 @@ public class SchemaParserTestUtils
// simple
value = "(" + oid + " " + required + " DESC 'Descripton')";
asd = parser.parse( value );
- Assert.assertEquals("Descripton", asd.getDescription());
+ assertEquals("Descripton", asd.getDescription());
// simple with tabs, newline, comment, etc.
value = "(" + oid + "\n" + required + "\tDESC#comment\n\n\r\n\r\t'Descripton')";
asd = parser.parse( value );
- Assert.assertEquals("Descripton", asd.getDescription());
+ assertEquals("Descripton", asd.getDescription());
// simple w/o space
value = "(" + oid + " " + required + " DESC'Descripton')";
asd = parser.parse( value );
- Assert.assertEquals("Descripton", asd.getDescription());
+ assertEquals("Descripton", asd.getDescription());
// simple parentheses and quotes
value = "(" + oid + " " + required + " DESC ('Descripton') )";
asd = parser.parse( value );
- Assert.assertEquals("Descripton", asd.getDescription());
+ assertEquals("Descripton", asd.getDescription());
// unicode
value = "( " + oid + " " + required + " DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' )";
asd = parser.parse( value );
- Assert.assertEquals("Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", asd.getDescription());
+ assertEquals("Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", asd.getDescription());
// escaped characters
value = "( " + oid + " " + required + " DESC 'test\\5Ctest' )";
asd = parser.parse( value );
- Assert.assertEquals("test\\test", asd.getDescription());
+ assertEquals("test\\test", asd.getDescription());
value = "( " + oid + " " + required + " DESC 'test\\5ctest' )";
asd = parser.parse( value );
- Assert.assertEquals("test\\test", asd.getDescription());
+ assertEquals("test\\test", asd.getDescription());
value = "( " + oid + " " + required + " DESC 'test\\27test' )";
asd = parser.parse( value );
- Assert.assertEquals("test'test", asd.getDescription());
+ assertEquals("test'test", asd.getDescription());
value = "( " + oid + " " + required + " DESC '\\5C\\27\\5c' )";
asd = parser.parse( value );
- Assert.assertEquals("\\'\\", asd.getDescription());
+ assertEquals("\\'\\", asd.getDescription());
// lowercase DESC
value = "( " + oid + " " + required + " desc 'Descripton' )";
asd = parser.parse( value );
- Assert.assertEquals("Descripton", asd.getDescription());
+ assertEquals("Descripton", asd.getDescription());
// empty DESC
value = "( " + oid + " " + required + " DESC '' )";
asd = parser.parse( value );
- Assert.assertEquals("", asd.getDescription());
+ assertEquals("", asd.getDescription());
// multiple not allowed
value = "(" + oid + " " + required + " DESC ( 'Descripton1' 'Description 2' ) )";
try
{
parser.parse( value );
- Assert.fail("Exception expected, invalid multiple DESC not allowed.)");
+ fail("Exception expected, invalid multiple DESC not allowed.)");
}
catch ( ParseException pe )
{
@@ -440,76 +440,76 @@ public class SchemaParserTestUtils
// no extension
value = "( " + oid + " " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals(0, asd.getExtensions().size());
+ assertEquals(0, asd.getExtensions().size());
// single extension with one value
value = "( " + oid + " " + required + " X-TEST 'test' )";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getExtensions().size());
- Assert.assertNotNull(asd.getExtensions().get("X-TEST"));
- Assert.assertEquals(1, asd.getExtensions().get("X-TEST").size());
- Assert.assertEquals("test", asd.getExtensions().get("X-TEST").get(0));
+ 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));
// single extension with multiple values
value = "( " + oid + " " + required
+ " X-TEST-ABC ('test1' 'test \u00E4\u00F6\u00FC\u00DF' 'test \u90E8\u9577' ) )";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getExtensions().size());
- Assert.assertNotNull(asd.getExtensions().get("X-TEST-ABC"));
- Assert.assertEquals(3, asd.getExtensions().get("X-TEST-ABC").size());
- Assert.assertEquals("test1", asd.getExtensions().get("X-TEST-ABC").get(0));
- Assert.assertEquals("test \u00E4\u00F6\u00FC\u00DF", asd.getExtensions().get("X-TEST-ABC").get(1));
- Assert.assertEquals("test \u90E8\u9577", asd.getExtensions().get("X-TEST-ABC").get(2));
+ 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));
// multiple extensions
value = "(" + oid + " " + required + " X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2'))";
asd = parser.parse( value );
- Assert.assertEquals(2, asd.getExtensions().size());
- Assert.assertNotNull(asd.getExtensions().get("X-TEST-a"));
- Assert.assertEquals(2, asd.getExtensions().get("X-TEST-a").size());
- Assert.assertEquals("test1-1", asd.getExtensions().get("X-TEST-a").get(0));
- Assert.assertEquals("test1-2", asd.getExtensions().get("X-TEST-a").get(1));
- Assert.assertNotNull(asd.getExtensions().get("X-TEST-b"));
- Assert.assertEquals(2, asd.getExtensions().get("X-TEST-b").size());
- Assert.assertEquals("test2-1", asd.getExtensions().get("X-TEST-b").get(0));
- Assert.assertEquals("test2-2", asd.getExtensions().get("X-TEST-b").get(1));
+ 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));
// 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 );
- Assert.assertEquals(2, asd.getExtensions().size());
- Assert.assertNotNull(asd.getExtensions().get("X-TEST-a"));
- Assert.assertEquals(2, asd.getExtensions().get("X-TEST-a").size());
- Assert.assertEquals("test1-1", asd.getExtensions().get("X-TEST-a").get(0));
- Assert.assertEquals("test1-2", asd.getExtensions().get("X-TEST-a").get(1));
- Assert.assertNotNull(asd.getExtensions().get("X-TEST-b"));
- Assert.assertEquals(2, asd.getExtensions().get("X-TEST-b").size());
- Assert.assertEquals("test2-1", asd.getExtensions().get("X-TEST-b").get(0));
- Assert.assertEquals("test2-2", asd.getExtensions().get("X-TEST-b").get(1));
+ 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));
// 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 );
- Assert.assertEquals(2, asd.getExtensions().size());
- Assert.assertNotNull(asd.getExtensions().get("X-TEST-a"));
- Assert.assertEquals(2, asd.getExtensions().get("X-TEST-a").size());
- Assert.assertEquals("test1-1", asd.getExtensions().get("X-TEST-a").get(0));
- Assert.assertEquals("test1-2", asd.getExtensions().get("X-TEST-a").get(1));
- Assert.assertNotNull(asd.getExtensions().get("X-TEST-b"));
- Assert.assertEquals(2, asd.getExtensions().get("X-TEST-b").size());
- Assert.assertEquals("test2-1", asd.getExtensions().get("X-TEST-b").get(0));
- Assert.assertEquals("test2-2", asd.getExtensions().get("X-TEST-b").get(1));
+ 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));
// some more complicated
value = "(" + oid + " " + required
+ " X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ('\\5C\\27\\5c'))";
asd = parser.parse( value );
- Assert.assertEquals(1, asd.getExtensions().size());
- Assert.assertNotNull(asd.getExtensions().get("X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"));
- Assert.assertEquals(1, asd.getExtensions().get("X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+ assertEquals(1, asd.getExtensions().size());
+ assertNotNull(asd.getExtensions().get("X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+ assertEquals(1, asd.getExtensions().get("X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
.size());
- Assert.assertEquals("\\'\\", asd.getExtensions().get(
+ assertEquals("\\'\\", asd.getExtensions().get(
"X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ").get(0));
// invalid extension, no number allowed
@@ -517,11 +517,11 @@ public class SchemaParserTestUtils
try
{
asd = parser.parse( value );
- Assert.fail("Exception expected, invalid extension X-TEST1 (no number allowed)");
+ fail("Exception expected, invalid extension X-TEST1 (no number allowed)");
}
catch ( ParseException pe )
{
- Assert.assertTrue(true);
+ assertTrue(true);
}
}
@@ -540,34 +540,34 @@ public class SchemaParserTestUtils
// not obsolete
value = "( " + oid + " " + required + " )";
asd = parser.parse( value );
- Assert.assertFalse(asd.isObsolete());
+ assertFalse(asd.isObsolete());
// not obsolete
value = "( " + oid + " " + required + " NAME 'test' DESC 'Descripton' )";
asd = parser.parse( value );
- Assert.assertFalse(asd.isObsolete());
+ assertFalse(asd.isObsolete());
// obsolete
value = "(" + oid + " " + required + " NAME 'test' DESC 'Descripton' OBSOLETE)";
asd = parser.parse( value );
- Assert.assertTrue(asd.isObsolete());
+ assertTrue(asd.isObsolete());
// obsolete
value = "(" + oid + " " + required + " OBSOLETE)";
asd = parser.parse( value );
- Assert.assertTrue(asd.isObsolete());
+ assertTrue(asd.isObsolete());
// lowercased obsolete
value = "(" + oid + " " + required + " obsolete)";
asd = parser.parse( value );
- Assert.assertTrue(asd.isObsolete());
+ assertTrue(asd.isObsolete());
// invalid
value = "(" + oid + " " + required + " NAME 'test' DESC 'Descripton' OBSOLET )";
try
{
asd = parser.parse( value );
- Assert.fail("Exception expected, invalid OBSOLETE value");
+ fail("Exception expected, invalid OBSOLETE value");
}
catch ( ParseException pe )
{
@@ -579,11 +579,11 @@ public class SchemaParserTestUtils
try
{
asd = parser.parse( value );
- Assert.fail("Exception expected, trailing value ('true') now allowed");
+ fail("Exception expected, trailing value ('true') now allowed");
}
catch ( ParseException pe )
{
- Assert.assertTrue(true);
+ assertTrue(true);
}
}
@@ -602,11 +602,11 @@ public class SchemaParserTestUtils
try
{
parser.parse( testValue );
- Assert.fail("Exception expected, element appears twice in " + testValue);
+ fail("Exception expected, element appears twice in " + testValue);
}
catch ( ParseException pe )
{
- Assert.assertTrue(true);
+ assertTrue(true);
}
}
@@ -648,7 +648,7 @@ public class SchemaParserTestUtils
while ( hasLiveThreads );
// check that no one thread failed to parse and generate a SS object
- Assert.assertTrue(isSuccessMultithreaded[0]);
+ assertTrue(isSuccessMultithreaded[0]);
}
@@ -668,23 +668,23 @@ public class SchemaParserTestUtils
// alphanum OID
value = "( abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789 " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals("abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789", asd
+ assertEquals("abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789", asd
.getOid());
// start with hypen
value = "( -oid " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals("-oid", asd.getOid());
+ assertEquals("-oid", asd.getOid());
// start with number
value = "( 1oid " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals("1oid", asd.getOid());
+ assertEquals("1oid", asd.getOid());
// start with dot
value = "( .oid " + required + " )";
asd = parser.parse( value );
- Assert.assertEquals(".oid", asd.getOid());
+ assertEquals(".oid", asd.getOid());
}
finally
{
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java Mon Jan 24 03:46:27 2011
@@ -28,9 +28,8 @@ import java.text.ParseException;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.schema.syntaxes.parser.SchemaParserTestUtils;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Mon Jan 24 03:46:27 2011
@@ -43,11 +43,11 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.*;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser;
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeDescription;
import org.apache.directory.studio.ldifparser.LdifFormatParameters;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Mon Jan 24 03:46:27 2011
@@ -34,10 +34,10 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Mon Jan 24 03:46:27 2011
@@ -31,7 +31,7 @@ import java.util.regex.MatchResult;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
-import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.Schema;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java Mon Jan 24 03:46:27 2011
@@ -26,7 +26,7 @@ import java.text.ParseException;
import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java Mon Jan 24 03:46:27 2011
@@ -26,7 +26,7 @@ import java.text.ParseException;
import java.util.List;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
-import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;