summaryrefslogtreecommitdiff
path: root/jsr166-tests
diff options
context:
space:
mode:
authorNicholas Sauer <nicksauer@google.com>2016-05-01 21:22:28 -0700
committerNicholas Sauer <nicksauer@google.com>2016-05-18 08:02:43 -0700
commitb30ea05f8b793a5dd781bf45aff6319b0938a299 (patch)
tree1f70fd08747e0a9aa815710573358e61781775cb /jsr166-tests
parent6bf0c587874522023a4db4d6a6ee48b0a30186b1 (diff)
Make CollectionTest and Collection8Test abstract.
These classes are meant to be extended, but the test runner tries to run them anyway which causes a warning message to surfaced as a test result. Making them abstract allows them to be used by subclasses. bug: 28503384 Change-Id: I45c34dde7f045aa6721352508df463c69c2cd8ef
Diffstat (limited to 'jsr166-tests')
-rw-r--r--jsr166-tests/src/test/java/jsr166/Collection8Test.java3
-rw-r--r--jsr166-tests/src/test/java/jsr166/CollectionTest.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/Collection8Test.java b/jsr166-tests/src/test/java/jsr166/Collection8Test.java
index 0204ce666c..3aa1614ae6 100644
--- a/jsr166-tests/src/test/java/jsr166/Collection8Test.java
+++ b/jsr166-tests/src/test/java/jsr166/Collection8Test.java
@@ -26,7 +26,8 @@ import junit.framework.Test;
* Contains tests applicable to all jdk8+ Collection implementations.
* An extension of CollectionTest.
*/
-public class Collection8Test extends JSR166TestCase {
+// Android-changed: Made class abstract so it will be ignored by test runners.
+public abstract class Collection8Test extends JSR166TestCase {
final CollectionImplementation impl;
/** Tests are parameterized by a Collection implementation. */
diff --git a/jsr166-tests/src/test/java/jsr166/CollectionTest.java b/jsr166-tests/src/test/java/jsr166/CollectionTest.java
index 984439a0eb..b75c672569 100644
--- a/jsr166-tests/src/test/java/jsr166/CollectionTest.java
+++ b/jsr166-tests/src/test/java/jsr166/CollectionTest.java
@@ -14,7 +14,8 @@ import junit.framework.Test;
/**
* Contains tests applicable to all Collection implementations.
*/
-class CollectionTest extends JSR166TestCase {
+// Android-changed: Made class abstract so it will be ignored by test runners.
+abstract class CollectionTest extends JSR166TestCase {
final CollectionImplementation impl;
/** Tests are parameterized by a Collection implementation. */