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

Commit a26000b8 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Deprecate TestSuiteBuilder and related classes."

parents c098bea9 253ad406

api/current.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -38761,7 +38761,7 @@ package android.test.mock { 
















package android.test.suitebuilder {







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.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(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>);











    ctor public TestMethod(junit.framework.TestCase);







    ctor public TestMethod(junit.framework.TestCase);









@@ -38772,7 +38772,7 @@ package android.test.suitebuilder {









    method public java.lang.String getName();







    method public java.lang.String getName();











  }







  }



























  public class TestSuiteBuilder {







  public deprecated class TestSuiteBuilder {











    ctor public TestSuiteBuilder(java.lang.Class);







    ctor public TestSuiteBuilder(java.lang.Class);











    ctor public TestSuiteBuilder(java.lang.String, java.lang.ClassLoader);







    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>>);







    method public android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List<com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>>);









@@ -38785,7 +38785,7 @@ package android.test.suitebuilder {









    method public android.test.suitebuilder.TestSuiteBuilder named(java.lang.String);







    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);







    ctor public TestSuiteBuilder.FailedToCreateTests(java.lang.Exception);











    method public void testSuiteConstructionFailed();







    method public void testSuiteConstructionFailed();











  }







  }










@@ -49155,7 +49155,7 @@ package android.widget {

























package com.android.internal.util {







package com.android.internal.util {



























  public abstract interface Predicate<T> {







  public abstract deprecated interface Predicate<T> {











    method public abstract boolean apply(T);







    method public abstract boolean apply(T);











  }







  }









































api/system-current.txt



+4
−4




























Original line number
Original line
Diff line number
Diff line








@@ -42025,7 +42025,7 @@ package android.test.mock {

























package android.test.suitebuilder {







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.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(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>);











    ctor public TestMethod(junit.framework.TestCase);







    ctor public TestMethod(junit.framework.TestCase);









@@ -42036,7 +42036,7 @@ package android.test.suitebuilder {









    method public java.lang.String getName();







    method public java.lang.String getName();











  }







  }



























  public class TestSuiteBuilder {







  public deprecated class TestSuiteBuilder {











    ctor public TestSuiteBuilder(java.lang.Class);







    ctor public TestSuiteBuilder(java.lang.Class);











    ctor public TestSuiteBuilder(java.lang.String, java.lang.ClassLoader);







    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>>);







    method public android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List<com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>>);









@@ -42049,7 +42049,7 @@ package android.test.suitebuilder {









    method public android.test.suitebuilder.TestSuiteBuilder named(java.lang.String);







    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);







    ctor public TestSuiteBuilder.FailedToCreateTests(java.lang.Exception);











    method public void testSuiteConstructionFailed();







    method public void testSuiteConstructionFailed();











  }







  }










@@ -52776,7 +52776,7 @@ package android.widget {

























package com.android.internal.util {







package com.android.internal.util {



























  public abstract interface Predicate<T> {







  public abstract deprecated interface Predicate<T> {











    method public abstract boolean apply(T);







    method public abstract boolean apply(T);











  }







  }









































api/test-current.txt



+4
−4




























Original line number
Original line
Diff line number
Diff line








@@ -38845,7 +38845,7 @@ package android.test.mock {

























package android.test.suitebuilder {







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.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(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>);











    ctor public TestMethod(junit.framework.TestCase);







    ctor public TestMethod(junit.framework.TestCase);









@@ -38856,7 +38856,7 @@ package android.test.suitebuilder {









    method public java.lang.String getName();







    method public java.lang.String getName();











  }







  }



























  public class TestSuiteBuilder {







  public deprecated class TestSuiteBuilder {











    ctor public TestSuiteBuilder(java.lang.Class);







    ctor public TestSuiteBuilder(java.lang.Class);











    ctor public TestSuiteBuilder(java.lang.String, java.lang.ClassLoader);







    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>>);







    method public android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List<com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>>);









@@ -38869,7 +38869,7 @@ package android.test.suitebuilder {









    method public android.test.suitebuilder.TestSuiteBuilder named(java.lang.String);







    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);







    ctor public TestSuiteBuilder.FailedToCreateTests(java.lang.Exception);











    method public void testSuiteConstructionFailed();







    method public void testSuiteConstructionFailed();











  }







  }










@@ -49246,7 +49246,7 @@ package android.widget {

























package com.android.internal.util {







package com.android.internal.util {



























  public abstract interface Predicate<T> {







  public abstract deprecated interface Predicate<T> {











    method public abstract boolean apply(T);







    method public abstract boolean apply(T);











  }







  }









































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



+3
−0




























Original line number
Original line
Diff line number
Diff line








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









 * <p/>







 * <p/>











 * Implementors of Predicate which may cause side effects upon evaluation are







 * Implementors of Predicate which may cause side effects upon evaluation are











 * strongly encouraged to state this fact clearly in their API documentation.







 * strongly encouraged to state this fact clearly in their API documentation.














 *














 * @deprecated Use {@code java.util.function.Predicate} instead.











 */







 */














@Deprecated











public interface Predicate<T> {







public interface Predicate<T> {































    boolean apply(T t);







    boolean apply(T t);

































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



+4
−0




























Original line number
Original line
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







 * Represents a test to be run. Can be constructed without instantiating the TestCase or even











 * loading the class.







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







public class TestMethod {































    private final String enclosingClassname;







    private final String enclosingClassname;