Fix jsr166 tests

Tests specified as static inner classes were failing because the CTS
runner does not support them. The temporary fix is to promote all static
inner test classes to top level classes. This should be reverted once
the CTS runner is fixed.

Bug: 13877168
Change-Id: Icb64d7d7fcf6202d54d6fe31d9e1c9a6a43a233b

1 files changed, 3 insertions, 5 deletions

diff --git a/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java
index a14f30304a..94427df43e 100644
--- a/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java
+++ b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java
@@ -24,12 +24,10 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
-public class LinkedTransferQueueTest extends JSR166TestCase {
+public class LinkedTransferQueueTest extends BlockingQueueTest {
 
-    public static class Generic extends BlockingQueueTest {
-        protected BlockingQueue emptyCollection() {
-            return new LinkedTransferQueue();
-        }
+    protected BlockingQueue emptyCollection() {
+        return new LinkedTransferQueue();
     }
 
     /**