directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r955186 [2/3] - in /directory/apacheds/trunk: ./ core-annotations/ core-annotations/src/test/java/org/apache/directory/server/core/factory/ core-api/ core-api/src/test/java/org/apache/directory/server/core/changelog/ core-api/src/test/java/...
Date Wed, 16 Jun 2010 10:46:21 GMT
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java Wed Jun 16 10:46:18 2010
@@ -28,6 +28,8 @@ import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.authz.support.MicroOperationFilter;
 import org.apache.directory.server.core.authz.support.OperationScope;
 import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -36,6 +38,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -43,6 +46,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class MicroOperationFilterTest
 {
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java Wed Jun 16 10:46:18 2010
@@ -32,6 +32,8 @@ import javax.naming.directory.Attribute;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.authz.support.MostSpecificProtectedItemFilter;
 import org.apache.directory.server.core.authz.support.OperationScope;
 import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -41,6 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -48,6 +51,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class MostSpecificProtectedItemFilterTest
 {
     private static final Set<String> EMPTY_STRING_COLLECTION = Collections.unmodifiableSet( new HashSet<String>() );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java Wed Jun 16 10:46:18 2010
@@ -30,6 +30,8 @@ import java.util.Set;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.authz.support.MostSpecificUserClassFilter;
 import org.apache.directory.server.core.authz.support.OperationScope;
 import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -40,6 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -47,6 +50,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class MostSpecificUserClassFilterTest
 {
     private static final Set<DN> EMPTY_NAME_SET = Collections.unmodifiableSet( new HashSet<DN>() );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java Wed Jun 16 10:46:18 2010
@@ -22,7 +22,10 @@ package org.apache.directory.server.core
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -31,6 +34,8 @@ import org.junit.Test;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  *
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class OperationScopeTest
 {
     @Test

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Wed Jun 16 10:46:18 2010
@@ -31,6 +31,8 @@ import java.util.Set;
 
 import javax.naming.directory.Attribute;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.server.core.event.ExpressionEvaluator;
 import org.apache.directory.server.core.subtree.RefinementEvaluator;
@@ -56,6 +58,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -63,6 +66,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class RelatedProtectedItemFilterTest
 {
     private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Wed Jun 16 10:46:18 2010
@@ -28,6 +28,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.subtree.SubtreeEvaluator;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
@@ -39,6 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -46,6 +49,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class RelatedUserClassFilterTest
 {
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Wed Jun 16 10:46:18 2010
@@ -29,6 +29,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -45,6 +47,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -52,6 +55,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class RestrictedByFilterTest
 {
     private static final Collection<UserClass> UC_EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Wed Jun 16 10:46:18 2010
@@ -32,6 +32,8 @@ import java.io.ObjectOutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -44,9 +46,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
 import org.apache.directory.shared.ldap.util.DateUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -54,15 +57,17 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class MemoryChangeLogStoreTest
 {
-    MemoryChangeLogStore store;
+    private static MemoryChangeLogStore store;
 
-    Map<String, OidNormalizer> oidsMap = new HashMap<String, OidNormalizer>();
+    private static Map<String, OidNormalizer> oidsMap = new HashMap<String, OidNormalizer>();
     
     
-    @Before
-    public void setUp() throws Exception
+    @BeforeClass
+    public static void setUp() throws Exception
     {
         store = new MemoryChangeLogStore();
 
@@ -84,8 +89,8 @@ public class MemoryChangeLogStoreTest
     }
 
 
-    @After
-    public void tearDown() throws Exception
+    @AfterClass
+    public static void tearDown() throws Exception
     {
         store = null;
     }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java Wed Jun 16 10:46:18 2010
@@ -27,6 +27,8 @@ import static org.junit.Assert.fail;
 
 import java.text.ParseException;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -39,6 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -47,6 +50,8 @@ import org.junit.Test;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  *
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class NormalizationVisitorTest
 {
     /** a filter node value normalizer and undefined node remover */

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java Wed Jun 16 10:46:18 2010
@@ -22,10 +22,13 @@ package org.apache.directory.server.core
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -33,6 +36,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class PreferencesUtilsTest
 {
     /**

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Wed Jun 16 10:46:18 2010
@@ -29,6 +29,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -50,6 +52,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -57,6 +60,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class SchemaCheckerTest
 {
     static SchemaManager schemaManager;

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Wed Jun 16 10:46:18 2010
@@ -28,6 +28,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -37,11 +39,14 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
  * Tests methods in SchemaInterceptor.
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class SchemaServiceTest
 {
     private static SchemaManager schemaManager;

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java Wed Jun 16 10:46:18 2010
@@ -28,6 +28,8 @@ import java.io.File;
 import java.security.KeyPair;
 import java.security.cert.X509Certificate;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -40,6 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,6 +52,8 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class TlsKeyGeneratorTest
 {
     private static final Logger LOG = LoggerFactory.getLogger( TlsKeyGeneratorTest.class );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java Wed Jun 16 10:46:18 2010
@@ -21,9 +21,15 @@
 
 package org.apache.directory.server.core.sp;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static org.junit.Assert.assertEquals;
 
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class StoredProcUtilsTest
 {
     @Test

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Wed Jun 16 10:46:18 2010
@@ -23,9 +23,11 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -37,10 +39,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -48,6 +50,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class RefinementEvaluatorTest
 {
     /** the registries */
@@ -82,15 +86,7 @@ public class RefinementEvaluatorTest
         }
 
         registries = sm.getRegistries();
-    }
-
 
-    /**
-     * Initializes registries and creates the leaf evalutator
-     * @throws Exception if there are schema initialization problems
-     */
-    @Before public void setUp() throws Exception
-    {
         OidRegistry registry = registries.getGlobalOidRegistry();
         RefinementLeafEvaluator leafEvaluator = new RefinementLeafEvaluator( registry );
         evaluator = new RefinementEvaluator( leafEvaluator );
@@ -103,8 +99,8 @@ public class RefinementEvaluatorTest
     /**
      * Sets evaluator and registries to null.
      */
-    @After 
-    public void tearDown()
+    @AfterClass 
+    public static void tearDown()
     {
         evaluator = null;
     }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Wed Jun 16 10:46:18 2010
@@ -24,9 +24,11 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
@@ -37,10 +39,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -48,6 +50,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class RefinementLeafEvaluatorTest
 {
     /** The ObjectClass AttributeType */
@@ -57,7 +61,7 @@ public class RefinementLeafEvaluatorTest
     private static Registries registries;
 
     /** the refinement leaf evaluator to test */
-    private RefinementLeafEvaluator evaluator;
+    private static RefinementLeafEvaluator evaluator;
 
 
     /**
@@ -81,26 +85,17 @@ public class RefinementLeafEvaluatorTest
         registries = sm.getRegistries();
         
         OBJECT_CLASS = registries.getAttributeTypeRegistry().lookup( "objectClass" );
-    }
-    
 
-    /**
-     * Initializes registries and creates the leaf evaluator
-     * @throws Exception if there are schema initialization problems
-     */
-    @Before 
-    public void setUp() throws Exception
-    {
         OidRegistry registry = registries.getGlobalOidRegistry();
         evaluator = new RefinementLeafEvaluator( registry );
     }
-
+    
 
     /**
      * Sets evaluator and registries to null.
      */
-    @After 
-    public void tearDown()
+    @AfterClass 
+    public static void tearDown()
     {
         evaluator = null;
     }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Wed Jun 16 10:46:18 2010
@@ -28,6 +28,8 @@ import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.normalization.FilterNormalizingVisitor;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -48,6 +50,7 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -55,12 +58,14 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class SubtreeEvaluatorTest
 {
     private static SchemaManager schemaManager;
-    private SubtreeEvaluator evaluator;
-    FilterNormalizingVisitor visitor;
-    static ConcreteNameComponentNormalizer ncn;
+    private static SubtreeEvaluator evaluator;
+    private static FilterNormalizingVisitor visitor;
+    private static ConcreteNameComponentNormalizer ncn;
 
 
     @BeforeClass
@@ -89,19 +94,14 @@ public class SubtreeEvaluatorTest
         }
 
         ncn = new ConcreteNameComponentNormalizer( schemaManager );
-    }
-
 
-    @Before
-    public void initTest()
-    {
         visitor = new FilterNormalizingVisitor( ncn, schemaManager );
         evaluator = new SubtreeEvaluator( schemaManager.getGlobalOidRegistry(), schemaManager );
     }
 
 
-    @After
-    public void destroyTest()
+    @AfterClass
+    public static void destroyTest()
     {
         visitor = null;
         evaluator = null;

Modified: directory/apacheds/trunk/default-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/default-config/pom.xml?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/default-config/pom.xml (original)
+++ directory/apacheds/trunk/default-config/pom.xml Wed Jun 16 10:46:18 2010
@@ -30,6 +30,12 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.directory.junit</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (original)
+++ directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java Wed Jun 16 10:46:18 2010
@@ -28,6 +28,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.partition.ldif.LdifPartition;
 import org.apache.directory.server.core.schema.SchemaPartition;
@@ -45,6 +47,7 @@ import org.apache.mina.util.AvailablePor
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -52,6 +55,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class ConfigPartitionReaderTest
 {
 

Modified: directory/apacheds/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/pom.xml?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/pom.xml (original)
+++ directory/apacheds/trunk/i18n/pom.xml Wed Jun 16 10:46:18 2010
@@ -30,6 +30,14 @@
   
   <description>Internationalization of errors and other messages</description>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.junit</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>

Modified: directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java (original)
+++ directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java Wed Jun 16 10:46:18 2010
@@ -25,8 +25,11 @@ import static org.junit.Assert.assertEqu
 
 import java.util.Locale;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -34,6 +37,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class GermanLanguageTest
 {
 

Modified: directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java (original)
+++ directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java Wed Jun 16 10:46:18 2010
@@ -23,7 +23,10 @@ package org.apache.directory.server.i18n
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -31,6 +34,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class InlineMessageTest
 {
 

Modified: directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java (original)
+++ directory/apacheds/trunk/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java Wed Jun 16 10:46:18 2010
@@ -25,8 +25,11 @@ import static org.junit.Assert.assertEqu
 
 import java.util.Locale;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -34,6 +37,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class UnknownLanguageTest
 {
 

Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Wed Jun 16 10:46:18 2010
@@ -34,6 +34,12 @@
   
   <dependencies>
     <dependency>
+      <groupId>org.apache.directory.junit</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java Wed Jun 16 10:46:18 2010
@@ -20,19 +20,20 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import org.apache.commons.lang.ArrayUtils;
-import org.junit.Test;
-import org.junit.Before;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-
-import java.util.Random;
 import java.io.IOException;
+import java.util.Random;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -40,27 +41,30 @@ import java.io.IOException;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class BTreeRedirectMarshallerTest
 {
-    byte[] bites = new byte[BTreeRedirectMarshaller.SIZE];
     BTreeRedirectMarshaller marshaller = new BTreeRedirectMarshaller();
 
 
-    @Before
-    public void setup()
+    private byte[] createBites()
     {
+        byte[] bites = new byte[BTreeRedirectMarshaller.SIZE];
         bites[0] = 1;
 
         for ( int ii = 8; ii < BTreeRedirectMarshaller.SIZE; ii++ )
         {
             bites[ii] = 0;
         }
+        return bites;
     }
 
 
     @Test
     public void testZero() throws IOException
     {
+        byte[] bites = createBites();
         assertEquals( 0, marshaller.deserialize( bites ).getRecId() );
         assertTrue( ArrayUtils.isEquals( bites, marshaller.serialize( new BTreeRedirect( 0 ) ) ) );
     }
@@ -69,6 +73,7 @@ public class BTreeRedirectMarshallerTest
     @Test
     public void testOne() throws IOException
     {
+        byte[] bites = createBites();
         bites[8] = 1;
         assertEquals( 1, marshaller.deserialize( bites ).getRecId() );
         assertTrue( ArrayUtils.isEquals( bites, marshaller.serialize( new BTreeRedirect( 1 ) ) ) );
@@ -78,6 +83,7 @@ public class BTreeRedirectMarshallerTest
     @Test
     public void testNegativeOne() throws IOException
     {
+        byte[] bites = createBites();
         for ( int ii = 1; ii < BTreeRedirectMarshaller.SIZE; ii++ )
         {
             bites[ii] =  ( byte ) 0xFF;
@@ -91,6 +97,7 @@ public class BTreeRedirectMarshallerTest
     @Test
     public void testLongMinValue() throws IOException
     {
+        byte[] bites = createBites();
         bites[1] = ( byte ) 0x80;
         assertEquals( Long.MIN_VALUE, marshaller.deserialize( bites ).getRecId() );
         assertTrue( ArrayUtils.isEquals( bites, marshaller.serialize( new BTreeRedirect( Long.MIN_VALUE ) ) ) );
@@ -100,6 +107,7 @@ public class BTreeRedirectMarshallerTest
     @Test
     public void testLongMaxValue() throws IOException
     {
+        byte[] bites = createBites();
         bites[1] = ( byte ) 0x7F;
 
         for ( int ii = 2; ii < BTreeRedirectMarshaller.SIZE; ii++ )
@@ -115,6 +123,7 @@ public class BTreeRedirectMarshallerTest
     @Test
     public void testRoundTripTests() throws IOException
     {
+        byte[] bites = createBites();
         Random random = new Random();
         for ( int ii = 0; ii < 100; ii++ )
         {

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java Wed Jun 16 10:46:18 2010
@@ -24,11 +24,14 @@ import static junit.framework.Assert.ass
 
 import java.util.Comparator;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.core.avltree.ArrayTree;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * 
@@ -36,11 +39,12 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class KeyTupleArrayCursorTest
 {
 
     ArrayTree<Integer> tree;
-    Comparator<Integer> comparator;
     KeyTupleArrayCursor<Integer, Integer> cursor;
     
     private static final Integer KEY = Integer.valueOf( 1 );
@@ -48,8 +52,8 @@ public class KeyTupleArrayCursorTest
     @Before
     public void createTree()
     {
-      comparator = new Comparator<Integer>() 
-      {
+        Comparator<Integer> comparator = new Comparator<Integer>() 
+        {
 
           public int compare( Integer i1, Integer i2 )
           {

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Wed Jun 16 10:46:18 2010
@@ -28,6 +28,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
@@ -45,6 +47,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -52,6 +55,8 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class ServerEntrySerializerTest
 {
     private static LdifSchemaLoader loader;

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java Wed Jun 16 10:46:18 2010
@@ -22,13 +22,19 @@ package org.apache.directory.server.core
 import java.io.IOException;
 
 import org.apache.commons.lang.RandomStringUtils;
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static org.junit.Assert.assertEquals;
 
 /**
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class StringSerializerTest
 {
     @Test

Modified: directory/apacheds/trunk/jdbm/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/pom.xml?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/pom.xml (original)
+++ directory/apacheds/trunk/jdbm/pom.xml Wed Jun 16 10:46:18 2010
@@ -32,6 +32,12 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.directory.junit</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-i18n</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/jdbm/src/test/java/jdbm/btree/TestBTree.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/test/java/jdbm/btree/TestBTree.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/test/java/jdbm/btree/TestBTree.java (original)
+++ directory/apacheds/trunk/jdbm/src/test/java/jdbm/btree/TestBTree.java Wed Jun 16 10:46:18 2010
@@ -47,30 +47,33 @@
 package jdbm.btree;
 
 
-import jdbm.RecordManager;
-import jdbm.RecordManagerFactory;
-import jdbm.helper.ByteArrayComparator;
-import jdbm.helper.StringComparator;
-import jdbm.helper.TupleBrowser;
-import jdbm.helper.Tuple;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.Iterator;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import jdbm.RecordManager;
+import jdbm.RecordManagerFactory;
+import jdbm.helper.ByteArrayComparator;
+import jdbm.helper.StringComparator;
+import jdbm.helper.Tuple;
+import jdbm.helper.TupleBrowser;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -78,6 +81,8 @@ import static org.junit.Assert.assertNul
  *
  *  @author <a href="mailto:boisvert@exoffice.com">Alex Boisvert</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class TestBTree
 {
     static final boolean DEBUG = false;
@@ -92,9 +97,10 @@ public class TestBTree
     // for how long should the threads run.
     static final int THREAD_RUNTIME = 10 * 1000;
 
-    public final static String testFileName = "test";
+    public static final List<String> createdFiles = new ArrayList<String>();
+    
 
-    public static void deleteFile( String filename )
+    private static void deleteFile( String filename )
     {
         File file = new File( filename );
 
@@ -116,26 +122,16 @@ public class TestBTree
     }
 
     
-    public static void deleteTestFile()
+    @AfterClass
+    public static void tearDown()
     {
         System.gc();
-        deleteFile( testFileName);
-        deleteFile( testFileName + ".db" );
-        deleteFile( testFileName + ".lg" );
-    }
-
-    
-    @Before
-    public void setUp()
-    {
-        deleteTestFile();
-    }
-
-
-    @After
-    public void tearDown()
-    {
-        deleteTestFile();
+        for(String createdFile : createdFiles)
+        {
+            deleteFile( createdFile );
+            deleteFile( createdFile + ".db" );
+            deleteFile( createdFile + ".lg" );
+        }
     }
 
 
@@ -155,7 +151,8 @@ public class TestBTree
         byte[] value1 = "value1".getBytes();
         byte[] value2 = "value2".getBytes();
 
-        recman = RecordManagerFactory.createRecordManager( "test" );
+        recman = RecordManagerFactory.createRecordManager( "testBasics" );
+        createdFiles.add( "testBasics" );
         tree = new BTree<byte[], byte[]>( recman, new ByteArrayComparator() );
         
         tree.insert( test1, value1, false );
@@ -196,7 +193,8 @@ public class TestBTree
         byte[] value1 = "value1".getBytes();
         byte[] value2 = "value2".getBytes();
 
-        recman = RecordManagerFactory.createRecordManager( "test" );
+        recman = RecordManagerFactory.createRecordManager( "testBasics2" );
+        createdFiles.add( "testBasics2" );
         tree = new BTree<byte[], byte[]>( recman, new ByteArrayComparator() );
 
         tree.insert( test1, value1, false );
@@ -228,7 +226,8 @@ public class TestBTree
         byte[] value1 = "value1".getBytes();
         byte[] value2 = "value2".getBytes();
 
-        recman = RecordManagerFactory.createRecordManager( "test" );
+        recman = RecordManagerFactory.createRecordManager( "testClose" );
+        createdFiles.add( "testClose" );
         tree = new BTree<byte[], byte[]>( recman, new ByteArrayComparator() );
 
         tree.insert( test1, value1, false );
@@ -302,7 +301,8 @@ public class TestBTree
         RecordManager recman;
         BTree<String, Object> tree;
 
-        recman = RecordManagerFactory.createRecordManager( "test" );
+        recman = RecordManagerFactory.createRecordManager( "testInsert" );
+        createdFiles.add( "testInsert" );
         tree = new BTree<String, Object>( recman, new StringComparator() );
 
         // insert different objects and retrieve them
@@ -341,7 +341,8 @@ public class TestBTree
     {
         BTree<String, String> tree;
 
-        RecordManager recordManager = RecordManagerFactory.createRecordManager( "test" );
+        RecordManager recordManager = RecordManagerFactory.createRecordManager( "testInsertMany" );
+        createdFiles.add( "testInsertMany" );
         tree = new BTree<String, String>( recordManager, new StringComparator() );
         tree.setPageSize( 4 );
 
@@ -369,7 +370,8 @@ public class TestBTree
         RecordManager recman;
         BTree<String, Object> tree;
 
-        recman = RecordManagerFactory.createRecordManager( "test" );
+        recman = RecordManagerFactory.createRecordManager( "testRemove" );
+        createdFiles.add( "testRemove" );
         tree = new BTree<String, Object>( recman, new StringComparator() );
 
         tree.insert( "test1", "value1", false );
@@ -421,7 +423,8 @@ public class TestBTree
         RecordManager recman;
         BTree<String, String> tree;
 
-        recman = RecordManagerFactory.createRecordManager( "test" );
+        recman = RecordManagerFactory.createRecordManager( "testFind" );
+        createdFiles.add( "testFind" );
         tree = new BTree<String, String>( recman, new StringComparator() );
 
         tree.insert( "test1", "value1", false );
@@ -450,7 +453,8 @@ public class TestBTree
         RecordManager recman;
         BTree<String, Object> tree;
 
-        recman = RecordManagerFactory.createRecordManager( "test" );
+        recman = RecordManagerFactory.createRecordManager( "testLargeDataAmount" );
+        createdFiles.add( "testLargeDataAmount" );
 
         // recman = new jdbm.recman.BaseRecordManager( "test" );
         tree = new BTree<String, Object>( recman, new StringComparator() );
@@ -492,7 +496,8 @@ public class TestBTree
         RecordManager recman;
         BTree<String, Integer> tree;
 
-        recman = RecordManagerFactory.createRecordManager( "test" );
+        recman = RecordManagerFactory.createRecordManager( "testMultithreadAccess" );
+        createdFiles.add( "testMultithreadAccess" );
         tree = new BTree<String, Integer>( recman, new StringComparator() );
         TestThread<String, Integer>[] threadPool = (TestThread<String, Integer>[])new TestThread[THREAD_NUMBER];
         String name;

Modified: directory/apacheds/trunk/jdbm/src/test/java/jdbm/recman/LocationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/test/java/jdbm/recman/LocationTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/test/java/jdbm/recman/LocationTest.java (original)
+++ directory/apacheds/trunk/jdbm/src/test/java/jdbm/recman/LocationTest.java Wed Jun 16 10:46:18 2010
@@ -23,9 +23,12 @@ package jdbm.recman;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import org.junit.Before;
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -33,29 +36,29 @@ import org.junit.Test;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class LocationTest
 {
-    Location clonedServerEntryA;
-    Location clonedServerEntryACopy;
-    Location clonedServerEntryB;
-    Location clonedServerEntryC;
-    Location clonedServerEntryA1;
-    Location clonedServerEntryACopy1;
-    Location clonedServerEntryB1;
-    Location clonedServerEntryC1;
-    Location clonedServerEntryD1;
+    private static Location clonedServerEntryA;
+    private static Location clonedServerEntryACopy;
+    private static Location clonedServerEntryB;
+    private static Location clonedServerEntryA1;
+    private static Location clonedServerEntryACopy1;
+    private static Location clonedServerEntryB1;
+    private static Location clonedServerEntryC1;
+    private static Location clonedServerEntryD1;
 
 
     /**
      * Initialize name instances
      */
-    @Before
-    public void initNames() throws Exception
+    @BeforeClass
+    public static void initNames() throws Exception
     {
         clonedServerEntryA = new Location( 1L );
         clonedServerEntryACopy = new Location( 1L );
         clonedServerEntryB = new Location( 1L );
-        clonedServerEntryC = new Location( 2L );
         clonedServerEntryA1 = new Location( 1L, ( short ) 1 );
         clonedServerEntryACopy1 = new Location( 1L, ( short ) 1 );
         clonedServerEntryB1 = new Location( 1L, ( short ) 1 );

Modified: directory/apacheds/trunk/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/pom.xml?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-shared/pom.xml Wed Jun 16 10:46:18 2010
@@ -32,6 +32,12 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.directory.junit</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core-api</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java Wed Jun 16 10:46:18 2010
@@ -19,24 +19,29 @@
  */
 package org.apache.directory.server.kerberos.shared;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.List;
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.directory.server.kerberos.shared.KerberosUtils;
-import org.junit.Before;
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.runner.RunWith;
 
 /**
  * Test the KerberosUtils class
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class KerberosUtilsTest
 {
-    @Before
-    public void setUp()
+    @BeforeClass
+    public static void setUp()
     {
         // First setup a default realm
         System.setProperty( "java.security.krb5.realm", "APACHE.ORG" );

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesEncryptionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesEncryptionTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesEncryptionTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesEncryptionTest.java Wed Jun 16 10:46:18 2010
@@ -29,7 +29,10 @@ import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -40,21 +43,23 @@ import static org.junit.Assert.assertTru
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class AesEncryptionTest
 {
-    private byte[] keyBytes =
+    private static final byte[] KEY_BYTES =
         { ( byte ) 0x63, ( byte ) 0x68, ( byte ) 0x69, ( byte ) 0x63, ( byte ) 0x6b, ( byte ) 0x65, ( byte ) 0x6e,
             ( byte ) 0x20, ( byte ) 0x74, ( byte ) 0x65, ( byte ) 0x72, ( byte ) 0x69, ( byte ) 0x79, ( byte ) 0x61,
             ( byte ) 0x6b, ( byte ) 0x69 };
 
-    private SecretKey key = new SecretKeySpec( keyBytes, "AES" );
+    private static final SecretKey KEY = new SecretKeySpec( KEY_BYTES, "AES" );
 
-    private byte[] iv =
+    private static final byte[] IV =
         { ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
             ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
             ( byte ) 0x00, ( byte ) 0x00, };
 
-    private AlgorithmParameterSpec paramSpec = new IvParameterSpec( iv );
+    private static AlgorithmParameterSpec PARAM_SPEC = new IvParameterSpec( IV );
 
 
     /**
@@ -79,7 +84,7 @@ public class AesEncryptionTest
                 ( byte ) 0xb4, ( byte ) 0xd8, ( byte ) 0xa5, ( byte ) 0x80, ( byte ) 0x36, ( byte ) 0x2d,
                 ( byte ) 0xa7, ( byte ) 0xff, ( byte ) 0x7f, ( byte ) 0x97 };
 
-        byte[] result = aesCipher( key, input );
+        byte[] result = aesCipher( KEY, input );
 
         assertEquals( "Length", input.length, result.length );
         assertTrue( Arrays.equals( output, result ) );
@@ -124,7 +129,7 @@ public class AesEncryptionTest
                 ( byte ) 0xc0, ( byte ) 0x3b, ( byte ) 0xc1, ( byte ) 0x03, ( byte ) 0xe1, ( byte ) 0xa1,
                 ( byte ) 0x94, ( byte ) 0xbb, ( byte ) 0xd8 };
 
-        byte[] result = aesCipher( key, input );
+        byte[] result = aesCipher( KEY, input );
 
         assertEquals( "Length", input.length, result.length );
         assertTrue( Arrays.equals( output, result ) );
@@ -136,7 +141,7 @@ public class AesEncryptionTest
         try
         {
             Cipher ecipher = Cipher.getInstance( "AES/CTS/NoPadding" );
-            ecipher.init( Cipher.ENCRYPT_MODE, key, paramSpec );
+            ecipher.init( Cipher.ENCRYPT_MODE, key, PARAM_SPEC );
             return ecipher.doFinal( input );
         }
         catch ( GeneralSecurityException gse )

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java Wed Jun 16 10:46:18 2010
@@ -28,12 +28,16 @@ import java.util.TimeZone;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -43,9 +47,11 @@ import static org.junit.Assert.fail;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class CipherTextHandlerTest
 {
-    private byte[] desEncryptedTimeStamp =
+    private static final byte[] DES_ENCRYPTED_TIME_STAMP =
         { ( byte ) 0x97, ( byte ) 0x21, ( byte ) 0x58, ( byte ) 0x5f, ( byte ) 0x81, ( byte ) 0x46, ( byte ) 0x17,
             ( byte ) 0xa6, ( byte ) 0x4e, ( byte ) 0x8a, ( byte ) 0x5d, ( byte ) 0xe2, ( byte ) 0xf3, ( byte ) 0xd1,
             ( byte ) 0x40, ( byte ) 0x30, ( byte ) 0x38, ( byte ) 0x5e, ( byte ) 0xb8, ( byte ) 0xf6, ( byte ) 0xad,
@@ -55,7 +61,7 @@ public class CipherTextHandlerTest
             ( byte ) 0xb2, ( byte ) 0xb7, ( byte ) 0x95, ( byte ) 0x22, ( byte ) 0x93, ( byte ) 0x12, ( byte ) 0x63,
             ( byte ) 0xd5, ( byte ) 0xf4, ( byte ) 0x39, ( byte ) 0xfa, ( byte ) 0x27, ( byte ) 0x6e, ( byte ) 0x8e };
 
-    private byte[] tripleDesEncryptedTimeStamp =
+    private static final byte[] TRIPLE_DES_ENCRYPTED_TIME_STAMP =
         { ( byte ) 0x96, ( byte ) 0xcb, ( byte ) 0x38, ( byte ) 0xb3, ( byte ) 0xc9, ( byte ) 0xb5, ( byte ) 0x78,
             ( byte ) 0x17, ( byte ) 0xba, ( byte ) 0x0a, ( byte ) 0x64, ( byte ) 0x49, ( byte ) 0x18, ( byte ) 0x39,
             ( byte ) 0x57, ( byte ) 0x1e, ( byte ) 0xcf, ( byte ) 0xfc, ( byte ) 0x6e, ( byte ) 0x0f, ( byte ) 0x53,
@@ -66,7 +72,7 @@ public class CipherTextHandlerTest
             ( byte ) 0x37, ( byte ) 0xd8, ( byte ) 0x47, ( byte ) 0x1e, ( byte ) 0xa0, ( byte ) 0x16, ( byte ) 0x70,
             ( byte ) 0x5f, ( byte ) 0x6b, ( byte ) 0x18, ( byte ) 0xf3 };
 
-    private byte[] aes128EncryptedTimeStamp =
+    private static final byte[] AES128_ENCRYPTED_TIME_STAMP =
         { ( byte ) 0x4f, ( byte ) 0x1e, ( byte ) 0x52, ( byte ) 0xf5, ( byte ) 0xe0, ( byte ) 0xee, ( byte ) 0xe5,
             ( byte ) 0xe2, ( byte ) 0x2c, ( byte ) 0x9b, ( byte ) 0xf4, ( byte ) 0xdc, ( byte ) 0x58, ( byte ) 0x5f,
             ( byte ) 0x00, ( byte ) 0x96, ( byte ) 0x31, ( byte ) 0xfe, ( byte ) 0xc7, ( byte ) 0xf7, ( byte ) 0x89,
@@ -76,7 +82,7 @@ public class CipherTextHandlerTest
             ( byte ) 0xd7, ( byte ) 0xed, ( byte ) 0xe1, ( byte ) 0xe0, ( byte ) 0x0c, ( byte ) 0xad, ( byte ) 0xe5,
             ( byte ) 0x06, ( byte ) 0xbf, ( byte ) 0x30, ( byte ) 0x1e, ( byte ) 0xbf, ( byte ) 0xf2, ( byte ) 0xec };
 
-    private byte[] aes256EncryptedTimeStamp =
+    private static final byte[] AES256_ENCRYPTED_TIME_STAMP =
         { ( byte ) 0xa8, ( byte ) 0x40, ( byte ) 0x73, ( byte ) 0xfc, ( byte ) 0xe5, ( byte ) 0x45, ( byte ) 0x66,
             ( byte ) 0xd6, ( byte ) 0x83, ( byte ) 0xb4, ( byte ) 0xed, ( byte ) 0xb6, ( byte ) 0x18, ( byte ) 0x5a,
             ( byte ) 0xd2, ( byte ) 0x24, ( byte ) 0xd6, ( byte ) 0xef, ( byte ) 0x38, ( byte ) 0xac, ( byte ) 0xdf,
@@ -86,7 +92,7 @@ public class CipherTextHandlerTest
             ( byte ) 0x63, ( byte ) 0xba, ( byte ) 0xea, ( byte ) 0xb7, ( byte ) 0x1a, ( byte ) 0x90, ( byte ) 0x7b,
             ( byte ) 0xf4, ( byte ) 0x89, ( byte ) 0x94, ( byte ) 0x7a, ( byte ) 0x2d, ( byte ) 0x6a, ( byte ) 0xf1 };
 
-    private byte[] arcfourEncryptedTimeStamp =
+    private static final byte[] ARCFOUR_ENCRYPTED_TIME_STAMP =
         { ( byte ) 0xa2, ( byte ) 0x4f, ( byte ) 0x04, ( byte ) 0x6d, ( byte ) 0x93, ( byte ) 0x31, ( byte ) 0x19,
             ( byte ) 0x77, ( byte ) 0x3f, ( byte ) 0x9d, ( byte ) 0xf9, ( byte ) 0x6f, ( byte ) 0x7e, ( byte ) 0x86,
             ( byte ) 0x2c, ( byte ) 0x99, ( byte ) 0x63, ( byte ) 0xc5, ( byte ) 0xcf, ( byte ) 0xe2, ( byte ) 0xf1,
@@ -114,11 +120,11 @@ public class CipherTextHandlerTest
     @Test
     public void testTestVectorLengths()
     {
-        assertEquals( "DES length", 56, desEncryptedTimeStamp.length );
-        assertEquals( "DES3 length", 60, tripleDesEncryptedTimeStamp.length );
-        assertEquals( "AES128 length", 56, aes128EncryptedTimeStamp.length );
-        assertEquals( "AES256 length", 56, aes256EncryptedTimeStamp.length );
-        assertEquals( "RC4-HMAC length", 52, arcfourEncryptedTimeStamp.length );
+        assertEquals( "DES length", 56, DES_ENCRYPTED_TIME_STAMP.length );
+        assertEquals( "DES3 length", 60, TRIPLE_DES_ENCRYPTED_TIME_STAMP.length );
+        assertEquals( "AES128 length", 56, AES128_ENCRYPTED_TIME_STAMP.length );
+        assertEquals( "AES256 length", 56, AES256_ENCRYPTED_TIME_STAMP.length );
+        assertEquals( "RC4-HMAC length", 52, ARCFOUR_ENCRYPTED_TIME_STAMP.length );
     }
 
 
@@ -131,11 +137,11 @@ public class CipherTextHandlerTest
     public void testDesGoodPasswordDecrypt()
     {
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class hint = EncryptedTimeStamp.class;
+        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
         KerberosPrincipal principal = new KerberosPrincipal( "erodriguez@EXAMPLE.COM" );
         KerberosKey kerberosKey = new KerberosKey( principal, "kerby".toCharArray(), "DES" );
         EncryptionKey key = new EncryptionKey( EncryptionType.DES_CBC_MD5, kerberosKey.getEncoded() );
-        EncryptedData data = new EncryptedData( EncryptionType.DES_CBC_MD5, 0, desEncryptedTimeStamp );
+        EncryptedData data = new EncryptedData( EncryptionType.DES_CBC_MD5, 0, DES_ENCRYPTED_TIME_STAMP );
 
         try
         {
@@ -158,11 +164,11 @@ public class CipherTextHandlerTest
     public void testDesBadPasswordDecrypt()
     {
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class hint = EncryptedTimeStamp.class;
+        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
         KerberosPrincipal principal = new KerberosPrincipal( "erodriguez@EXAMPLE.COM" );
         KerberosKey kerberosKey = new KerberosKey( principal, "badpassword".toCharArray(), "DES" );
         EncryptionKey key = new EncryptionKey( EncryptionType.DES_CBC_MD5, kerberosKey.getEncoded() );
-        EncryptedData data = new EncryptedData( EncryptionType.DES_CBC_MD5, 0, desEncryptedTimeStamp );
+        EncryptedData data = new EncryptedData( EncryptionType.DES_CBC_MD5, 0, DES_ENCRYPTED_TIME_STAMP );
 
         try
         {
@@ -185,12 +191,12 @@ public class CipherTextHandlerTest
     public void testTripleDesGoodPasswordDecrypt()
     {
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class hint = EncryptedTimeStamp.class;
+        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
         KerberosPrincipal principal = new KerberosPrincipal( "hnelson@EXAMPLE.COM" );
         String algorithm = VendorHelper.getTripleDesAlgorithm();
         KerberosKey kerberosKey = new KerberosKey( principal, "secret".toCharArray(), algorithm );
         EncryptionKey key = new EncryptionKey( EncryptionType.DES3_CBC_SHA1_KD, kerberosKey.getEncoded() );
-        EncryptedData data = new EncryptedData( EncryptionType.DES3_CBC_SHA1_KD, 0, tripleDesEncryptedTimeStamp );
+        EncryptedData data = new EncryptedData( EncryptionType.DES3_CBC_SHA1_KD, 0, TRIPLE_DES_ENCRYPTED_TIME_STAMP );
 
         try
         {
@@ -236,7 +242,7 @@ public class CipherTextHandlerTest
             fail( "Should not have caught exception." );
         }
 
-        Class hint = EncryptedTimeStamp.class;
+        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
 
         try
         {
@@ -266,11 +272,11 @@ public class CipherTextHandlerTest
         }
 
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class hint = EncryptedTimeStamp.class;
+        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
         KerberosPrincipal principal = new KerberosPrincipal( "hnelson@EXAMPLE.COM" );
         KerberosKey kerberosKey = new KerberosKey( principal, "secret".toCharArray(), "AES128" );
         EncryptionKey key = new EncryptionKey( EncryptionType.AES128_CTS_HMAC_SHA1_96, kerberosKey.getEncoded() );
-        EncryptedData data = new EncryptedData( EncryptionType.AES128_CTS_HMAC_SHA1_96, 0, aes128EncryptedTimeStamp );
+        EncryptedData data = new EncryptedData( EncryptionType.AES128_CTS_HMAC_SHA1_96, 0, AES128_ENCRYPTED_TIME_STAMP );
 
         try
         {
@@ -320,7 +326,7 @@ public class CipherTextHandlerTest
             fail( "Should not have caught exception." );
         }
 
-        Class hint = EncryptedTimeStamp.class;
+        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
 
         try
         {
@@ -350,7 +356,7 @@ public class CipherTextHandlerTest
         }
 
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class hint = EncryptedTimeStamp.class;
+        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
 
         KerberosKey kerberosKey;
 
@@ -366,7 +372,7 @@ public class CipherTextHandlerTest
         }
 
         EncryptionKey key = new EncryptionKey( EncryptionType.AES256_CTS_HMAC_SHA1_96, kerberosKey.getEncoded() );
-        EncryptedData data = new EncryptedData( EncryptionType.AES256_CTS_HMAC_SHA1_96, 0, aes256EncryptedTimeStamp );
+        EncryptedData data = new EncryptedData( EncryptionType.AES256_CTS_HMAC_SHA1_96, 0, AES256_ENCRYPTED_TIME_STAMP );
 
         try
         {
@@ -428,7 +434,7 @@ public class CipherTextHandlerTest
             fail( "Should not have caught exception." );
         }
 
-        Class hint = EncryptedTimeStamp.class;
+        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
 
         try
         {

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryptionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryptionTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryptionTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryptionTest.java Wed Jun 16 10:46:18 2010
@@ -25,7 +25,11 @@ import java.util.Arrays;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -36,9 +40,11 @@ import static org.junit.Assert.assertTru
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class Des3CbcSha1KdEncryptionTest
 {
-    private Des3CbcSha1KdEncryption keyDerivationFunction = new Des3CbcSha1KdEncryption();
+    private static final Des3CbcSha1KdEncryption keyDerivationFunction = new Des3CbcSha1KdEncryption();
 
 
     /**

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryptionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryptionTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryptionTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryptionTest.java Wed Jun 16 10:46:18 2010
@@ -23,9 +23,13 @@ package org.apache.directory.server.kerb
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static org.junit.Assert.assertTrue;
 
 
@@ -34,6 +38,8 @@ import static org.junit.Assert.assertTru
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class DesCbcCrcEncryptionTest
 {
     private static final char[] PASSWORD = "password".toCharArray();

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5EncryptionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5EncryptionTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5EncryptionTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5EncryptionTest.java Wed Jun 16 10:46:18 2010
@@ -23,9 +23,13 @@ package org.apache.directory.server.kerb
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static org.junit.Assert.assertTrue;
 
 
@@ -34,6 +38,8 @@ import static org.junit.Assert.assertTru
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class DesCbcMd5EncryptionTest
 {
     private static final char[] PASSWORD = "password".toCharArray();

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKeyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKeyTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKeyTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKeyTest.java Wed Jun 16 10:46:18 2010
@@ -25,7 +25,10 @@ import java.util.Arrays;
 
 import javax.crypto.spec.DESKeySpec;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertTrue;
 
@@ -36,29 +39,31 @@ import static org.junit.Assert.assertTru
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class DesStringToKeyTest
 {
-    private byte[] fanFold1 =
+    private static final byte[] FAN_FOLD1 =
         { ( byte ) 0xC0, ( byte ) 0x1E, ( byte ) 0x38, ( byte ) 0x68, ( byte ) 0x8A, ( byte ) 0xC8, ( byte ) 0x6C,
             ( byte ) 0x2E };
-    private byte[] intermediateKey1 =
+    private static final byte[] INTERMEDIATE_KEY1 =
         { ( byte ) 0xC1, ( byte ) 0x1F, ( byte ) 0x38, ( byte ) 0x68, ( byte ) 0x8A, ( byte ) 0xC8, ( byte ) 0x6D,
             ( byte ) 0x2F };
-    private byte[] desKey1 =
+    private static final byte[] DES_KEY1 =
         { ( byte ) 0xCB, ( byte ) 0xC2, ( byte ) 0x2F, ( byte ) 0xAE, ( byte ) 0x23, ( byte ) 0x52, ( byte ) 0x98,
             ( byte ) 0xE3 };
 
-    private byte[] fanFold2 =
+    private static final byte[] FAN_FOLD2 =
         { ( byte ) 0xA0, ( byte ) 0x28, ( byte ) 0x94, ( byte ) 0x4E, ( byte ) 0xE6, ( byte ) 0x3C, ( byte ) 0x04,
             ( byte ) 0x16 };
-    private byte[] intermediateKey2 =
+    private static final byte[] INTERMEDIATE_KEY2 =
         { ( byte ) 0xA1, ( byte ) 0x29, ( byte ) 0x94, ( byte ) 0x4F, ( byte ) 0xE6, ( byte ) 0x3D, ( byte ) 0x04,
             ( byte ) 0x16 };
-    private byte[] desKey2 =
+    private static final byte[] DES_KEY2 =
         { ( byte ) 0xDF, ( byte ) 0x3D, ( byte ) 0x32, ( byte ) 0xA7, ( byte ) 0x4F, ( byte ) 0xD9, ( byte ) 0x2A,
             ( byte ) 0x01 };
 
-    private DesStringToKey stringToKey = new DesStringToKey();
+    private static final DesStringToKey stringToKey = new DesStringToKey();
 
 
     /**
@@ -69,7 +74,7 @@ public class DesStringToKeyTest
     {
         byte[] key = stringToKey.getKey( "password", "ATHENA.MIT.EDU", "raeburn" );
 
-        assertTrue( "Key match", Arrays.equals( desKey1, key ) );
+        assertTrue( "Key match", Arrays.equals( DES_KEY1, key ) );
     }
 
 
@@ -81,7 +86,7 @@ public class DesStringToKeyTest
     {
         byte[] key = stringToKey.getKey( "potatoe", "WHITEHOUSE.GOV", "danny" );
 
-        assertTrue( "Key match", Arrays.equals( desKey2, key ) );
+        assertTrue( "Key match", Arrays.equals( DES_KEY2, key ) );
     }
 
 
@@ -99,13 +104,13 @@ public class DesStringToKeyTest
         byte[] paddedByteArray = stringToKey.padString( encodedByteArray );
         byte[] fanFold = stringToKey.fanFold( paddedByteArray );
 
-        assertTrue( "Key match", Arrays.equals( fanFold1, fanFold ) );
+        assertTrue( "Key match", Arrays.equals( FAN_FOLD1, fanFold ) );
 
         fanFold = stringToKey.setParity( fanFold );
-        assertTrue( "Key match", Arrays.equals( intermediateKey1, fanFold ) );
+        assertTrue( "Key match", Arrays.equals( INTERMEDIATE_KEY1, fanFold ) );
 
         byte[] secretKey = getDesKey( paddedByteArray, fanFold );
-        assertTrue( "Key match", Arrays.equals( desKey1, secretKey ) );
+        assertTrue( "Key match", Arrays.equals( DES_KEY1, secretKey ) );
     }
 
 
@@ -123,13 +128,13 @@ public class DesStringToKeyTest
         byte[] paddedByteArray = stringToKey.padString( encodedByteArray );
         byte[] fanFold = stringToKey.fanFold( paddedByteArray );
 
-        assertTrue( "Key match", Arrays.equals( fanFold2, fanFold ) );
+        assertTrue( "Key match", Arrays.equals( FAN_FOLD2, fanFold ) );
 
         fanFold = stringToKey.setParity( fanFold );
-        assertTrue( "Key match", Arrays.equals( intermediateKey2, fanFold ) );
+        assertTrue( "Key match", Arrays.equals( INTERMEDIATE_KEY2, fanFold ) );
 
         byte[] secretKey = getDesKey( paddedByteArray, fanFold );
-        assertTrue( "Key match", Arrays.equals( desKey2, secretKey ) );
+        assertTrue( "Key match", Arrays.equals( DES_KEY2, secretKey ) );
     }
 
 

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactoryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactoryTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactoryTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactoryTest.java Wed Jun 16 10:46:18 2010
@@ -28,8 +28,12 @@ import java.util.Set;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -40,6 +44,8 @@ import static org.junit.Assert.assertTru
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class KerberosKeyFactoryTest
 {
     /**

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyTypeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyTypeTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyTypeTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyTypeTest.java Wed Jun 16 10:46:18 2010
@@ -36,7 +36,10 @@ import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.DESKeySpec;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -58,6 +61,8 @@ import static org.junit.Assert.assertTru
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class KeyTypeTest
 {
     /**

Modified: directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFoldTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFoldTest.java?rev=955186&r1=955185&r2=955186&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFoldTest.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFoldTest.java Wed Jun 16 10:46:18 2010
@@ -22,7 +22,11 @@ package org.apache.directory.server.kerb
 
 import java.util.Arrays;
 
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -33,6 +37,8 @@ import static org.junit.Assert.assertTru
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
 public class NFoldTest
 {
     /**



Mime
View raw message