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

1 files changed, 20 insertions, 0 deletions

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();
+    }
+}