Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 253ad406 authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent f3f4775a

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -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<? extends junit.framework.TestCase>);















    ctor public TestMethod(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>);















    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<com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>>);









@@ -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<T> {













  public abstract deprecated interface Predicate<T> {















    method public abstract boolean apply(T);















  }







































api/system-current.txt



+4
−4




























Original line number
Diff line number
Diff line








@@ -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<? extends junit.framework.TestCase>);















    ctor public TestMethod(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>);















    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<com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>>);









@@ -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<T> {













  public abstract deprecated interface Predicate<T> {















    method public abstract boolean apply(T);















  }







































api/test-current.txt



+4
−4




























Original line number
Diff line number
Diff line








@@ -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<? extends junit.framework.TestCase>);















    ctor public TestMethod(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>);















    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<com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>>);









@@ -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<T> {













  public abstract deprecated interface Predicate<T> {















    method public abstract boolean apply(T);















  }







































core/java/com/android/internal/util/Predicate.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -25,7 +25,10 @@ package com.android.internal.util;













 * <p/>















 * 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<T> {































    boolean apply(T t);

































test-runner/src/android/test/suitebuilder/TestMethod.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -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













 * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.















 */













@Deprecated















public class TestMethod {































    private final String enclosingClassname;