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 2009/09/02 13:36:03 UTC
svn commit: r810459 -
/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/
Author: elecharny
Date: Wed Sep 2 11:36:03 2009
New Revision: 810459
URL: http://svn.apache.org/viewvc?rev=810459&view=rev
Log:
Speedup the tests by using a @BeforeClass setup
Modified:
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
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
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Wed Sep 2 11:36:03 2009
@@ -50,6 +50,7 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -70,15 +71,16 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
EvaluatorBuilder evaluatorBuilder;
CursorBuilder cursorBuilder;
-
- public AndCursorTest() throws Exception
+
+ @BeforeClass
+ public static void setup() throws Exception
{
// setup the standard registries
- String workingDirectory = System.getProperty( "workingDirectory" );
+ String workingDirectory = System.getProperty( "workingDirectory" );
if ( workingDirectory == null )
{
@@ -99,6 +101,10 @@
attributeRegistry = registries.getAttributeTypeRegistry();
}
+ public AndCursorTest() throws Exception
+ {
+ }
+
@Before
public void createStore() throws Exception
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java Wed Sep 2 11:36:03 2009
@@ -37,9 +37,9 @@
{
private static final long serialVersionUID = 1L;
- protected BogusSyntax()
+ protected BogusSyntax( int oidVal )
{
- super( "1.3.6.1.4.1.18060.0.4.1.1.100000" );
+ super( "1.3.6.1.4.1.18060.0.4.1.1.100000." + oidVal );
setHumanReadable( false );
setObsolete( false );
addName( "bogus" );
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=810459&r1=810458&r2=810459&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 Wed Sep 2 11:36:03 2009
@@ -49,6 +49,7 @@
import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.After;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -75,11 +76,12 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
- public GreaterEqTest() throws Exception
+ @BeforeClass
+ public static void setup() throws Exception
{
// setup the standard registries
String workingDirectory = System.getProperty( "workingDirectory" );
@@ -680,7 +682,7 @@
AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
- at.setSyntax( new BogusSyntax() );
+ at.setSyntax( new BogusSyntax( 1 ) );
registries.getAttributeTypeRegistry().register( at );
registries.getLdapSyntaxRegistry().register( at.getSyntax() );
@@ -703,14 +705,14 @@
public void testEvaluatorAttributeOrderingMatchingRule() throws Exception
{
MatchingRule mr = new MatchingRule( "1.1" );
- mr.setSyntax( new BogusSyntax() );
+ mr.setSyntax( new BogusSyntax( 1 ) );
mr.setLdapComparator( new StringComparator() );
mr.setNormalizer( new NoOpNormalizer( "1.1" ) );
- AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
+ AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
- at.setSyntax( new BogusSyntax() );
+ at.setSyntax( new BogusSyntax( 2 ) );
at.setOrdering( mr );
registries.getAttributeTypeRegistry().register( at );
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=810459&r1=810458&r2=810459&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 Wed Sep 2 11:36:03 2009
@@ -49,6 +49,7 @@
import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.After;
+import org.junit.BeforeClass;
import org.junit.Test;import static org.junit.Assert.assertTrue;import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -73,18 +74,19 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
- public LessEqTest() throws Exception
+ @BeforeClass
+ public static void setup() throws Exception
{
// setup the standard registries
- String workingDirectory = System.getProperty( "workingDirectory" );
+ String workingDirectory = System.getProperty( "workingDirectory" );
if ( workingDirectory == null )
{
- String path = LessEqTest.class.getResource( "" ).getPath();
+ String path = AndCursorTest.class.getResource( "" ).getPath();
int targetPos = path.indexOf( "target" );
workingDirectory = path.substring( 0, targetPos + 6 );
}
@@ -101,7 +103,7 @@
attributeRegistry = registries.getAttributeTypeRegistry();
}
-
+
@Before
public void createStore() throws Exception
{
@@ -720,7 +722,7 @@
AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
- at.setSyntax( new BogusSyntax() );
+ at.setSyntax( new BogusSyntax( 1 ) );
registries.getAttributeTypeRegistry().register( at );
@@ -735,14 +737,14 @@
public void testEvaluatorAttributeOrderingMatchingRule() throws Exception
{
MatchingRule mr = new MatchingRule( "1.1" );
- mr.setSyntax( new BogusSyntax() );
+ mr.setSyntax( new BogusSyntax( 2 ) );
mr.setLdapComparator( new StringComparator() );
mr.setNormalizer( new NoOpNormalizer( "1.1" ) );
- AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
+ AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".3000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
- at.setSyntax( new BogusSyntax() );
+ at.setSyntax( new BogusSyntax(3) );
at.setOrdering( mr );
registries.getAttributeTypeRegistry().register( at );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Wed Sep 2 11:36:03 2009
@@ -42,6 +42,7 @@
import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -63,15 +64,15 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
EvaluatorBuilder evaluatorBuilder;
CursorBuilder cursorBuilder;
Optimizer optimizer;
- FilterNormalizingVisitor visitor;
+ static FilterNormalizingVisitor visitor;
-
- public NestedFilterTest() throws Exception
+ @BeforeClass
+ static public void setup() throws Exception
{
// setup the standard registries
String workingDirectory = System.getProperty( "workingDirectory" );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Wed Sep 2 11:36:03 2009
@@ -47,6 +47,7 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -67,12 +68,13 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
EvaluatorBuilder evaluatorBuilder;
CursorBuilder cursorBuilder;
- public NotCursorTest() throws Exception
+ @BeforeClass
+ static public void setup() throws Exception
{
// setup the standard registries
String workingDirectory = System.getProperty( "workingDirectory" );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Wed Sep 2 11:36:03 2009
@@ -46,6 +46,7 @@
import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.After;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -69,11 +70,12 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
- public OneLevelScopeTest() throws Exception
+ @BeforeClass
+ public static void setup() throws Exception
{
// setup the standard registries
String workingDirectory = System.getProperty( "workingDirectory" );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Wed Sep 2 11:36:03 2009
@@ -47,6 +47,7 @@
import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -74,12 +75,13 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
EvaluatorBuilder evaluatorBuilder;
CursorBuilder cursorBuilder;
- public OrCursorTest() throws Exception
+ @BeforeClass
+ public static void setup() throws Exception
{
String workingDirectory = System.getProperty( "workingDirectory" );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Wed Sep 2 11:36:03 2009
@@ -39,6 +39,7 @@
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -59,11 +60,12 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
- public PresenceTest() throws Exception
+ @BeforeClass
+ public static void setup() throws Exception
{
String workingDirectory = System.getProperty( "workingDirectory" );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Wed Sep 2 11:36:03 2009
@@ -39,6 +39,7 @@
import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.After;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -59,11 +60,12 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
- public SubstringTest() throws Exception
+ @BeforeClass
+ public static void setup() throws Exception
{
String workingDirectory = System.getProperty( "workingDirectory" );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=810459&r1=810458&r2=810459&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Wed Sep 2 11:36:03 2009
@@ -45,6 +45,7 @@
import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.After;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -69,11 +70,12 @@
File wkdir;
Store<ServerEntry> store;
- Registries registries = null;
- AttributeTypeRegistry attributeRegistry;
+ static Registries registries = null;
+ static AttributeTypeRegistry attributeRegistry;
- public SubtreeScopeTest() throws Exception
+ @BeforeClass
+ public static void setup() throws Exception
{
String workingDirectory = System.getProperty( "workingDirectory" );