Author: elecharny
Date: Fri Dec 4 14:29:29 2009
New Revision: 887208
URL: http://svn.apache.org/viewvc?rev=887208&view=rev
Log:
Fixed tests by injecting all the schemaObject in the SchemaManager
Modified:
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=887208&r1=887207&r2=887208&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
Fri Dec 4 14:29:29 2009
@@ -46,6 +46,7 @@
import org.apache.directory.shared.ldap.filter.GreaterEqNode;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SchemaUtils;
@@ -73,7 +74,6 @@
{
public static final Logger LOG = LoggerFactory.getLogger( GreaterEqTest.class );
-
File wkdir;
Store<ServerEntry> store;
static SchemaManager schemaManager = null;
@@ -83,7 +83,7 @@
public static void setup() throws Exception
{
// setup the standard registries
- String workingDirectory = System.getProperty( "workingDirectory" );
+ String workingDirectory = System.getProperty( "workingDirectory" );
if ( workingDirectory == null )
{
@@ -104,9 +104,9 @@
{
fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors()
) );
}
-
+
loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) );
-
+
if ( !loaded )
{
fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors()
) );
@@ -173,8 +173,14 @@
// ---------- test bad get() ----------
- try { cursor.get(); fail(); }
- catch( InvalidCursorPositionException e ) {}
+ try
+ {
+ cursor.get();
+ fail();
+ }
+ catch ( InvalidCursorPositionException e )
+ {
+ }
// ---------- test beforeFirst() ----------
@@ -301,7 +307,7 @@
// ---------- test before() ----------
cursor = new GreaterEqCursor( store, evaluator );
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
indexEntry.setValue( "5" );
assertFalse( cursor.available() );
@@ -324,7 +330,7 @@
assertTrue( cursor.isClosed() );
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "7" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
@@ -334,7 +340,7 @@
cursor.close();
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "3" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
@@ -346,7 +352,7 @@
// ---------- test after() ----------
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "4" );
assertFalse( cursor.available() );
@@ -369,7 +375,7 @@
assertTrue( cursor.isClosed() );
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "7" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
@@ -379,7 +385,7 @@
cursor.close();
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "3" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
@@ -404,8 +410,14 @@
// ---------- test bad get() ----------
- try { cursor.get(); fail(); }
- catch( InvalidCursorPositionException e ) {}
+ try
+ {
+ cursor.get();
+ fail();
+ }
+ catch ( InvalidCursorPositionException e )
+ {
+ }
// ---------- test beforeFirst() ----------
@@ -527,18 +539,30 @@
// ---------- test before() ----------
cursor = new GreaterEqCursor( store, evaluator );
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
indexEntry.setValue( "2" );
- try { cursor.before( indexEntry ); fail( "Should never get here." );}
- catch ( UnsupportedOperationException e ) {}
+ try
+ {
+ cursor.before( indexEntry );
+ fail( "Should never get here." );
+ }
+ catch ( UnsupportedOperationException e )
+ {
+ }
// ---------- test after() ----------
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "2" );
- try { cursor.after( indexEntry ); fail( "Should never get here." );}
- catch ( UnsupportedOperationException e ) {}
+ try
+ {
+ cursor.after( indexEntry );
+ fail( "Should never get here." );
+ }
+ catch ( UnsupportedOperationException e )
+ {
+ }
}
@@ -546,14 +570,13 @@
// Evaluator Test Cases
// -----------------------------------------------------------------------
-
@Test
public void testEvaluatorIndexed() throws Exception
{
AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID
);
GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTALCODE_AT_OID, new ServerStringValue(
at, "3" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid()
);
assertNotNull( evaluator.getNormalizer() );
@@ -562,31 +585,31 @@
indexEntry.setId( 1L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 4L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 6L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 7L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 8L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 9L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 10L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
@@ -598,7 +621,7 @@
AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID
);
GreaterEqNode node = new GreaterEqNode( SchemaConstants.STREET_AT_OID, new ServerStringValue(
at, "2" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid()
);
assertNotNull( evaluator.getNormalizer() );
@@ -613,7 +636,7 @@
attrs.add( "sn", "doe" );
attrs.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
attrs.add( "entryUUID", SchemaUtils.uuidToBytes( UUID.randomUUID() ) );
- store.add( attrs );
+ store.add( attrs );
indexEntry.setId( 12L );
assertTrue( evaluator.evaluate( indexEntry ) );
@@ -627,7 +650,7 @@
GreaterEqNode node = new GreaterEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new
ServerStringValue( at, "2" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid()
);
assertNotNull( evaluator.getNormalizer() );
@@ -645,7 +668,7 @@
GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new
ServerStringValue( at, "3" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid()
);
assertNotNull( evaluator.getNormalizer() );
@@ -654,54 +677,47 @@
indexEntry.setId( 1L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 4L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 6L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 7L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 8L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 9L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 10L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
- @Test ( expected = IllegalStateException.class )
+ @Test(expected = IllegalStateException.class)
public void testEvaluatorAttributeNoMatchingRule() throws Exception
{
+ LdapSyntax syntax = new BogusSyntax( 1 );
AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000"
);
at.addName( "bogus" );
at.setSchemaName( "other" );
- at.setSyntax( new BogusSyntax( 1 ) );
-
+ at.setSyntax( syntax );
+
+ schemaManager.add( syntax );
schemaManager.add( at );
- schemaManager.add( at.getSyntax() );
- SyntaxCheckerDescription desc = new SyntaxCheckerDescription( at.getSyntax().getOid()
);
- desc.setDescription( "bogus" );
- desc.setFqcn( BogusSyntax.class.getName() );
- List<String> names = new ArrayList<String>();
- names.add( "bogus" );
- desc.setNames( names );
- desc.setObsolete( false );
- //schemaManager.register( at.getSyntax().getSyntaxChecker() );
GreaterEqNode node = new GreaterEqNode( at.getOid(), new ServerStringValue( at, "3"
) );
new GreaterEqEvaluator( node, store, schemaManager );
@@ -715,15 +731,17 @@
MatchingRule mr = new MatchingRule( "1.1" );
mr.setSyntax( new BogusSyntax( 1 ) );
mr.setLdapComparator( new StringComparator( "1.1" ) );
-
+
AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000"
);
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( new BogusSyntax( 2 ) );
at.setOrdering( mr );
-
- schemaManager.add( at );
+
schemaManager.add( at.getSyntax() );
+ schemaManager.add( mr );
+ schemaManager.add( at );
+
SyntaxCheckerDescription desc = new SyntaxCheckerDescription( at.getSyntax().getOid()
);
desc.setDescription( "bogus" );
desc.setFqcn( BogusSyntax.class.getName() );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=887208&r1=887207&r2=887208&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
Fri Dec 4 14:29:29 2009
@@ -46,6 +46,7 @@
import org.apache.directory.shared.ldap.filter.LessEqNode;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SchemaUtils;
@@ -73,7 +74,6 @@
{
public static final Logger LOG = LoggerFactory.getLogger( LessEqTest.class );
-
File wkdir;
Store<ServerEntry> store;
static SchemaManager schemaManager = null;
@@ -104,16 +104,16 @@
{
fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors()
) );
}
-
+
loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) );
-
+
if ( !loaded )
{
fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors()
) );
}
}
-
+
@Before
public void createStore() throws Exception
{
@@ -173,8 +173,14 @@
// ---------- test bad get() ----------
- try { cursor.get(); fail(); }
- catch( InvalidCursorPositionException e ) {}
+ try
+ {
+ cursor.get();
+ fail();
+ }
+ catch ( InvalidCursorPositionException e )
+ {
+ }
// ---------- test beforeFirst() ----------
@@ -321,7 +327,7 @@
// ---------- test before() ----------
cursor = new LessEqCursor( store, evaluator );
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
indexEntry.setValue( "2" );
assertFalse( cursor.available() );
@@ -344,7 +350,7 @@
assertTrue( cursor.isClosed() );
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "7" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
@@ -354,7 +360,7 @@
cursor.close();
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "3" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
@@ -366,7 +372,7 @@
// ---------- test after() ----------
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "1" );
assertFalse( cursor.available() );
@@ -389,7 +395,7 @@
assertTrue( cursor.isClosed() );
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "7" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
@@ -399,7 +405,7 @@
cursor.close();
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "3" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
@@ -424,8 +430,14 @@
// ---------- test bad get() ----------
- try { cursor.get(); fail(); }
- catch( InvalidCursorPositionException e ) {}
+ try
+ {
+ cursor.get();
+ fail();
+ }
+ catch ( InvalidCursorPositionException e )
+ {
+ }
// ---------- test beforeFirst() ----------
@@ -567,18 +579,30 @@
// ---------- test before() ----------
cursor = new LessEqCursor( store, evaluator );
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
indexEntry.setValue( "2" );
- try { cursor.before( indexEntry ); fail( "Should never get here." );}
- catch ( UnsupportedOperationException e ) {}
+ try
+ {
+ cursor.before( indexEntry );
+ fail( "Should never get here." );
+ }
+ catch ( UnsupportedOperationException e )
+ {
+ }
// ---------- test after() ----------
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setValue( "2" );
- try { cursor.after( indexEntry ); fail( "Should never get here." );}
- catch ( UnsupportedOperationException e ) {}
+ try
+ {
+ cursor.after( indexEntry );
+ fail( "Should never get here." );
+ }
+ catch ( UnsupportedOperationException e )
+ {
+ }
}
@@ -586,7 +610,6 @@
// Evaluator Test Cases
// -----------------------------------------------------------------------
-
@Test
public void testEvaluatorIndexed() throws Exception
{
@@ -594,7 +617,7 @@
LessEqNode node = new LessEqNode( SchemaConstants.POSTALCODE_AT_OID, new ServerStringValue(
at, "3" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid()
);
assertNotNull( evaluator.getNormalizer() );
@@ -603,31 +626,31 @@
indexEntry.setId( 1L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 4L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 6L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 7L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 8L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 9L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 10L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
@@ -640,7 +663,7 @@
LessEqNode node = new LessEqNode( SchemaConstants.STREET_AT_OID, new ServerStringValue(
at, "2" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid()
);
assertNotNull( evaluator.getNormalizer() );
@@ -649,7 +672,7 @@
LdapDN dn = new LdapDN( "cn=jane doe,o=good times co." );
dn.normalize( schemaManager.getNormalizerMapping() );
ServerEntry attrs = new DefaultServerEntry( schemaManager, dn );
- attrs.add( "objectClass", "person" );
+ attrs.add( "objectClass", "person" );
attrs.add( "c-street", "1" );
attrs.add( "cn", "jane doe" );
attrs.add( "sn", "doe" );
@@ -669,7 +692,7 @@
LessEqNode node = new LessEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new ServerStringValue(
at, "2" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid()
);
assertNotNull( evaluator.getNormalizer() );
@@ -687,7 +710,7 @@
LessEqNode node = new LessEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new ServerStringValue(
at, "3" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String,ServerEntry> indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ ForwardIndexEntry<String, ServerEntry> indexEntry = new ForwardIndexEntry<String,
ServerEntry>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid()
);
assertNotNull( evaluator.getNormalizer() );
@@ -696,44 +719,46 @@
indexEntry.setId( 1L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 4L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 6L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 7L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 8L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 9L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String,ServerEntry>();
+ indexEntry = new ForwardIndexEntry<String, ServerEntry>();
indexEntry.setId( 10L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
- @Test ( expected = IllegalStateException.class )
+ @Test(expected = IllegalStateException.class)
public void testEvaluatorAttributeNoMatchingRule() throws Exception
{
+ LdapSyntax syntax = new BogusSyntax( 1 );
AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000"
);
at.addName( "bogus" );
at.setSchemaName( "other" );
- at.setSyntax( new BogusSyntax( 1 ) );
-
+ at.setSyntax( syntax );
+
+ schemaManager.add( syntax );
schemaManager.add( at );
LessEqNode node = new LessEqNode( at.getOid(), new ServerStringValue( at, "3" ) );
@@ -749,15 +774,17 @@
MatchingRule mr = new MatchingRule( "1.1" );
mr.setSyntax( new BogusSyntax( 2 ) );
mr.setLdapComparator( new StringComparator( "1.1" ) );
-
+
AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".3000"
);
at.addName( "bogus" );
at.setSchemaName( "other" );
- at.setSyntax( new BogusSyntax(3) );
+ at.setSyntax( new BogusSyntax( 3 ) );
at.setOrdering( mr );
- schemaManager.add( at );
schemaManager.add( at.getSyntax() );
+ schemaManager.add( mr );
+ schemaManager.add( at );
+
SyntaxCheckerDescription desc = new SyntaxCheckerDescription( at.getSyntax().getOid()
);
desc.setDescription( "bogus" );
desc.setFqcn( BogusSyntax.class.getName() );
|