From 253ad40649242edae625d95e2ae415a1bf27b9fc Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 20 Feb 2017 16:26:09 +0000 Subject: [PATCH] Deprecate TestSuiteBuilder and related classes. Deprecates com.android.internal.util.Predicate in favour of java.util.function.Predicate. Deprecates TestMethod and TestSuiteBuilder in favour of Android Test Support Library. Bug: 35089332 Test: make checkbuild Change-Id: Id8b2be55925d7ca09750fc9681817793517ceb5d --- api/current.txt | 8 ++++---- api/system-current.txt | 8 ++++---- api/test-current.txt | 8 ++++---- core/java/com/android/internal/util/Predicate.java | 3 +++ test-runner/src/android/test/suitebuilder/TestMethod.java | 4 ++++ .../src/android/test/suitebuilder/TestSuiteBuilder.java | 8 ++++++++ 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index 1173dda9af213..dc05b00eba888 100644 --- a/api/current.txt +++ b/api/current.txt @@ -38737,7 +38737,7 @@ package android.test.mock { package android.test.suitebuilder { - public class TestMethod { + public deprecated class TestMethod { ctor public TestMethod(java.lang.reflect.Method, java.lang.Class); ctor public TestMethod(java.lang.String, java.lang.Class); ctor public TestMethod(junit.framework.TestCase); @@ -38748,7 +38748,7 @@ package android.test.suitebuilder { method public java.lang.String getName(); } - public class TestSuiteBuilder { + public deprecated class TestSuiteBuilder { ctor public TestSuiteBuilder(java.lang.Class); ctor public TestSuiteBuilder(java.lang.String, java.lang.ClassLoader); method public android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List>); @@ -38761,7 +38761,7 @@ package android.test.suitebuilder { method public android.test.suitebuilder.TestSuiteBuilder named(java.lang.String); } - public static class TestSuiteBuilder.FailedToCreateTests extends junit.framework.TestCase { + public static deprecated class TestSuiteBuilder.FailedToCreateTests extends junit.framework.TestCase { ctor public TestSuiteBuilder.FailedToCreateTests(java.lang.Exception); method public void testSuiteConstructionFailed(); } @@ -49131,7 +49131,7 @@ package android.widget { package com.android.internal.util { - public abstract interface Predicate { + public abstract deprecated interface Predicate { method public abstract boolean apply(T); } diff --git a/api/system-current.txt b/api/system-current.txt index 4feda6c4f3fc5..79d51e608147f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -42001,7 +42001,7 @@ package android.test.mock { package android.test.suitebuilder { - public class TestMethod { + public deprecated class TestMethod { ctor public TestMethod(java.lang.reflect.Method, java.lang.Class); ctor public TestMethod(java.lang.String, java.lang.Class); ctor public TestMethod(junit.framework.TestCase); @@ -42012,7 +42012,7 @@ package android.test.suitebuilder { method public java.lang.String getName(); } - public class TestSuiteBuilder { + public deprecated class TestSuiteBuilder { ctor public TestSuiteBuilder(java.lang.Class); ctor public TestSuiteBuilder(java.lang.String, java.lang.ClassLoader); method public android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List>); @@ -42025,7 +42025,7 @@ package android.test.suitebuilder { method public android.test.suitebuilder.TestSuiteBuilder named(java.lang.String); } - public static class TestSuiteBuilder.FailedToCreateTests extends junit.framework.TestCase { + public static deprecated class TestSuiteBuilder.FailedToCreateTests extends junit.framework.TestCase { ctor public TestSuiteBuilder.FailedToCreateTests(java.lang.Exception); method public void testSuiteConstructionFailed(); } @@ -52752,7 +52752,7 @@ package android.widget { package com.android.internal.util { - public abstract interface Predicate { + public abstract deprecated interface Predicate { method public abstract boolean apply(T); } diff --git a/api/test-current.txt b/api/test-current.txt index dfc9bb1ab130e..d67d479882c15 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -38821,7 +38821,7 @@ package android.test.mock { package android.test.suitebuilder { - public class TestMethod { + public deprecated class TestMethod { ctor public TestMethod(java.lang.reflect.Method, java.lang.Class); ctor public TestMethod(java.lang.String, java.lang.Class); ctor public TestMethod(junit.framework.TestCase); @@ -38832,7 +38832,7 @@ package android.test.suitebuilder { method public java.lang.String getName(); } - public class TestSuiteBuilder { + public deprecated class TestSuiteBuilder { ctor public TestSuiteBuilder(java.lang.Class); ctor public TestSuiteBuilder(java.lang.String, java.lang.ClassLoader); method public android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List>); @@ -38845,7 +38845,7 @@ package android.test.suitebuilder { method public android.test.suitebuilder.TestSuiteBuilder named(java.lang.String); } - public static class TestSuiteBuilder.FailedToCreateTests extends junit.framework.TestCase { + public static deprecated class TestSuiteBuilder.FailedToCreateTests extends junit.framework.TestCase { ctor public TestSuiteBuilder.FailedToCreateTests(java.lang.Exception); method public void testSuiteConstructionFailed(); } @@ -49222,7 +49222,7 @@ package android.widget { package com.android.internal.util { - public abstract interface Predicate { + public abstract deprecated interface Predicate { method public abstract boolean apply(T); } diff --git a/core/java/com/android/internal/util/Predicate.java b/core/java/com/android/internal/util/Predicate.java index bc6d6b31dd28e..1b5eaff67b87d 100644 --- a/core/java/com/android/internal/util/Predicate.java +++ b/core/java/com/android/internal/util/Predicate.java @@ -25,7 +25,10 @@ package com.android.internal.util; *

* Implementors of Predicate which may cause side effects upon evaluation are * strongly encouraged to state this fact clearly in their API documentation. + * + * @deprecated Use {@code java.util.function.Predicate} instead. */ +@Deprecated public interface Predicate { boolean apply(T t); diff --git a/test-runner/src/android/test/suitebuilder/TestMethod.java b/test-runner/src/android/test/suitebuilder/TestMethod.java index 08568d5d1a9be..ae1db5e5d4e32 100644 --- a/test-runner/src/android/test/suitebuilder/TestMethod.java +++ b/test-runner/src/android/test/suitebuilder/TestMethod.java @@ -26,7 +26,11 @@ import java.lang.reflect.Method; /** * Represents a test to be run. Can be constructed without instantiating the TestCase or even * loading the class. + * + * @deprecated New tests should be written using the + * Android Testing Support Library. */ +@Deprecated public class TestMethod { private final String enclosingClassname; diff --git a/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java b/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java index 8c8948973f7e1..3b920cff30e0d 100644 --- a/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java +++ b/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java @@ -38,7 +38,11 @@ import java.util.Collections; /** * Build suites based on a combination of included packages, excluded packages, * and predicates that must be satisfied. + * + * @deprecated New tests should be written using the + * Android Testing Support Library. */ +@Deprecated public class TestSuiteBuilder { private Context context; @@ -223,7 +227,11 @@ public class TestSuiteBuilder { /** * A special {@link junit.framework.TestCase} used to indicate a failure during the build() * step. + * + * @deprecated New tests should be written using the + * Android Testing Support Library. */ + @Deprecated public static class FailedToCreateTests extends TestCase { private final Exception exception;