diff options
4 files changed, 48 insertions, 6 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/CollectionTest.java b/jsr166-tests/src/test/java/jsr166/CollectionTest.java index 44ef66d1ed..984439a0eb 100644 --- a/jsr166-tests/src/test/java/jsr166/CollectionTest.java +++ b/jsr166-tests/src/test/java/jsr166/CollectionTest.java @@ -14,7 +14,7 @@ import junit.framework.Test; /** * Contains tests applicable to all Collection implementations. */ -public class CollectionTest extends JSR166TestCase { +class CollectionTest extends JSR166TestCase { final CollectionImplementation impl; /** Tests are parameterized by a Collection implementation. */ diff --git a/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueBlockingQueueTest.java b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueBlockingQueueTest.java new file mode 100644 index 0000000000..fa8d154b8d --- /dev/null +++ b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueBlockingQueueTest.java @@ -0,0 +1,20 @@ +/* + * Written by Doug Lea with assistance from members of JCP JSR-166 + * Expert Group and released to the public domain, as explained at + * http://creativecommons.org/publicdomain/zero/1.0/ + * Other contributors include Andrew Wright, Jeffrey Hayes, + * Pat Fisher, Mike Judd. + */ + +package jsr166; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedTransferQueue; + +// android-note: These tests have been moved into their own separate +// classes to work around CTS issues. +public class LinkedTransferQueueBlockingQueueTest extends BlockingQueueTest { + protected BlockingQueue emptyCollection() { + return new LinkedTransferQueue(); + } +} diff --git a/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueCollectionTest.java b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueCollectionTest.java new file mode 100644 index 0000000000..513afe3bff --- /dev/null +++ b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueCollectionTest.java @@ -0,0 +1,17 @@ +/* + * Written by Doug Lea with assistance from members of JCP JSR-166 + * Expert Group and released to the public domain, as explained at + * http://creativecommons.org/publicdomain/zero/1.0/ + * Other contributors include Andrew Wright, Jeffrey Hayes, + * Pat Fisher, Mike Judd. + */ + +package jsr166; + +// android-note: These tests have been moved into their own separate +// classes to work around CTS issues. +public class LinkedTransferQueueCollectionTest extends CollectionTest { + public LinkedTransferQueueCollectionTest() { + super(new LinkedTransferQueueTest.Implementation(), ""); + } +} diff --git a/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java index c71259234a..05fc689119 100644 --- a/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java +++ b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java @@ -34,11 +34,16 @@ public class LinkedTransferQueueTest extends JSR166TestCase { public boolean permitsNulls() { return false; } } - public static class Generic extends BlockingQueueTest { - protected BlockingQueue emptyCollection() { - return new LinkedTransferQueue(); - } - } + // android-note: These tests have been moved into their own separate + // classes to work around CTS issues: + // LinkedTransferQueueBlockingQueueTest.java + // LinkedTransferQueueCollectionTest.java + // + // public static class Generic extends BlockingQueueTest { + // protected BlockingQueue emptyCollection() { + // return new LinkedTransferQueue(); + // } + // } // android-note: Removed because the CTS runner does a bad job of // retrying tests that have suite() declarations. |