You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/01/06 18:52:31 UTC
svn commit: r896579 [10/14] - in /directory/shared/trunk: ./ ldap/
ldap/src/main/antlr/ ldap/src/main/java/org/apache/directory/shared/ldap/
ldap/src/main/java/org/apache/directory/shared/ldap/codec/
ldap/src/main/java/org/apache/directory/shared/ldap/...
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java Wed Jan 6 17:52:15 2010
@@ -300,6 +300,20 @@
/**
+ * Test teh creation of a new RDN
+ *
+ * @throws InvalidNameException
+ */
+ @Test
+ public void testRDNCreation() throws InvalidNameException
+ {
+ Rdn rdn = new Rdn( "A", " b " );
+ assertEquals( "a=\\ b \\ ", rdn.getNormName() );
+ assertEquals( "A= b ", rdn.getUpName() );
+ }
+
+
+ /**
* Test the clone method for a RDN.
*
* @throws InvalidNameException
@@ -624,7 +638,7 @@
{
Rdn rdn = new Rdn( " a = b + a = f + g = h + c = d " );
- assertEquals( "b", rdn.getValue() );
+ assertEquals( "b", rdn.getNormValue() );
}
@@ -830,7 +844,7 @@
public void testMultiValuedIterator() throws InvalidNameException
{
Rdn rdn = new Rdn( "cn=Kate Bush+sn=Bush" );
- Iterator<AttributeTypeAndValue> iterator = rdn.iterator();
+ Iterator<AVA> iterator = rdn.iterator();
assertNotNull( iterator );
assertTrue( iterator.hasNext() );
assertNotNull( iterator.next() );
@@ -844,7 +858,7 @@
public void testSingleValuedIterator() throws InvalidNameException
{
Rdn rdn = new Rdn( "cn=Kate Bush" );
- Iterator<AttributeTypeAndValue> iterator = rdn.iterator();
+ Iterator<AVA> iterator = rdn.iterator();
assertNotNull( iterator );
assertTrue( iterator.hasNext() );
assertNotNull( iterator.next() );
@@ -856,7 +870,7 @@
public void testEmptyIterator()
{
Rdn rdn = new Rdn();
- Iterator<AttributeTypeAndValue> iterator = rdn.iterator();
+ Iterator<AVA> iterator = rdn.iterator();
assertNotNull( iterator );
assertFalse( iterator.hasNext() );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java Wed Jan 6 17:52:15 2010
@@ -20,11 +20,9 @@
package org.apache.directory.shared.ldap.schema;
-import java.util.Comparator;
-import javax.naming.NamingException;
+import java.util.Arrays;
+import java.util.List;
-import org.apache.directory.shared.ldap.NotImplementedException;
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -37,32 +35,34 @@
*/
public class SchemaUtilsTest
{
- public static Syntax[] getSyntaxes()
+ public static LdapSyntax[] getSyntaxes()
{
- SyntaxImpl[] syntaxes = new SyntaxImpl[3];
- syntaxes[0] = new SyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.12", "DN syntax", true );
- syntaxes[1] = new SyntaxImpl( SchemaConstants.DIRECTORY_STRING_SYNTAX, "Directory String syntax", true );
- syntaxes[2] = new SyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.58", "Substring assertion syntax", true );
+ LdapSyntax[] syntaxes = new LdapSyntax[3];
+ syntaxes[0] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.12", "DN syntax", true );
+ syntaxes[1] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.15", "Directory String syntax", true );
+ syntaxes[2] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.58", "Substring assertion syntax", true );
+
return syntaxes;
}
public static MatchingRule[] getMatchingRules()
{
- MatchingRuleImpl[] mrs = new MatchingRuleImpl[3];
- mrs[0] = new MatchingRuleImpl( "2.5.13.2", getSyntaxes()[1] );
- mrs[0].setNames( new String[]
- { "caseIgnoreMatch" } );
+ MatchingRule[] mrs = new MatchingRule[3];
+
+ mrs[0] = new MatchingRule( "2.5.13.2" );
+ mrs[0].setSyntax( getSyntaxes()[1] );
+ mrs[0].addName( "caseIgnoreMatch" );
mrs[0].setDescription( "Ignores case in strings" );
- mrs[1] = new MatchingRuleImpl( "2.5.13.4", getSyntaxes()[2] );
- mrs[1].setNames( new String[]
- { "caseIgnoreSubstringsMatch" } );
+ mrs[1] = new MatchingRule( "2.5.13.4" );
+ mrs[0].setSyntax( getSyntaxes()[2] );
+ mrs[1].addName( "caseIgnoreSubstringsMatch" );
mrs[1].setDescription( "Ignores case in substrings" );
- mrs[2] = new MatchingRuleImpl( "2.5.13.1", getSyntaxes()[0] );
- mrs[2].setNames( new String[]
- { "distinguishedNameMatch" } );
+ mrs[2] = new MatchingRule( "2.5.13.1" );
+ mrs[0].setSyntax( getSyntaxes()[0] );
+ mrs[2].addName( "distinguishedNameMatch" );
mrs[2].setDescription( "distinguishedNameMatch" );
return mrs;
@@ -71,71 +71,41 @@
public AttributeType[] getAttributeTypes()
{
- AttributeTypeImpl[] ats = new AttributeTypeImpl[5];
+ AttributeType[] ats = new AttributeType[5];
- ats[0] = new AttributeTypeImpl( "2.5.4.41" );
- ats[0].setNames( new String[]
- { "name" } );
- ats[0].syntax = getSyntaxes()[1];
- ats[0].setLength( 32768 );
- ats[0].equality = getMatchingRules()[0];
- ats[0].substr = getMatchingRules()[1];
+ ats[0] = new AttributeType( "2.5.4.41" );
+ ats[0].addName( "name" );
+ ats[0].setSyntax( getSyntaxes()[1] );
+ ats[0].setSyntaxLength( 32768 );
+ ats[0].setEquality( getMatchingRules()[0] );
+ ats[0].setSubstring( getMatchingRules()[1] );
// ( 2.5.4.3 NAME 'cn' SUP name )
- ats[1] = new AttributeTypeImpl( "2.5.4.3" );
- ats[1].setNames( new String[]
- { "cn", "commonName" } );
-
- ats[2] = new AttributeTypeImpl( "2.5.4.41" );
- ats[2].setNames( new String[]
- { "name" } );
- ats[2].syntax = getSyntaxes()[1];
- ats[2].setLength( 32768 );
- ats[2].equality = getMatchingRules()[0];
- ats[2].substr = getMatchingRules()[1];
-
- ats[3] = new AttributeTypeImpl( "2.5.4.41" );
- ats[3].setNames( new String[]
- { "name" } );
- ats[3].syntax = getSyntaxes()[1];
- ats[3].setLength( 32768 );
- ats[3].equality = getMatchingRules()[0];
- ats[3].substr = getMatchingRules()[1];
-
- ats[4] = new AttributeTypeImpl( "2.5.4.41" );
- ats[4].setNames( new String[]
- { "name" } );
- ats[4].syntax = getSyntaxes()[1];
- ats[4].setLength( 32768 );
- ats[4].equality = getMatchingRules()[0];
- ats[4].substr = getMatchingRules()[1];
-
- return ats;
- }
-
+ ats[1] = new AttributeType( "2.5.4.3" );
+ ats[1].addName( "cn", "commonName" );
- public ObjectClass[] getObjectClasses()
- {
- /*
- * objectclass ( 2.5.6.2 NAME 'country' DESC 'RFC2256: a country' SUP
- * top STRUCTURAL MUST c MAY ( searchGuide $ description ) )
- */
-
- DefaultObjectClass[] ocs = new DefaultObjectClass[2];
- ocs[0] = new DefaultObjectClass( "1.1" );
- ocs[0].setNames( new String[]
- { "oc1" } );
- ocs[0].setDescription( "object class #1" );
- ocs[0].setObsolete( false );
- ocs[0].setType( ObjectClassTypeEnum.ABSTRACT );
-
- /*
- * objectclass ( 2.5.6.6 NAME 'person' DESC 'RFC2256: a person' SUP top
- * STRUCTURAL MUST ( sn $ cn ) MAY ( userPassword $ telephoneNumber $
- * seeAlso $ description ) )
- */
+ ats[2] = new AttributeType( "2.5.4.41" );
+ ats[2].addName( "name" );
+ ats[2].setSyntax( getSyntaxes()[1] );
+ ats[2].setSyntaxLength( 32768 );
+ ats[2].setEquality( getMatchingRules()[0] );
+ ats[2].setSubstring( getMatchingRules()[1] );
+
+ ats[3] = new AttributeType( "2.5.4.41" );
+ ats[3].addName( "name" );
+ ats[3].setSyntax( getSyntaxes()[1] );
+ ats[3].setSyntaxLength( 32768 );
+ ats[3].setEquality( getMatchingRules()[0] );
+ ats[3].setSubstring( getMatchingRules()[1] );
+
+ ats[4] = new AttributeType( "2.5.4.41" );
+ ats[4].addName( "name" );
+ ats[4].setSyntax( getSyntaxes()[1] );
+ ats[4].setSyntaxLength( 32768 );
+ ats[4].setEquality( getMatchingRules()[0] );
+ ats[4].setSubstring( getMatchingRules()[1] );
- return ocs;
+ return ats;
}
@@ -147,161 +117,29 @@
@Test
public void testRenderQdescrs()
{
- assertEquals( "", SchemaUtils.render( ( String[] ) null ).toString() );
- assertEquals( "", SchemaUtils.render( new String[]
- {} ).toString() );
- assertEquals( "'name1'", SchemaUtils.render( new String[]
- { "name1" } ).toString() );
- assertEquals( "( 'name1' 'name2' )", SchemaUtils.render( new String[]
- { "name1", "name2" } ).toString() );
- assertEquals( "( 'name1' 'name2' 'name3' )", SchemaUtils.render( new String[]
- { "name1", "name2", "name3" } ).toString() );
+ assertEquals( "", SchemaUtils.render( (List<String>)null ).toString() );
+ assertEquals( "", SchemaUtils.render( Arrays.asList( new String[]
+ {} ) ).toString() );
+ assertEquals( "'name1'", SchemaUtils.render( Arrays.asList( new String[]
+ { "name1" } ) ).toString() );
+ assertEquals( "( 'name1' 'name2' )", SchemaUtils.render( Arrays.asList( new String[]
+ { "name1", "name2" } ) ).toString() );
+ assertEquals( "( 'name1' 'name2' 'name3' )", SchemaUtils.render( Arrays.asList( new String[]
+ { "name1", "name2", "name3" } ) ).toString() );
StringBuffer buf = new StringBuffer();
- assertEquals( "", SchemaUtils.render( buf, ( String[] ) null ).toString() );
-
- assertEquals( "", SchemaUtils.render( new String[]
- {} ).toString() );
-
- assertEquals( "'name1'", SchemaUtils.render( new String[]
- { "name1" } ).toString() );
-
- assertEquals( "( 'name1' 'name2' )", SchemaUtils.render( new String[]
- { "name1", "name2" } ).toString() );
-
- assertEquals( "( 'name1' 'name2' 'name3' )", SchemaUtils.render( new String[]
- { "name1", "name2", "name3" } ).toString() );
- }
-
-
- static class SyntaxImpl extends AbstractSyntax
- {
- private static final long serialVersionUID = 1L;
-
- protected SyntaxImpl(String oid)
- {
- super( oid );
- }
-
-
- protected SyntaxImpl(String oid, boolean isHumanReadable)
- {
- super( oid, isHumanReadable );
- }
-
-
- protected SyntaxImpl(String oid, String description)
- {
- super( oid, description );
- }
-
-
- protected SyntaxImpl(String oid, String description, boolean isHumanReadable)
- {
- super( oid, description, isHumanReadable );
- }
-
-
- public SyntaxChecker getSyntaxChecker() throws NamingException
- {
- return null;
- }
- }
-
- static class AttributeTypeImpl extends AbstractAttributeType
- {
- private static final long serialVersionUID = 1L;
-
- Syntax syntax;
-
- AttributeType sup;
-
- MatchingRule equality;
-
- MatchingRule ordering;
-
- MatchingRule substr;
-
-
- public AttributeTypeImpl(String oid)
- {
- super( oid );
- }
-
-
- public AttributeType getSuperior() throws NamingException
- {
- return sup;
- }
-
-
- public Syntax getSyntax() throws NamingException
- {
- return syntax;
- }
-
-
- public MatchingRule getEquality() throws NamingException
- {
- return equality;
- }
-
-
- public MatchingRule getOrdering() throws NamingException
- {
- return ordering;
- }
-
-
- public MatchingRule getSubstr() throws NamingException
- {
- return substr;
- }
-
-
- public boolean isAncestorOf( AttributeType attributeType ) throws NamingException
- {
- return false;
- }
-
-
- public boolean isDescendantOf( AttributeType attributeType ) throws NamingException
- {
- return false;
- }
- }
-
- static class MatchingRuleImpl extends AbstractMatchingRule
- {
- private static final long serialVersionUID = 1L;
-
- Syntax syntax;
-
-
- protected MatchingRuleImpl(String oid, Syntax syntax)
- {
- super( oid );
- this.syntax = syntax;
- }
-
-
- public Syntax getSyntax() throws NamingException
- {
- return syntax;
- }
+ assertEquals( "", SchemaUtils.render( buf, (List<String>)null ).toString() );
+ assertEquals( "", SchemaUtils.render( Arrays.asList( new String[]
+ {} ) ).toString() );
- public Comparator<String> getComparator() throws NamingException
- {
- throw new NotImplementedException(
- "getComparator in org.apache.ldap.common.schema.SchemaUtilsTest.MatchingRuleImpl not implemented!" );
- }
+ assertEquals( "'name1'", SchemaUtils.render( Arrays.asList( new String[]
+ { "name1" } ) ).toString() );
+ assertEquals( "( 'name1' 'name2' )", SchemaUtils.render( Arrays.asList( new String[]
+ { "name1", "name2" } ) ).toString() );
- public Normalizer getNormalizer() throws NamingException
- {
- throw new NotImplementedException(
- "getNormalizer in org.apache.ldap.common.schema.SchemaUtilsTest.MatchingRuleImpl not implemented!" );
- }
+ assertEquals( "( 'name1' 'name2' 'name3' )", SchemaUtils.render( Arrays.asList( new String[]
+ { "name1", "name2", "name3" } ) ).toString() );
}
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/UsageEnumTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/UsageEnumTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/UsageEnumTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/UsageEnumTest.java Wed Jan 6 17:52:15 2010
@@ -19,9 +19,10 @@
*/
package org.apache.directory.shared.ldap.schema;
-import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
/**
* The unit tests for methods on UsageEnum.
*
@@ -56,6 +57,6 @@
assertEquals( "userApplications", UsageEnum.render( UsageEnum.USER_APPLICATIONS ) );
assertEquals( "distributedOperation", UsageEnum.render( UsageEnum.DISTRIBUTED_OPERATION ) );
assertEquals( "dSAOperation", UsageEnum.render( UsageEnum.DSA_OPERATION ) );
- assertEquals( "", UsageEnum.render( null ) );
+ assertEquals( "userApplications", UsageEnum.render( null ) );
}
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/CsnComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/CsnComparatorTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/CsnComparatorTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/CsnComparatorTest.java Wed Jan 6 17:52:15 2010
@@ -19,10 +19,11 @@
*/
package org.apache.directory.shared.ldap.schema.comparators;
+import static org.junit.Assert.assertEquals;
+
import org.apache.directory.shared.ldap.csn.Csn;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
/**
@@ -38,7 +39,7 @@
@Before
public void init()
{
- comparator = new CsnComparator();
+ comparator = new CsnComparator( null );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/CsnSidComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/CsnSidComparatorTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/CsnSidComparatorTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/CsnSidComparatorTest.java Wed Jan 6 17:52:15 2010
@@ -19,9 +19,10 @@
*/
package org.apache.directory.shared.ldap.schema.comparators;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
/**
@@ -37,7 +38,7 @@
@Before
public void init()
{
- comparator = new CsnSidComparator();
+ comparator = new CsnSidComparator( null );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/TelephoneNumberComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/TelephoneNumberComparatorTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/TelephoneNumberComparatorTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/comparators/TelephoneNumberComparatorTest.java Wed Jan 6 17:52:15 2010
@@ -19,11 +19,12 @@
*/
package org.apache.directory.shared.ldap.schema.comparators;
-import org.junit.Before;
-import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* Test the TelephoneNumber comparator
@@ -38,7 +39,7 @@
@Before
public void init()
{
- comparator = new TelephoneNumberComparator();
+ comparator = new TelephoneNumberComparator( null );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parser/OpenLdapSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parser/OpenLdapSchemaParserTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parser/OpenLdapSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parser/OpenLdapSchemaParserTest.java Wed Jan 6 17:52:15 2010
@@ -21,16 +21,15 @@
import java.io.InputStream;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeLiteral;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassLiteral;
import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
-import org.apache.directory.shared.ldap.schema.syntaxes.OpenLdapObjectIdentifierMacro;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.OpenLdapObjectIdentifierMacro;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -74,25 +73,25 @@
+ " SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 )";
parser.parse( attributeTypeData );
- List<AttributeTypeLiteral> attributeTypeList = parser.getAttributeTypes();
- Map<String, AttributeTypeLiteral> attributeTypes = mapAttributeTypes( attributeTypeList );
- AttributeTypeLiteral type = attributeTypes.get( "2.5.4.14" );
+ List<AttributeType> attributeTypes = parser.getAttributeTypes();
+ Map<String, AttributeType> mapAttributeTypes = mapAttributeTypes( attributeTypes );
+ AttributeType attributeType = mapAttributeTypes.get( "2.5.4.14" );
- assertNotNull( type );
- assertEquals( "2.5.4.14", type.getOid() );
- assertEquals( "searchGuide", type.getNames()[0] );
- assertEquals( "RFC2256: search guide, obsoleted by enhancedSearchGuide", type.getDescription() );
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.25", type.getSyntax() );
+ assertNotNull( attributeType );
+ assertEquals( "2.5.4.14", attributeType.getOid() );
+ assertEquals( "searchGuide", attributeType.getName() );
+ assertEquals( "RFC2256: search guide, obsoleted by enhancedSearchGuide", attributeType.getDescription() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.25", attributeType.getSyntaxOid() );
}
- private Map<String, AttributeTypeLiteral> mapAttributeTypes( List<AttributeTypeLiteral> attributeTypeList )
+ private Map<String, AttributeType> mapAttributeTypes( List<AttributeType> attributeTypes )
{
- Map<String, AttributeTypeLiteral> m = new HashMap<String, AttributeTypeLiteral>();
+ Map<String, AttributeType> m = new HashMap<String, AttributeType>();
- for ( AttributeTypeLiteral type : attributeTypeList )
+ for ( AttributeType attributeType : attributeTypes )
{
- m.put( type.getOid(), type );
+ m.put( attributeType.getOid(), attributeType );
}
return m;
@@ -106,16 +105,16 @@
+ " DESC 'RFC2256: knowledge information'\n" + " EQUALITY caseIgnoreMatch\n"
+ " SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )";
parser.parse( attributeTypeData );
- List<AttributeTypeLiteral> attributeTypeList = parser.getAttributeTypes();
- Map<String, AttributeTypeLiteral> attributeTypes = mapAttributeTypes( attributeTypeList );
- AttributeTypeLiteral type = attributeTypes.get( "2.5.4.2" );
+ List<AttributeType> attributeTypeList = parser.getAttributeTypes();
+ Map<String, AttributeType> attributeTypes = mapAttributeTypes( attributeTypeList );
+ AttributeType type = attributeTypes.get( "2.5.4.2" );
assertNotNull( type );
assertEquals( "2.5.4.2", type.getOid() );
- assertEquals( "knowledgeInformation", type.getNames()[0] );
+ assertEquals( "knowledgeInformation", type.getName() );
assertEquals( "RFC2256: knowledge information", type.getDescription() );
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", type.getSyntax() );
- assertEquals( 32768, type.getLength() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", type.getSyntaxOid() );
+ assertEquals( 32768, type.getSyntaxLength() );
}
@@ -126,16 +125,16 @@
+ " DESC 'RFC2256: \"knowledge\" information'\n" + " EQUALITY caseIgnoreMatch\n"
+ " SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )";
parser.parse( attributeTypeData );
- List<AttributeTypeLiteral> attributeTypeList = parser.getAttributeTypes();
- Map<String, AttributeTypeLiteral> attributeTypes = mapAttributeTypes( attributeTypeList );
- AttributeTypeLiteral type = attributeTypes.get( "2.5.4.2" );
+ List<AttributeType> attributeTypeList = parser.getAttributeTypes();
+ Map<String, AttributeType> attributeTypes = mapAttributeTypes( attributeTypeList );
+ AttributeType type = attributeTypes.get( "2.5.4.2" );
assertNotNull( type );
assertEquals( "2.5.4.2", type.getOid() );
- assertEquals( "knowledgeInformation", type.getNames()[0] );
+ assertEquals( "knowledgeInformation", type.getName() );
assertEquals( "RFC2256: \"knowledge\" information", type.getDescription() );
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", type.getSyntax() );
- assertEquals( 32768, type.getLength() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", type.getSyntaxOid() );
+ assertEquals( 32768, type.getSyntaxLength() );
}
@@ -147,26 +146,26 @@
+ " DESC 'RFC2256: knowledge information'\n" + " EQUALITY caseIgnoreMatch\n"
+ " SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )";
parser.parse( attributeTypeData );
- List<AttributeTypeLiteral> attributeTypeList = parser.getAttributeTypes();
- Map<String, AttributeTypeLiteral> attributeTypes = mapAttributeTypes( attributeTypeList );
- AttributeTypeLiteral type = attributeTypes.get( "2.5.4.2" );
+ List<AttributeType> attributeTypeList = parser.getAttributeTypes();
+ Map<String, AttributeType> attributeTypes = mapAttributeTypes( attributeTypeList );
+ AttributeType type = attributeTypes.get( "2.5.4.2" );
assertNotNull( type );
assertEquals( "2.5.4.2", type.getOid() );
- assertEquals( "knowledgeInformation", type.getNames()[0] );
+ assertEquals( "knowledgeInformation", type.getName() );
assertEquals( "RFC2256: knowledge information", type.getDescription() );
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", type.getSyntax() );
- assertEquals( 32768, type.getLength() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.15", type.getSyntaxOid() );
+ assertEquals( 32768, type.getSyntaxLength() );
}
- private Map<String, ObjectClassLiteral> mapObjectClasses( List<ObjectClassLiteral> objectClassList )
+ private Map<String, ObjectClass> mapObjectClasses( List<ObjectClass> objectClassList )
{
- Map<String, ObjectClassLiteral> m = new HashMap<String, ObjectClassLiteral>();
+ Map<String, ObjectClass> m = new HashMap<String, ObjectClass>();
- for ( ObjectClassLiteral objectClassLiteral : objectClassList )
+ for ( ObjectClass objectClass : objectClassList )
{
- m.put( objectClassLiteral.getOid(), objectClassLiteral );
+ m.put( objectClass.getOid(), objectClass );
}
return m;
@@ -180,21 +179,21 @@
+ " SUP top STRUCTURAL\n" + " MUST ( sn $ cn )\n"
+ " MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) )";
parser.parse( objectClassData );
- List<ObjectClassLiteral> objectClassesList = parser.getObjectClassTypes();
- Map<String, ObjectClassLiteral> objectClasses = mapObjectClasses( objectClassesList );
- ObjectClassLiteral objectClass = objectClasses.get( "2.5.6.6" );
+ List<ObjectClass> objectClassesList = parser.getObjectClassTypes();
+ Map<String, ObjectClass> objectClasses = mapObjectClasses( objectClassesList );
+ ObjectClass objectClass = objectClasses.get( "2.5.6.6" );
assertNotNull( objectClass );
assertEquals( "2.5.6.6", objectClass.getOid() );
- assertEquals( "person", objectClass.getNames()[0] );
+ assertEquals( "person", objectClass.getName() );
assertEquals( "RFC2256: a person", objectClass.getDescription() );
- assertEquals( ObjectClassTypeEnum.STRUCTURAL, objectClass.getClassType() );
- assertEquals( "sn", objectClass.getMust()[0] );
- assertEquals( "cn", objectClass.getMust()[1] );
- assertEquals( "userPassword", objectClass.getMay()[0] );
- assertEquals( "telephoneNumber", objectClass.getMay()[1] );
- assertEquals( "seeAlso", objectClass.getMay()[2] );
- assertEquals( "description", objectClass.getMay()[3] );
+ assertEquals( ObjectClassTypeEnum.STRUCTURAL, objectClass.getType() );
+ assertEquals( "sn", objectClass.getMustAttributeTypeOids().get(0) );
+ assertEquals( "cn", objectClass.getMustAttributeTypeOids().get(1) );
+ assertEquals( "userPassword", objectClass.getMayAttributeTypeOids().get(0) );
+ assertEquals( "telephoneNumber", objectClass.getMayAttributeTypeOids().get(1) );
+ assertEquals( "seeAlso", objectClass.getMayAttributeTypeOids().get(2) );
+ assertEquals( "description", objectClass.getMayAttributeTypeOids().get(3) );
}
@@ -211,36 +210,36 @@
+ "\t\tpagerTelephoneNumber $ organizationalStatus $\n"
+ "\t\tmailPreferenceOption $ personalSignature )\n" + "\t)";
parser.parse( objectClassData );
- List<ObjectClassLiteral> objectClassesList = parser.getObjectClassTypes();
- Map<String, ObjectClassLiteral> objectClasses = mapObjectClasses( objectClassesList );
- ObjectClassLiteral objectClass = objectClasses.get( "0.9.2342.19200300.100.4.4" );
+ List<ObjectClass> objectClassesList = parser.getObjectClassTypes();
+ Map<String, ObjectClass> objectClasses = mapObjectClasses( objectClassesList );
+ ObjectClass objectClass = objectClasses.get( "0.9.2342.19200300.100.4.4" );
assertNotNull( objectClass );
assertEquals( "0.9.2342.19200300.100.4.4", objectClass.getOid() );
- assertEquals( "pilotPerson", objectClass.getNames()[0] );
- assertEquals( "newPilotPerson", objectClass.getNames()[1] );
- assertEquals( ObjectClassTypeEnum.STRUCTURAL, objectClass.getClassType() );
- assertEquals( "person", objectClass.getSuperiors()[0] );
-
- assertEquals( "userid", objectClass.getMay()[0] );
- assertEquals( "textEncodedORAddress", objectClass.getMay()[1] );
- assertEquals( "rfc822Mailbox", objectClass.getMay()[2] );
- assertEquals( "favouriteDrink", objectClass.getMay()[3] );
- assertEquals( "roomNumber", objectClass.getMay()[4] );
- assertEquals( "userClass", objectClass.getMay()[5] );
- assertEquals( "homeTelephoneNumber", objectClass.getMay()[6] );
- assertEquals( "homePostalAddress", objectClass.getMay()[7] );
- assertEquals( "secretary", objectClass.getMay()[8] );
- assertEquals( "personalTitle", objectClass.getMay()[9] );
- assertEquals( "preferredDeliveryMethod", objectClass.getMay()[10] );
- assertEquals( "businessCategory", objectClass.getMay()[11] );
- assertEquals( "janetMailbox", objectClass.getMay()[12] );
- assertEquals( "otherMailbox", objectClass.getMay()[13] );
- assertEquals( "mobileTelephoneNumber", objectClass.getMay()[14] );
- assertEquals( "pagerTelephoneNumber", objectClass.getMay()[15] );
- assertEquals( "organizationalStatus", objectClass.getMay()[16] );
- assertEquals( "mailPreferenceOption", objectClass.getMay()[17] );
- assertEquals( "personalSignature", objectClass.getMay()[18] );
+ assertEquals( "pilotPerson", objectClass.getName() );
+ assertEquals( "newPilotPerson", objectClass.getNames().get(1) );
+ assertEquals( ObjectClassTypeEnum.STRUCTURAL, objectClass.getType() );
+ assertEquals( "person", objectClass.getSuperiorOids().get(0) );
+
+ assertEquals( "userid", objectClass.getMayAttributeTypeOids().get(0) );
+ assertEquals( "textEncodedORAddress", objectClass.getMayAttributeTypeOids().get(1) );
+ assertEquals( "rfc822Mailbox", objectClass.getMayAttributeTypeOids().get(2) );
+ assertEquals( "favouriteDrink", objectClass.getMayAttributeTypeOids().get(3) );
+ assertEquals( "roomNumber", objectClass.getMayAttributeTypeOids().get(4) );
+ assertEquals( "userClass", objectClass.getMayAttributeTypeOids().get(5) );
+ assertEquals( "homeTelephoneNumber", objectClass.getMayAttributeTypeOids().get(6) );
+ assertEquals( "homePostalAddress", objectClass.getMayAttributeTypeOids().get(7) );
+ assertEquals( "secretary", objectClass.getMayAttributeTypeOids().get(8) );
+ assertEquals( "personalTitle", objectClass.getMayAttributeTypeOids().get(9) );
+ assertEquals( "preferredDeliveryMethod", objectClass.getMayAttributeTypeOids().get(10) );
+ assertEquals( "businessCategory", objectClass.getMayAttributeTypeOids().get(11) );
+ assertEquals( "janetMailbox", objectClass.getMayAttributeTypeOids().get(12) );
+ assertEquals( "otherMailbox", objectClass.getMayAttributeTypeOids().get(13) );
+ assertEquals( "mobileTelephoneNumber", objectClass.getMayAttributeTypeOids().get(14) );
+ assertEquals( "pagerTelephoneNumber", objectClass.getMayAttributeTypeOids().get(15) );
+ assertEquals( "organizationalStatus", objectClass.getMayAttributeTypeOids().get(16) );
+ assertEquals( "mailPreferenceOption", objectClass.getMayAttributeTypeOids().get(17) );
+ assertEquals( "personalSignature", objectClass.getMayAttributeTypeOids().get(18) );
}
@@ -250,8 +249,8 @@
InputStream input = getClass().getResourceAsStream( "core.schema" );
parser.parse( input );
- List<AttributeTypeLiteral> attributeTypes = parser.getAttributeTypes();
- List<ObjectClassLiteral> objectClassTypes = parser.getObjectClassTypes();
+ List<AttributeType> attributeTypes = parser.getAttributeTypes();
+ List<ObjectClass> objectClassTypes = parser.getObjectClassTypes();
Map<String, OpenLdapObjectIdentifierMacro> objectIdentifierMacros = parser.getObjectIdentifierMacros();
assertEquals( 52, attributeTypes.size() );
@@ -266,8 +265,8 @@
InputStream input = getClass().getResourceAsStream( "inetorgperson.schema" );
parser.parse( input );
- List<AttributeTypeLiteral> attributeTypes = parser.getAttributeTypes();
- List<ObjectClassLiteral> objectClassTypes = parser.getObjectClassTypes();
+ List<AttributeType> attributeTypes = parser.getAttributeTypes();
+ List<ObjectClass> objectClassTypes = parser.getObjectClassTypes();
Map<String, OpenLdapObjectIdentifierMacro> objectIdentifierMacros = parser.getObjectIdentifierMacros();
assertEquals( 9, attributeTypes.size() );
@@ -282,14 +281,14 @@
InputStream input = getClass().getResourceAsStream( "collective.schema" );
parser.parse( input );
- List<AttributeTypeLiteral> attributeTypes = parser.getAttributeTypes();
- List<ObjectClassLiteral> objectClassTypes = parser.getObjectClassTypes();
+ List<AttributeType> attributeTypes = parser.getAttributeTypes();
+ List<ObjectClass> objectClassTypes = parser.getObjectClassTypes();
Map<String, OpenLdapObjectIdentifierMacro> objectIdentifierMacros = parser.getObjectIdentifierMacros();
assertEquals( 13, attributeTypes.size() );
assertEquals( 0, objectClassTypes.size() );
assertEquals( 0, objectIdentifierMacros.size() );
- for ( AttributeTypeLiteral attributeTypeLiteral : attributeTypes )
+ for ( AttributeType attributeTypeLiteral : attributeTypes )
{
assertTrue( attributeTypeLiteral.isCollective() );
}
@@ -302,8 +301,8 @@
InputStream input = getClass().getResourceAsStream( "dyngroup.schema" );
parser.parse( input );
- List<AttributeTypeLiteral> attributeTypes = parser.getAttributeTypes();
- List<ObjectClassLiteral> objectClassTypes = parser.getObjectClassTypes();
+ List<AttributeType> attributeTypes = parser.getAttributeTypes();
+ List<ObjectClass> objectClassTypes = parser.getObjectClassTypes();
Map<String, OpenLdapObjectIdentifierMacro> objectIdentifierMacros = parser.getObjectIdentifierMacros();
assertEquals( 2, attributeTypes.size() );
@@ -319,32 +318,34 @@
}
// check that OIDs in attribute types and object classes are resolved
- for ( ObjectClassLiteral objectClassLiteral : objectClassTypes )
+ for ( ObjectClass objectClass : objectClassTypes )
{
- List<String> asList = Arrays.asList( objectClassLiteral.getNames() );
+ List<String> asList = objectClass.getNames();
if ( asList.contains( "groupOfURLs" ) )
{
- assertEquals( "2.16.840.1.113730.3.2.33", objectClassLiteral.getOid() );
+ assertEquals( "2.16.840.1.113730.3.2.33", objectClass.getOid() );
}
else if ( asList.contains( "dgIdentityAux" ) )
{
- assertEquals( "1.3.6.1.4.1.4203.666.11.8.2.1", objectClassLiteral.getOid() );
+ assertEquals( "1.3.6.1.4.1.4203.666.11.8.2.1", objectClass.getOid() );
}
else
{
fail( "object class 'groupOfURLs' or 'dgIdentityAux' expected" );
}
}
- for ( AttributeTypeLiteral attributeTypeLiteral : attributeTypes )
+
+ for ( AttributeType attributeType : attributeTypes )
{
- List<String> asList = Arrays.asList( attributeTypeLiteral.getNames() );
+ List<String> asList = attributeType.getNames();
+
if ( asList.contains( "memberURL" ) )
{
- assertEquals( "2.16.840.1.113730.3.1.198", attributeTypeLiteral.getOid() );
+ assertEquals( "2.16.840.1.113730.3.1.198", attributeType.getOid() );
}
else if ( asList.contains( "dgIdentity" ) )
{
- assertEquals( "1.3.6.1.4.1.4203.666.11.8.1.1", attributeTypeLiteral.getOid() );
+ assertEquals( "1.3.6.1.4.1.4203.666.11.8.1.1", attributeType.getOid() );
}
else
{
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ACIItemSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ACIItemSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ACIItemSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ACIItemSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.ACIItemSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.ACIItemSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -54,7 +54,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.1", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.1", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AccessPointSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AccessPointSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AccessPointSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AccessPointSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.AccessPointSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.AccessPointSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.2", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.2", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.AttributeTypeDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.AttributeTypeDescriptionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AudioSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AudioSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AudioSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/AudioSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.AudioSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.AudioSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.4", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.4", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.BinarySyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.BinarySyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.5", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.5", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.BitStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.BitStringSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.BooleanSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.BooleanSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificateListSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificateListSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificateListSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificateListSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.CertificateListSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.CertificateListSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.9", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.9", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificatePairSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificatePairSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificatePairSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificatePairSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.CertificatePairSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.CertificatePairSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.10", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.10", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificateSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificateSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificateSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CertificateSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.CertificateSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.CertificateSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.8", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.8", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.CountrySyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.CountrySyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CsnSidSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CsnSidSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CsnSidSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CsnSidSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.CsnSidSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSidSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CsnSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CsnSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CsnSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/CsnSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.CsnSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DITContentRuleDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DITContentRuleDescriptionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DITStructureRuleDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DITStructureRuleDescriptionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DLSubmitPermissionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DLSubmitPermissionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DLSubmitPermissionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DLSubmitPermissionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DLSubmitPermissionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DLSubmitPermissionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.18", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.18", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DNSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DNSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DSAQualitySyntaxSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DSAQualitySyntaxSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DSAQualitySyntaxSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DSAQualitySyntaxSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DSAQualitySyntaxSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DSAQualitySyntaxSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DSETypeSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DSETypeSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DSETypeSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DSETypeSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DSETypeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DSETypeSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DataQualitySyntaxSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DataQualitySyntaxSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DataQualitySyntaxSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DataQualitySyntaxSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DataQualitySyntaxSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DataQualitySyntaxSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.13", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.13", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DeliveryMethodSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DeliveryMethodSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.DirectoryStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.DirectoryStringSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/EnhancedGuideSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/EnhancedGuideSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/EnhancedGuideSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/EnhancedGuideSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.EnhancedGuideSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.EnhancedGuideSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.21", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.21", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.FacsimileTelephoneNumberSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.FacsimileTelephoneNumberSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/FaxSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/FaxSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/FaxSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/FaxSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.FaxSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.FaxSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.23", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.23", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.GeneralizedTimeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.GeneralizedTimeSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/GuideSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/GuideSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/GuideSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/GuideSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.GuideSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.GuideSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.25", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.25", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.Ia5StringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.Ia5StringSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.IntegerSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.IntegerSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.JavaByteSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.JavaByteSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -21,7 +21,7 @@
import java.math.BigInteger;
-import org.apache.directory.shared.ldap.schema.syntaxes.JavaIntegerSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.JavaIntegerSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -21,7 +21,7 @@
import java.math.BigInteger;
-import org.apache.directory.shared.ldap.schema.syntaxes.JavaLongSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.JavaLongSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.JavaShortSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.JavaShortSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.JpegSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.JpegSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.LdapSyntaxDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.LdapSyntaxDescriptionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.MHSORAddressSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.MHSORAddressSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.33", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.33", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.MailPreferenceSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.MailPreferenceSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.MasterAndShadowAccessPointSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.MasterAndShadowAccessPointSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -52,7 +52,7 @@
@Test
public void testOid()
{
- assertEquals( "1.3.6.1.4.1.1466.115.121.1.29", checker.getSyntaxOid() );
+ assertEquals( "1.3.6.1.4.1.1466.115.121.1.29", checker.getOid() );
}
@Test
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.MatchingRuleDescriptionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleUseDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.MatchingRuleUseDescriptionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.NameAndOptionalUIDSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.NameAndOptionalUIDSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.NameFormDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.NameFormDescriptionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameOrNumericIdSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameOrNumericIdSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameOrNumericIdSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NameOrNumericIdSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.NumericOidSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.NumericOidSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.NumericStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.NumericStringSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxCheckerTest.java?rev=896579&r1=896578&r2=896579&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxCheckerTest.java Wed Jan 6 17:52:15 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxCheckers.ObjectClassDescriptionSyntaxChecker;
import org.junit.Test;
import static org.junit.Assert.assertFalse;