You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/02/08 01:06:44 UTC
svn commit: r1068231 [7/7] - in /directory/shared/branches/m1: ./ all/
asn1-api/ asn1-api/src/test/java/org/apache/directory/shared/asn1/util/
asn1-ber/ asn1-ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/
dsml-parser/ dsml-parser/src/main/...
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java Tue Feb 8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
import org.junit.Before;
import org.junit.Test;
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ProtectedItem_MaxImmSubTest
{
MaxImmSubItem maxValueCountA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java Tue Feb 8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ProtectedItem_MaxValueCountTest
{
MaxValueCountItem maxValueCountA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java Tue Feb 8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem;
import org.apache.directory.shared.ldap.model.filter.ExprNode;
import org.apache.directory.shared.ldap.model.filter.FilterParser;
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ProtectedItem_RangeOfValuesTest
{
RangeOfValuesItem rangeOfValuesA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java Tue Feb 8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ProtectedItem_RestrictedByTest
{
RestrictedByItem restrictedByA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java Tue Feb 8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.junit.Before;
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ProtectedItem_SelfValueTest
{
SelfValueItem selfValueA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java Tue Feb 8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.UserClass.Name;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class UserClass_NameTest
{
private Name nameA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java Tue Feb 8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.UserClass.Subtree;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.subtree.BaseSubtreeSpecification;
@@ -43,7 +43,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class UserClass_SubtreeTest
{
Subtree subtreeA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java Tue Feb 8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class AttributeValueItemTest
{
AttributeValueItem attributeValueItemA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java Tue Feb 8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.filter.SubstringNode;
import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
import org.junit.Before;
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ClassesItemTest
{
ClassesItem classesItemA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java Tue Feb 8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
import org.junit.Before;
import org.junit.Test;
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class MaxImmSubItemTest
{
MaxImmSubItem maxImmSubItemA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java Tue Feb 8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.junit.Before;
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class MaxValueCountItemTest
{
MaxValueCountItem maxValueCountItemA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java Tue Feb 8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.junit.Before;
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class RestrictedByItemTest
{
RestrictedByItem restrictedByItemA;
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java Tue Feb 8 00:06:34 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTru
import java.util.List;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.filter.SearchScope;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.trigger.TriggerSpecification.SPSpec;
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class TriggerSpecificationParserTest
{
Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/util/tree/TestDnNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/util/tree/TestDnNode.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/util/tree/TestDnNode.java (original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/util/tree/TestDnNode.java Tue Feb 8 00:06:34 2011
@@ -28,8 +28,8 @@ import static org.junit.Assert.assertTru
import java.util.List;
import java.util.Map;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -44,7 +44,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class TestDnNode
{
//---------------------------------------------------------------------------
Modified: directory/shared/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/pom.xml?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/pom.xml (original)
+++ directory/shared/branches/m1/pom.xml Tue Feb 8 00:06:34 2011
@@ -50,6 +50,7 @@
<commons.pool.version>1.5.5</commons.pool.version>
<dom4j.version>1.6.1</dom4j.version>
<junit.version>4.8.2</junit.version>
+ <mycila-junit.version>1.0.ga</mycila-junit.version>
<log4j.version>1.2.16</log4j.version>
<mina.core.version>2.0.2</mina.core.version>
<slf4j.api.version>1.6.1</slf4j.api.version>
@@ -443,6 +444,12 @@
<version>${org.apache.directory.junit.junit-addons.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.mycila</groupId>
+ <artifactId>mycila-junit</artifactId>
+ <version>${mycila-junit.version}</version>
+ </dependency>
+
<!-- Logging dependencies -->
<dependency>
Modified: directory/shared/branches/m1/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/pom.xml?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/pom.xml (original)
+++ directory/shared/branches/m1/util/pom.xml Tue Feb 8 00:06:34 2011
@@ -39,6 +39,12 @@
</dependency>
<dependency>
+ <groupId>com.mycila</groupId>
+ <artifactId>mycila-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shared-i18n</artifactId>
</dependency>
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java Tue Feb 8 00:06:34 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
import java.util.NoSuchElementException;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.util.ArrayEnumeration;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ArrayEnumerationTest
{
@Test
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ArrayNamingEnumerationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ArrayNamingEnumerationTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ArrayNamingEnumerationTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ArrayNamingEnumerationTest.java Tue Feb 8 00:06:34 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.util
import java.util.NoSuchElementException;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,7 +40,7 @@ import static org.junit.Assert.fail;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ArrayNamingEnumerationTest
{
/**
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/Base32Test.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/Base32Test.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/Base32Test.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/Base32Test.java Tue Feb 8 00:06:34 2011
@@ -21,14 +21,14 @@ package org.apache.directory.shared.util
import static org.junit.Assert.assertEquals;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.util.Base32;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class Base32Test
{
@Test
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java Tue Feb 8 00:06:34 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.util
import static org.junit.Assert.assertEquals;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.util.ByteBuffer;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class ByteBufferTest
{
@Test
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/GeneralizedTimeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/GeneralizedTimeTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/GeneralizedTimeTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/GeneralizedTimeTest.java Tue Feb 8 00:06:34 2011
@@ -29,8 +29,8 @@ import java.text.ParseException;
import java.util.Calendar;
import java.util.TimeZone;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.util.GeneralizedTime.Format;
import org.apache.directory.shared.util.GeneralizedTime.TimeZoneFormat;
import org.apache.directory.shared.util.GeneralizedTime;
@@ -44,7 +44,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class GeneralizedTimeTest
{
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/HexTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/HexTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/HexTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/HexTest.java Tue Feb 8 00:06:34 2011
@@ -20,8 +20,8 @@
package org.apache.directory.shared.util;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class HexTest
{
@Test
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java Tue Feb 8 00:06:34 2011
@@ -31,8 +31,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.util.JoinIterator;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,7 +44,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class JoinIteratorTest
{
@Test
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/MethodUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/MethodUtilsTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/MethodUtilsTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/MethodUtilsTest.java Tue Feb 8 00:06:34 2011
@@ -28,8 +28,8 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.util.MethodUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class MethodUtilsTest
{
private static class TestClass
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/StringsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/StringsTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/StringsTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/StringsTest.java Tue Feb 8 00:06:34 2011
@@ -29,8 +29,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith( ConcurrentJunitRunner.class )
-@Concurrent()
+@Concurrency()
public class StringsTest
{
@Test
Modified: directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/UnicodeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/UnicodeTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/UnicodeTest.java (original)
+++ directory/shared/branches/m1/util/src/test/java/org/apache/directory/shared/util/UnicodeTest.java Tue Feb 8 00:06:34 2011
@@ -30,8 +30,8 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Arrays;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
public class UnicodeTest
{