diff options
Diffstat (limited to 'concurrent/src')
44 files changed, 3 insertions, 151 deletions
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractExecutorServiceTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractExecutorServiceTest.java index 99a007a..b80fe64 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractExecutorServiceTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractExecutorServiceTest.java @@ -15,9 +15,6 @@ import java.math.BigInteger; import java.security.*; public class AbstractExecutorServiceTest extends JSR166TestCase{ - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AbstractExecutorServiceTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueueTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueueTest.java index 0251390..660fec9 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueueTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueueTest.java @@ -15,9 +15,6 @@ import java.util.concurrent.locks.*; import java.io.*; public class AbstractQueueTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AbstractQueueTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java index db89645..e2cfe92 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java @@ -15,9 +15,6 @@ import java.util.concurrent.locks.*; import java.io.*; public class AbstractQueuedSynchronizerTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AbstractQueuedSynchronizerTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java index b650ede..1deea2c 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java @@ -14,9 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class ArrayBlockingQueueTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ArrayBlockingQueueTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicBooleanTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicBooleanTest.java index 230357a..c76196b 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicBooleanTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicBooleanTest.java @@ -13,9 +13,6 @@ import java.util.concurrent.atomic.*; import java.io.*; public class AtomicBooleanTest extends JSR166TestCase { - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicBooleanTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerArrayTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerArrayTest.java index cd13fcf..d8afe4e 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerArrayTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerArrayTest.java @@ -14,10 +14,6 @@ import java.io.*; import java.util.*; public class AtomicIntegerArrayTest extends JSR166TestCase { - - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicIntegerArrayTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java index 4c3ecb4..a4ec85e 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java @@ -16,9 +16,6 @@ public class AtomicIntegerFieldUpdaterTest extends JSR166TestCase { volatile int x = 0; int w; long z; - public static void main(String[] args){ - junit.textui.TestRunner.run(suite()); - } public static Test suite() { return new TestSuite(AtomicIntegerFieldUpdaterTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java index d484785..a6b2a17 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java @@ -13,9 +13,6 @@ import java.util.concurrent.atomic.*; import java.io.*; public class AtomicIntegerTest extends JSR166TestCase { - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicIntegerTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongArrayTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongArrayTest.java index 99ce204..262d273 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongArrayTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongArrayTest.java @@ -14,9 +14,6 @@ import java.io.*; import java.util.*; public class AtomicLongArrayTest extends JSR166TestCase { - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicLongArrayTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java index 9310795..bac25dc 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java @@ -17,9 +17,6 @@ public class AtomicLongFieldUpdaterTest extends JSR166TestCase { int z; long w; - public static void main(String[] args){ - junit.textui.TestRunner.run(suite()); - } public static Test suite() { return new TestSuite(AtomicLongFieldUpdaterTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java index 143c84a..f4805bf 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java @@ -13,9 +13,6 @@ import java.util.concurrent.atomic.*; import java.io.*; public class AtomicLongTest extends JSR166TestCase { - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicLongTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicMarkableReferenceTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicMarkableReferenceTest.java index 7b3dcb1..7857dde 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicMarkableReferenceTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicMarkableReferenceTest.java @@ -12,9 +12,6 @@ import junit.framework.*; import java.util.concurrent.atomic.*; public class AtomicMarkableReferenceTest extends JSR166TestCase{ - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicMarkableReferenceTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceArrayTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceArrayTest.java index 9330d39..81248cc 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceArrayTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceArrayTest.java @@ -15,9 +15,6 @@ import java.util.*; public class AtomicReferenceArrayTest extends JSR166TestCase { - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicReferenceArrayTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java index feddce7..7f71781 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java @@ -17,9 +17,6 @@ public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase{ Object z; Integer w; - public static void main(String[] args){ - junit.textui.TestRunner.run(suite()); - } public static Test suite() { return new TestSuite(AtomicReferenceFieldUpdaterTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java index 33da30d..bcb4701 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java @@ -13,9 +13,6 @@ import java.util.concurrent.atomic.*; import java.io.*; public class AtomicReferenceTest extends JSR166TestCase { - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicReferenceTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicStampedReferenceTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicStampedReferenceTest.java index 3ffc0a7..9f4e4f7 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicStampedReferenceTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicStampedReferenceTest.java @@ -12,9 +12,6 @@ import junit.framework.*; import java.util.concurrent.atomic.*; public class AtomicStampedReferenceTest extends JSR166TestCase{ - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(AtomicStampedReferenceTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java index d7f2210..b7549a4 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java @@ -15,9 +15,6 @@ import java.util.Enumeration; import java.io.*; public class ConcurrentHashMapTest extends JSR166TestCase{ - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ConcurrentHashMapTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentLinkedQueueTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentLinkedQueueTest.java index 8d8e13b..c84dc59 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentLinkedQueueTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentLinkedQueueTest.java @@ -14,11 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class ConcurrentLinkedQueueTest extends JSR166TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } - public static Test suite() { return new TestSuite(ConcurrentLinkedQueueTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArrayListTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArrayListTest.java index d208039..53a1f70 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArrayListTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArrayListTest.java @@ -14,11 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class CopyOnWriteArrayListTest extends JSR166TestCase{ - - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } - public static Test suite() { return new TestSuite(CopyOnWriteArrayListTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArraySetTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArraySetTest.java index 809fc59..abb33fa 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArraySetTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArraySetTest.java @@ -14,9 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class CopyOnWriteArraySetTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(CopyOnWriteArraySetTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/CountDownLatchTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/CountDownLatchTest.java index 0d69889..179c81e 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/CountDownLatchTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/CountDownLatchTest.java @@ -13,9 +13,6 @@ import java.util.*; import java.util.concurrent.*; public class CountDownLatchTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(CountDownLatchTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java index ecd6e45..3b99ef8 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java @@ -15,9 +15,6 @@ import java.util.concurrent.locks.*; import java.util.concurrent.atomic.*; public class CyclicBarrierTest extends JSR166TestCase{ - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(CyclicBarrierTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java index 978edb4..3d851e8 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java @@ -13,10 +13,6 @@ import java.util.*; import java.util.concurrent.*; public class DelayQueueTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } - public static Test suite() { return new TestSuite(DelayQueueTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ExchangerTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ExchangerTest.java index 9811e82..bc0df85 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ExchangerTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ExchangerTest.java @@ -13,10 +13,6 @@ import java.util.*; import java.util.concurrent.*; public class ExchangerTest extends JSR166TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ExchangerTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java index b1988cc..91bedf9 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java @@ -16,9 +16,6 @@ import java.math.BigInteger; import java.security.*; public class ExecutorCompletionServiceTest extends JSR166TestCase{ - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ExecutorCompletionServiceTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java index e8fc7e5..b0a2ccd 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java @@ -15,9 +15,6 @@ import java.math.BigInteger; import java.security.*; public class ExecutorsTest extends JSR166TestCase{ - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ExecutorsTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/FutureTaskTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/FutureTaskTest.java index 2108986..2635054 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/FutureTaskTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/FutureTaskTest.java @@ -13,10 +13,6 @@ import java.util.concurrent.*; import java.util.*; public class FutureTaskTest extends JSR166TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(FutureTaskTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java b/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java index c900616..4e0de95 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java @@ -97,7 +97,7 @@ public class JSR166TestCase extends TestCase { iters = Integer.parseInt(args[0]); Test s = suite(); for (int i = 0; i < iters; ++i) { - junit.textui.TestRunner.run (s); + // junit.textui.TestRunner.run (s); android-changed System.gc(); System.runFinalization(); } @@ -108,8 +108,8 @@ public class JSR166TestCase extends TestCase { * Collects all JSR166 unit tests as one suite */ public static Test suite ( ) { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("JSR166 Unit Tests"); // BEGIN android-changed + TestSuite suite = new TestSuite("JSR166 Unit Tests"); suite.addTest(AbstractExecutorServiceTest.suite()); suite.addTest(AbstractQueueTest.suite()); suite.addTest(AbstractQueuedSynchronizerTest.suite()); diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java index 6648afb..dd6be9a 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java @@ -14,11 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class LinkedBlockingQueueTest extends JSR166TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } - public static Test suite() { return new TestSuite(LinkedBlockingQueueTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java index 3a20207..3017c52 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java @@ -13,10 +13,6 @@ import java.util.*; import java.util.concurrent.*; public class LinkedListTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } - public static Test suite() { return new TestSuite(LinkedListTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java index b39db2e..0a74f91 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java @@ -14,9 +14,6 @@ import java.util.concurrent.*; import java.util.concurrent.locks.*; public class LockSupportTest extends JSR166TestCase{ - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(LockSupportTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java index 3857e0f..a764866 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java @@ -14,9 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class PriorityBlockingQueueTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(PriorityBlockingQueueTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityQueueTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityQueueTest.java index 409e1ed..3d3c1be 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityQueueTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityQueueTest.java @@ -14,9 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class PriorityQueueTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(PriorityQueueTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java index c50482d..8372251 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java @@ -15,9 +15,6 @@ import java.util.*; import java.io.*; public class ReentrantLockTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ReentrantLockTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java index e38165a..4191a13 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java @@ -15,9 +15,6 @@ import java.io.*; import java.util.*; public class ReentrantReadWriteLockTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ReentrantReadWriteLockTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorTest.java index da5704e..14e98b4 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorTest.java @@ -14,9 +14,6 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; public class ScheduledExecutorTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ScheduledExecutorTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/SemaphoreTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/SemaphoreTest.java index 4019812..3f2ff33 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/SemaphoreTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/SemaphoreTest.java @@ -14,9 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class SemaphoreTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(SemaphoreTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java index debce5d..c2ae396 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java @@ -14,11 +14,6 @@ import java.util.concurrent.*; import java.io.*; public class SynchronousQueueTest extends JSR166TestCase { - - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } - public static Test suite() { return new TestSuite(SynchronousQueueTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/SystemTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/SystemTest.java index 4433cb1..439039a 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/SystemTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/SystemTest.java @@ -11,10 +11,6 @@ package tests.api.java.util.concurrent; import junit.framework.*; public class SystemTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - public static Test suite() { return new TestSuite(SystemTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadLocalTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadLocalTest.java index 0c2256a..b9b7ba5 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadLocalTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadLocalTest.java @@ -12,10 +12,6 @@ import junit.framework.*; import java.util.concurrent.Semaphore; public class ThreadLocalTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - public static Test suite() { return new TestSuite(ThreadLocalTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java index 4f7cc46..ee27e51 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java @@ -14,9 +14,6 @@ import junit.framework.*; import java.util.*; public class ThreadPoolExecutorTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); - } public static Test suite() { return new TestSuite(ThreadPoolExecutorTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadTest.java index 253d9eb..405e5be 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadTest.java @@ -15,10 +15,6 @@ import dalvik.annotation.BrokenTest; import junit.framework.*; public class ThreadTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - public static Test suite() { return new TestSuite(ThreadTest.class); } diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java index 54fdc69..f6504d8 100755 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java @@ -13,10 +13,6 @@ import java.util.concurrent.*; import java.io.*; public class TimeUnitTest extends JSR166TestCase { - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - public static Test suite() { return new TestSuite(TimeUnitTest.class); } diff --git a/concurrent/src/test/java/tests/concurrent/AllTests.java b/concurrent/src/test/java/tests/concurrent/AllTests.java index d2ebbeb..d599370 100644 --- a/concurrent/src/test/java/tests/concurrent/AllTests.java +++ b/concurrent/src/test/java/tests/concurrent/AllTests.java @@ -23,16 +23,11 @@ import junit.framework.TestSuite; * Test suite for the concurrent module */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Collects all JSR166 unit tests as one suite */ public static Test suite ( ) { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("JSR166 Unit Tests"); + TestSuite suite = new TestSuite("JSR166 Unit Tests"); suite.addTest(tests.api.java.util.concurrent.JSR166TestCase.suite()); |