diff options
| -rw-r--r-- | test-base/Android.bp | 4 | ||||
| -rw-r--r-- | test-base/src/android/test/PerformanceTestCase.java | 5 | ||||
| -rw-r--r-- | test-runner/Android.bp | 4 | ||||
| -rw-r--r-- | test-runner/src/android/test/ComparisonFailure.java | 3 | ||||
| -rw-r--r-- | test-runner/src/android/test/TestSuiteProvider.java | 5 | ||||
| -rw-r--r-- | test-runner/src/junit/runner/BaseTestRunner.java | 2 |
6 files changed, 22 insertions, 1 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index b65cda9302a7..49122249ce25 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -24,6 +24,10 @@ java_library { srcs: ["src/**/*.java"], + errorprone: { + javacflags: ["-Xep:DepAnn:ERROR"], + }, + // Needs to be consistent with the repackaged version of this make target. java_version: "1.8", diff --git a/test-base/src/android/test/PerformanceTestCase.java b/test-base/src/android/test/PerformanceTestCase.java index 65bd4a48f7f5..2584da20e9be 100644 --- a/test-base/src/android/test/PerformanceTestCase.java +++ b/test-base/src/android/test/PerformanceTestCase.java @@ -21,6 +21,11 @@ package android.test; * * If you want your test to be used as a performance test, you must * implement this interface. + * + * @deprecated Use + * <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html"> + * AndroidJUnitRunner</a> instead. New tests should be written using the + * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>. */ @Deprecated public interface PerformanceTestCase diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 66b95271ee06..fb7c2a7f651f 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -23,6 +23,10 @@ java_library { java_version: "1.8", srcs: ["src/**/*.java"], + errorprone: { + javacflags: ["-Xep:DepAnn:ERROR"], + }, + no_framework_libs: true, libs: [ "framework", diff --git a/test-runner/src/android/test/ComparisonFailure.java b/test-runner/src/android/test/ComparisonFailure.java index 3fa76f5b166c..d86b7007a733 100644 --- a/test-runner/src/android/test/ComparisonFailure.java +++ b/test-runner/src/android/test/ComparisonFailure.java @@ -19,8 +19,9 @@ package android.test; /** * Thrown when an assert equals for Strings failed. * - * @deprecated use junit.framework.ComparisonFailure + * @deprecated use org.junit.ComparisonFailure */ +@Deprecated public class ComparisonFailure extends AssertionFailedError { private junit.framework.ComparisonFailure mComparison; diff --git a/test-runner/src/android/test/TestSuiteProvider.java b/test-runner/src/android/test/TestSuiteProvider.java index c74651cea01f..12cfcb76e10b 100644 --- a/test-runner/src/android/test/TestSuiteProvider.java +++ b/test-runner/src/android/test/TestSuiteProvider.java @@ -20,6 +20,11 @@ import junit.framework.TestSuite; /** * Implementors will know how to get a test suite. + * + * @deprecated Use + * <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html"> + * AndroidJUnitRunner</a> instead. New tests should be written using the + * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>. */ @Deprecated public interface TestSuiteProvider { diff --git a/test-runner/src/junit/runner/BaseTestRunner.java b/test-runner/src/junit/runner/BaseTestRunner.java index e7e043133c95..b2fa16c91da2 100644 --- a/test-runner/src/junit/runner/BaseTestRunner.java +++ b/test-runner/src/junit/runner/BaseTestRunner.java @@ -207,6 +207,7 @@ public abstract class BaseTestRunner implements TestListener { * * @deprecated not present in JUnit4.10 */ + @Deprecated public TestSuiteLoader getLoader() { return new StandardTestSuiteLoader(); } @@ -279,6 +280,7 @@ public abstract class BaseTestRunner implements TestListener { // BEGIN android-changed - add back this method for API compatibility /** @deprecated not present in JUnit4.10 */ + @Deprecated public static boolean inVAJava() { return false; } |