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:24:46 UTC
svn commit: r1062631 - in /directory/shared/trunk/ldap/src:
main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/
test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/
test/java/org/apache/directory/shared/ldap/sch...
Author: akarasulu
Date: Mon Jan 24 03:24:45 2011
New Revision: 1062631
URL: http://svn.apache.org/viewvc?rev=1062631&view=rev
Log:
moving syntax tests to model area
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SchemaParserTestUtils.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITContentRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITStructureRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleUseDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NameFormDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NormalizerDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java (contents, props changed)
- copied, changed from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SyntaxCheckerDescriptionSchemaParserTest.java
Removed:
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITContentRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITStructureRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleUseDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NameFormDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NormalizerDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SchemaParserTestUtils.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SyntaxCheckerDescriptionSchemaParserTest.java
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SchemaParserTestUtils.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SchemaParserTestUtils.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SchemaParserTestUtils.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java Mon Jan 24 03:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static junit.framework.Assert.assertEquals;
@@ -57,7 +57,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, null" );
+ Assert.fail("Exception expected, null");
}
catch ( ParseException pe )
{
@@ -69,7 +69,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, no NUMERICOID" );
+ Assert.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 );
- assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
+ Assert.assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
// simple
value = "( 123.4567.890 " + required + ")";
asd = parser.parse( value );
- assertEquals( "123.4567.890", asd.getOid() );
+ Assert.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 );
- assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
+ Assert.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 );
- assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
+ Assert.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 );
- assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
+ Assert.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 );
- assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
+ Assert.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 );
- assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
+ Assert.assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
// too short
value = "( 1 " + required + " )";
try
{
parser.parse( value );
- fail( "Exception expected, invalid NUMERICOID 1" );
+ Assert.fail("Exception expected, invalid NUMERICOID 1");
}
catch ( ParseException pe )
{
@@ -128,7 +128,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NUMERICOID ." );
+ Assert.fail("Exception expected, invalid NUMERICOID .");
}
catch ( ParseException pe )
{
@@ -140,7 +140,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NUMERICOID 1.1." );
+ Assert.fail("Exception expected, invalid NUMERICOID 1.1.");
}
catch ( ParseException pe )
{
@@ -152,7 +152,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid multiple OIDs not allowed.)" );
+ Assert.fail("Exception expected, invalid multiple OIDs not allowed.)");
}
catch ( ParseException pe )
{
@@ -166,7 +166,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NUMERICOID test" );
+ Assert.fail("Exception expected, invalid NUMERICOID test");
}
catch ( ParseException pe )
{
@@ -178,7 +178,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NUMERICOID 01.1 (leading zero)" );
+ Assert.fail("Exception expected, invalid NUMERICOID 01.1 (leading zero)");
}
catch ( ParseException pe )
{
@@ -190,7 +190,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NUMERICOID 1.2.a.4 (alpha not allowed)" );
+ Assert.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 );
- assertEquals( 1, asd.getNames().size() );
- assertEquals( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", asd.getNames().get( 0 ) );
+ Assert.assertEquals(1, asd.getNames().size());
+ Assert.assertEquals("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", asd.getNames().get(0));
// alpha-num-hypen
value = "( " + oid + " " + required
+ " NAME 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' )";
asd = parser.parse( value );
- assertEquals( 1, asd.getNames().size() );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", asd.getNames().get( 0 ) );
+ Assert.assertEquals(1, asd.getNames().size());
+ Assert.assertEquals("abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", asd.getNames().get(0));
// with parentheses
value = "( " + oid + " " + required + " NAME ( 'a-z-0-9' ) )";
asd = parser.parse( value );
- assertEquals( 1, asd.getNames().size() );
- assertEquals( "a-z-0-9", asd.getNames().get( 0 ) );
+ Assert.assertEquals(1, asd.getNames().size());
+ Assert.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 );
- assertEquals( 1, asd.getNames().size() );
- assertEquals( "a-z-0-9", asd.getNames().get( 0 ) );
+ Assert.assertEquals(1, asd.getNames().size());
+ Assert.assertEquals("a-z-0-9", asd.getNames().get(0));
// multi with space
value = " ( " + oid + " " + required + " NAME ( 'test1' 'test2' ) ) ";
asd = parser.parse( value );
- assertEquals( 2, asd.getNames().size() );
- assertEquals( "test1", asd.getNames().get( 0 ) );
- assertEquals( "test2", asd.getNames().get( 1 ) );
+ Assert.assertEquals(2, asd.getNames().size());
+ Assert.assertEquals("test1", asd.getNames().get(0));
+ Assert.assertEquals("test2", asd.getNames().get(1));
// multi without space
value = "(" + oid + " " + required + " NAME('test1''test2''test3'))";
asd = parser.parse( value );
- assertEquals( 3, asd.getNames().size() );
- assertEquals( "test1", asd.getNames().get( 0 ) );
- assertEquals( "test2", asd.getNames().get( 1 ) );
- assertEquals( "test3", asd.getNames().get( 2 ) );
+ 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));
// multi with many spaces
value = "( " + oid + " " + required
+ " NAME ( 'test1' 'test2' 'test3' ) )";
asd = parser.parse( value );
- assertEquals( 3, asd.getNames().size() );
- assertEquals( "test1", asd.getNames().get( 0 ) );
- assertEquals( "test2", asd.getNames().get( 1 ) );
- assertEquals( "test3", asd.getNames().get( 2 ) );
+ 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));
// 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 );
- assertEquals( 3, asd.getNames().size() );
- assertEquals( "test1", asd.getNames().get( 0 ) );
- assertEquals( "test2", asd.getNames().get( 1 ) );
- assertEquals( "test3", asd.getNames().get( 2 ) );
+ 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));
// lowercase NAME
value = "( " + oid + " " + required + " name 'test' )";
asd = parser.parse( value );
- assertEquals( 1, asd.getNames().size() );
- assertEquals( "test", asd.getNames().get( 0 ) );
+ Assert.assertEquals(1, asd.getNames().size());
+ Assert.assertEquals("test", asd.getNames().get(0));
// unquoted NAME value
value = "( " + oid + " " + required + " NAME test )";
asd = parser.parse( value );
- assertEquals( 1, asd.getNames().size() );
- assertEquals( "test", asd.getNames().get( 0 ) );
+ Assert.assertEquals(1, asd.getNames().size());
+ Assert.assertEquals("test", asd.getNames().get(0));
// multi unquoted NAME values
value = " ( " + oid + " " + required + " NAME (test1 test2) ) ";
asd = parser.parse( value );
- assertEquals( 2, asd.getNames().size() );
- assertEquals( "test1", asd.getNames().get( 0 ) );
- assertEquals( "test2", asd.getNames().get( 1 ) );
+ Assert.assertEquals(2, asd.getNames().size());
+ Assert.assertEquals("test1", asd.getNames().get(0));
+ Assert.assertEquals("test2", asd.getNames().get(1));
// NAM unknown
value = "( " + oid + " " + required + " NAM 'test' )";
try
{
parser.parse( value );
- fail( "Exception expected, invalid token NAM" );
+ Assert.fail("Exception expected, invalid token NAM");
}
catch ( ParseException pe )
{
@@ -307,7 +307,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NAME 1test (starts with number)" );
+ Assert.fail("Exception expected, invalid NAME 1test (starts with number)");
}
catch ( ParseException pe )
{
@@ -319,7 +319,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NAME -test (starts with hypen)" );
+ Assert.fail("Exception expected, invalid NAME -test (starts with hypen)");
}
catch ( ParseException pe )
{
@@ -331,7 +331,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NAME te_st (contains invalid character)" );
+ Assert.fail("Exception expected, invalid NAME te_st (contains invalid character)");
}
catch ( ParseException pe )
{
@@ -343,7 +343,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail( "Exception expected, invalid NAME te_st (contains invalid character)" );
+ Assert.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 );
- assertEquals( "Descripton", asd.getDescription() );
+ Assert.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 );
- assertEquals( "Descripton", asd.getDescription() );
+ Assert.assertEquals("Descripton", asd.getDescription());
// simple w/o space
value = "(" + oid + " " + required + " DESC'Descripton')";
asd = parser.parse( value );
- assertEquals( "Descripton", asd.getDescription() );
+ Assert.assertEquals("Descripton", asd.getDescription());
// simple parentheses and quotes
value = "(" + oid + " " + required + " DESC ('Descripton') )";
asd = parser.parse( value );
- assertEquals( "Descripton", asd.getDescription() );
+ Assert.assertEquals("Descripton", asd.getDescription());
// unicode
value = "( " + oid + " " + required + " DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' )";
asd = parser.parse( value );
- assertEquals( "Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", asd.getDescription() );
+ Assert.assertEquals("Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", asd.getDescription());
// escaped characters
value = "( " + oid + " " + required + " DESC 'test\\5Ctest' )";
asd = parser.parse( value );
- assertEquals( "test\\test", asd.getDescription() );
+ Assert.assertEquals("test\\test", asd.getDescription());
value = "( " + oid + " " + required + " DESC 'test\\5ctest' )";
asd = parser.parse( value );
- assertEquals( "test\\test", asd.getDescription() );
+ Assert.assertEquals("test\\test", asd.getDescription());
value = "( " + oid + " " + required + " DESC 'test\\27test' )";
asd = parser.parse( value );
- assertEquals( "test'test", asd.getDescription() );
+ Assert.assertEquals("test'test", asd.getDescription());
value = "( " + oid + " " + required + " DESC '\\5C\\27\\5c' )";
asd = parser.parse( value );
- assertEquals( "\\'\\", asd.getDescription() );
+ Assert.assertEquals("\\'\\", asd.getDescription());
// lowercase DESC
value = "( " + oid + " " + required + " desc 'Descripton' )";
asd = parser.parse( value );
- assertEquals( "Descripton", asd.getDescription() );
+ Assert.assertEquals("Descripton", asd.getDescription());
// empty DESC
value = "( " + oid + " " + required + " DESC '' )";
asd = parser.parse( value );
- assertEquals( "", asd.getDescription() );
+ Assert.assertEquals("", asd.getDescription());
// multiple not allowed
value = "(" + oid + " " + required + " DESC ( 'Descripton1' 'Description 2' ) )";
try
{
parser.parse( value );
- fail( "Exception expected, invalid multiple DESC not allowed.)" );
+ Assert.fail("Exception expected, invalid multiple DESC not allowed.)");
}
catch ( ParseException pe )
{
@@ -440,88 +440,88 @@ public class SchemaParserTestUtils
// no extension
value = "( " + oid + " " + required + " )";
asd = parser.parse( value );
- assertEquals( 0, asd.getExtensions().size() );
+ Assert.assertEquals(0, asd.getExtensions().size());
// single extension with one value
value = "( " + oid + " " + required + " X-TEST 'test' )";
asd = parser.parse( value );
- assertEquals( 1, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST" ) );
- assertEquals( 1, asd.getExtensions().get( "X-TEST" ).size() );
- assertEquals( "test", asd.getExtensions().get( "X-TEST" ).get( 0 ) );
+ 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));
// single extension with multiple values
value = "( " + oid + " " + required
+ " X-TEST-ABC ('test1' 'test \u00E4\u00F6\u00FC\u00DF' 'test \u90E8\u9577' ) )";
asd = parser.parse( value );
- assertEquals( 1, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST-ABC" ) );
- assertEquals( 3, asd.getExtensions().get( "X-TEST-ABC" ).size() );
- assertEquals( "test1", asd.getExtensions().get( "X-TEST-ABC" ).get( 0 ) );
- assertEquals( "test \u00E4\u00F6\u00FC\u00DF", asd.getExtensions().get( "X-TEST-ABC" ).get( 1 ) );
- assertEquals( "test \u90E8\u9577", asd.getExtensions().get( "X-TEST-ABC" ).get( 2 ) );
+ 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));
// multiple extensions
value = "(" + oid + " " + required + " X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2'))";
asd = parser.parse( value );
- assertEquals( 2, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ 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));
// multiple extensions, no spaces
value = "(" + oid + " " + required + " X-TEST-a('test1-1''test1-2')X-TEST-b('test2-1''test2-2'))";
asd = parser.parse( value );
- assertEquals( 2, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ 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));
// multiple extensions, tabs, newline, comments
value = "(" + oid + "\n#comment\n" + required
+ "\nX-TEST-a\n(\t'test1-1'\t\n'test1-2'\n\r)\tX-TEST-b\n(\n'test2-1'\t'test2-2'\t)\r)";
asd = parser.parse( value );
- assertEquals( 2, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
- assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
- assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
- assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
- assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
- assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
- assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
+ 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));
// some more complicated
value = "(" + oid + " " + required
+ " X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ('\\5C\\27\\5c'))";
asd = parser.parse( value );
- assertEquals( 1, asd.getExtensions().size() );
- assertNotNull( asd.getExtensions().get( "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" ) );
- assertEquals( 1, asd.getExtensions().get( "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" )
- .size() );
- assertEquals( "\\'\\", asd.getExtensions().get(
- "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" ).get( 0 ) );
+ Assert.assertEquals(1, asd.getExtensions().size());
+ Assert.assertNotNull(asd.getExtensions().get("X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+ Assert.assertEquals(1, asd.getExtensions().get("X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+ .size());
+ Assert.assertEquals("\\'\\", asd.getExtensions().get(
+ "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ").get(0));
// invalid extension, no number allowed
value = "( " + oid + " " + required + " X-TEST1 'test' )";
try
{
asd = parser.parse( value );
- fail( "Exception expected, invalid extension X-TEST1 (no number allowed)" );
+ Assert.fail("Exception expected, invalid extension X-TEST1 (no number allowed)");
}
catch ( ParseException pe )
{
- assertTrue( true );
+ Assert.assertTrue(true);
}
}
@@ -540,34 +540,34 @@ public class SchemaParserTestUtils
// not obsolete
value = "( " + oid + " " + required + " )";
asd = parser.parse( value );
- assertFalse( asd.isObsolete() );
+ Assert.assertFalse(asd.isObsolete());
// not obsolete
value = "( " + oid + " " + required + " NAME 'test' DESC 'Descripton' )";
asd = parser.parse( value );
- assertFalse( asd.isObsolete() );
+ Assert.assertFalse(asd.isObsolete());
// obsolete
value = "(" + oid + " " + required + " NAME 'test' DESC 'Descripton' OBSOLETE)";
asd = parser.parse( value );
- assertTrue( asd.isObsolete() );
+ Assert.assertTrue(asd.isObsolete());
// obsolete
value = "(" + oid + " " + required + " OBSOLETE)";
asd = parser.parse( value );
- assertTrue( asd.isObsolete() );
+ Assert.assertTrue(asd.isObsolete());
// lowercased obsolete
value = "(" + oid + " " + required + " obsolete)";
asd = parser.parse( value );
- assertTrue( asd.isObsolete() );
+ Assert.assertTrue(asd.isObsolete());
// invalid
value = "(" + oid + " " + required + " NAME 'test' DESC 'Descripton' OBSOLET )";
try
{
asd = parser.parse( value );
- fail( "Exception expected, invalid OBSOLETE value" );
+ Assert.fail("Exception expected, invalid OBSOLETE value");
}
catch ( ParseException pe )
{
@@ -579,11 +579,11 @@ public class SchemaParserTestUtils
try
{
asd = parser.parse( value );
- fail( "Exception expected, trailing value ('true') now allowed" );
+ Assert.fail("Exception expected, trailing value ('true') now allowed");
}
catch ( ParseException pe )
{
- assertTrue( true );
+ Assert.assertTrue(true);
}
}
@@ -602,11 +602,11 @@ public class SchemaParserTestUtils
try
{
parser.parse( testValue );
- fail( "Exception expected, element appears twice in " + testValue );
+ Assert.fail("Exception expected, element appears twice in " + testValue);
}
catch ( ParseException pe )
{
- assertTrue( true );
+ Assert.assertTrue(true);
}
}
@@ -648,7 +648,7 @@ public class SchemaParserTestUtils
while ( hasLiveThreads );
// check that no one thread failed to parse and generate a SS object
- assertTrue( isSuccessMultithreaded[0] );
+ Assert.assertTrue(isSuccessMultithreaded[0]);
}
@@ -668,23 +668,23 @@ public class SchemaParserTestUtils
// alphanum OID
value = "( abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789 " + required + " )";
asd = parser.parse( value );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789", asd
- .getOid() );
+ Assert.assertEquals("abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789", asd
+ .getOid());
// start with hypen
value = "( -oid " + required + " )";
asd = parser.parse( value );
- assertEquals( "-oid", asd.getOid() );
+ Assert.assertEquals("-oid", asd.getOid());
// start with number
value = "( 1oid " + required + " )";
asd = parser.parse( value );
- assertEquals( "1oid", asd.getOid() );
+ Assert.assertEquals("1oid", asd.getOid());
// start with dot
value = "( .oid " + required + " )";
asd = parser.parse( value );
- assertEquals( ".oid", asd.getOid() );
+ Assert.assertEquals(".oid", asd.getOid());
}
finally
{
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java (from r1062627, 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/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&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/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java Mon Jan 24 03:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -33,6 +33,7 @@ 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.junit.After;
@@ -112,7 +113,7 @@ public class AttributeTypeDescriptionSch
@Test
public void testObsolete() throws ParseException
{
- SchemaParserTestUtils.testObsolete( parser, "1.1", "SYNTAX 1.1" );
+ SchemaParserTestUtils.testObsolete(parser, "1.1", "SYNTAX 1.1");
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java (from r1062627, 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/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ComparatorDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&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/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java Mon Jan 24 03:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -27,6 +27,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.syntaxes.parser.SchemaParserTestUtils;
import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescriptionSchemaParser;
import org.junit.After;
@@ -65,7 +66,7 @@ public class ComparatorDescriptionSchema
@Test
public void testNumericOid() throws ParseException
{
- SchemaParserTestUtils.testNumericOid( parser, "FQCN org.apache.directory.SimpleComparator" );
+ SchemaParserTestUtils.testNumericOid(parser, "FQCN org.apache.directory.SimpleComparator");
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITContentRuleDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -30,6 +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.junit.After;
import org.junit.Before;
@@ -498,7 +499,7 @@ public class DITContentRuleDescriptionSc
"( 2.5.6.4 DESC 'content rule for organization' NOT ( x121Address $ telexNumber ) )",
"( 2.5.6.4 DESC 'content rule for organization' NOT ( x121Address $ telexNumber ) )",
"( 1.2.3.4.5.6.7.8.9.0 NAME ( 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' 'test' ) DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' OBSOLETE AUX ( 2.3.4.5.6.7.8.9.0.1 $ abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789 ) MUST ( 3.4.5.6.7.8.9.0.1.2 $ abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789 ) MAY ( 4.5.6.7.8.9.0.1.2.3 $ abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789 ) NOT ( 5.6.7.8.9.0.1.2.3.4 $ abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789 ) X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )" };
- SchemaParserTestUtils.testMultiThreaded( parser, testValues );
+ SchemaParserTestUtils.testMultiThreaded(parser, testValues);
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/DITStructureRuleDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -30,6 +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.junit.After;
import org.junit.Before;
@@ -161,7 +162,7 @@ public class DITStructureRuleDescription
@Test
public void testNames() throws ParseException
{
- SchemaParserTestUtils.testNames( parser, "1", "FORM 1.1" );
+ SchemaParserTestUtils.testNames(parser, "1", "FORM 1.1");
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -28,6 +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.junit.After;
import org.junit.Before;
@@ -81,7 +82,7 @@ public class LdapSyntaxDescriptionSchema
@Test
public void testNames() throws ParseException
{
- SchemaParserTestUtils.testNames( parser, "1.1", "" );
+ SchemaParserTestUtils.testNames(parser, "1.1", "");
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -34,6 +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.junit.After;
import org.junit.Before;
@@ -327,7 +328,7 @@ public class MatchingRuleDescriptionSche
"( 2.5.13.5 NAME 'caseExactMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
"( 2.5.13.5 NAME 'caseExactMatch' DESC 'Case Exact Matching on Directory String [defined in X.520]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
"( 1.2.3.4.5.6.7.8.9.0 NAME ( 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' 'test' ) DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' OBSOLETE SYNTAX 0.1.2.3.4.5.6.7.8.9 X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )" };
- SchemaParserTestUtils.testMultiThreaded( parser, testValues );
+ SchemaParserTestUtils.testMultiThreaded(parser, testValues);
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/MatchingRuleUseDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -32,6 +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.junit.After;
import org.junit.Before;
@@ -378,7 +379,7 @@ public class MatchingRuleUseDescriptionS
@Test
public void testQuirksMode() throws ParseException
{
- SchemaParserTestUtils.testQuirksMode( parser, "APPLIES 1.1" );
+ SchemaParserTestUtils.testQuirksMode(parser, "APPLIES 1.1");
try
{
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NameFormDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -31,6 +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.junit.After;
import org.junit.Before;
@@ -521,7 +522,7 @@ public class NameFormDescriptionSchemaPa
"( 2.5.15.3 NAME 'orgNameForm' OC organization MUST o )",
"( 2.5.15.3 NAME 'orgNameForm' OC organization MUST o )",
"( 1.2.3.4.5.6.7.8.9.0 NAME ( 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' 'test' ) DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' OBSOLETE OC bcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789a MUST ( 3.4.5.6.7.8.9.0.1.2 $ cdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789ab ) MAY ( 4.5.6.7.8.9.0.1.2.3 $ defghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789abc ) X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )" };
- SchemaParserTestUtils.testMultiThreaded( parser, testValues );
+ SchemaParserTestUtils.testMultiThreaded(parser, testValues);
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/NormalizerDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -27,6 +27,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.syntaxes.parser.SchemaParserTestUtils;
import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescriptionSchemaParser;
import org.junit.After;
@@ -65,7 +66,7 @@ public class NormalizerDescriptionSchema
@Test
public void testNumericOid() throws ParseException
{
- SchemaParserTestUtils.testNumericOid( parser, "FQCN org.apache.directory.SimpleNormalizer" );
+ SchemaParserTestUtils.testNumericOid(parser, "FQCN org.apache.directory.SimpleNormalizer");
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -34,6 +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.junit.After;
import org.junit.Before;
@@ -503,7 +504,7 @@ public class ObjectClassDescriptionSchem
"( 1.1 SUP test1 SUP test2 )", "( 1.1 STRUCTURAL STRUCTURAL )", "( 1.1 ABSTRACT ABSTRACT )",
"( 1.1 AUXILIARY AUXILIARY )", "( 1.1 STRUCTURAL AUXILIARY AUXILIARY )",
"( 1.1 MUST test1 MUST test2 )", "( 1.1 MAY test1 MAY test2 )", "( 1.1 X-TEST 'test1' X-TEST 'test2' )" };
- SchemaParserTestUtils.testUnique( parser, testValues );
+ SchemaParserTestUtils.testUnique(parser, testValues);
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java (from r1062627, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/parser/SyntaxCheckerDescriptionSchemaParserTest.java&r1=1062627&r2=1062631&rev=1062631&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/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:24:45 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.schema.syntax.parser;
+package org.apache.directory.shared.ldap.model.schema.syntaxes.parser;
import static org.junit.Assert.assertEquals;
@@ -28,6 +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.syntaxes.parser.SchemaParserTestUtils;
import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
import org.junit.After;
@@ -77,7 +78,7 @@ public class SyntaxCheckerDescriptionSch
@Test
public void testDescription() throws ParseException
{
- SchemaParserTestUtils.testDescription( parser, "1.1", "FQCN org.apache.directory.SimpleSyntaxChecker" );
+ SchemaParserTestUtils.testDescription(parser, "1.1", "FQCN org.apache.directory.SimpleSyntaxChecker");
}
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native