diff options
| author | Paul Duffin <paulduffin@google.com> | 2018-02-16 13:11:05 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2018-02-16 15:40:24 +0000 |
| commit | 2d86c7a4c77f9764d9d1f90e0c911acfcb0d6a23 (patch) | |
| tree | afe716f2dbc32efbc9193130f0211cdb0f0cc829 /test-runner/src | |
| parent | 46656fa28ec257c8ffcfe4964da3d8047cff49d4 (diff) | |
Turn on DepAnn for test-base and test-runner
Bug: 30188076
Test: m -j20 RUN_ERROR_PRONE=true android.test.base android.test.runner
Change-Id: I735e3fbfcc710f1dc1b96e04f91b9feda8727b6c
Diffstat (limited to 'test-runner/src')
| -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 |
3 files changed, 9 insertions, 1 deletions
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; } |