diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-03-15 16:35:29 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-03-15 18:10:43 +0000 |
| commit | 9cb45b2153a3bf3950cd08f0084172ac794819ec (patch) | |
| tree | cce52c080d10ac16482092fb9d35aac8888bf76e /jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java | |
| parent | e8b323c7cb7d55be9a4df579231e44f04f53d766 (diff) | |
Fix for CollectionTest not running properly on vogar + missing tests
Made CollectionTest non-public, is shouldn't cause problems
with vogar anymore. Also, CTS currently doesn't find nested tests,
so I've moved some from the LinkedTransferQueueTest to
separate files.
Bug: 27673907
Change-Id: Iee6ecdee3128353f360ead7641cbafcb331f5644
(cherry picked from commit 7fe9db6dc16a8c5f58e1b4657967b71138e1f3ce)
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java')
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java | 15 |
1 files changed, 10 insertions, 5 deletions
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. |