diff options
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/api/current.txt b/api/current.txt index ee964f7..a845a14 100644 --- a/api/current.txt +++ b/api/current.txt @@ -19697,12 +19697,12 @@ package android.test { method public final void testApplicationTestCaseSetUpProperly() throws java.lang.Exception; } - public class AssertionFailedError extends java.lang.Error { + public deprecated class AssertionFailedError extends java.lang.Error { ctor public AssertionFailedError(); ctor public AssertionFailedError(java.lang.String); } - public class ComparisonFailure extends android.test.AssertionFailedError { + public deprecated class ComparisonFailure extends android.test.AssertionFailedError { ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String); } @@ -19744,6 +19744,7 @@ package android.test { ctor public InstrumentationTestSuite(android.app.Instrumentation); ctor public InstrumentationTestSuite(java.lang.String, android.app.Instrumentation); ctor public InstrumentationTestSuite(java.lang.Class, android.app.Instrumentation); + method public void addTestSuite(java.lang.Class); } public class IsolatedContext extends android.content.ContextWrapper { @@ -42498,15 +42499,21 @@ package junit.framework { method public static void assertTrue(boolean); method public static void fail(java.lang.String); method public static void fail(); + method public static void failNotEquals(java.lang.String, java.lang.Object, java.lang.Object); + method public static void failNotSame(java.lang.String, java.lang.Object, java.lang.Object); + method public static void failSame(java.lang.String); + method public static java.lang.String format(java.lang.String, java.lang.Object, java.lang.Object); } - public class AssertionFailedError extends java.lang.Error { + public class AssertionFailedError extends java.lang.AssertionError { ctor public AssertionFailedError(); ctor public AssertionFailedError(java.lang.String); } public class ComparisonFailure extends junit.framework.AssertionFailedError { ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String); + method public java.lang.String getActual(); + method public java.lang.String getExpected(); } public abstract interface Protectable { @@ -42558,9 +42565,9 @@ package junit.framework { method public synchronized void addListener(junit.framework.TestListener); method public void endTest(junit.framework.Test); method public synchronized int errorCount(); - method public synchronized java.util.Enumeration errors(); + method public synchronized java.util.Enumeration<junit.framework.TestFailure> errors(); method public synchronized int failureCount(); - method public synchronized java.util.Enumeration failures(); + method public synchronized java.util.Enumeration<junit.framework.TestFailure> failures(); method public synchronized void removeListener(junit.framework.TestListener); method protected void run(junit.framework.TestCase); method public synchronized int runCount(); @@ -42577,21 +42584,24 @@ package junit.framework { public class TestSuite implements junit.framework.Test { ctor public TestSuite(); - ctor public TestSuite(java.lang.Class, java.lang.String); - ctor public TestSuite(java.lang.Class); + ctor public TestSuite(java.lang.Class<?>); + ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>, java.lang.String); ctor public TestSuite(java.lang.String); + ctor public TestSuite(java.lang.Class<?>...); + ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>[], java.lang.String); method public void addTest(junit.framework.Test); - method public void addTestSuite(java.lang.Class); + method public void addTestSuite(java.lang.Class<? extends junit.framework.TestCase>); method public int countTestCases(); - method public static junit.framework.Test createTest(java.lang.Class, java.lang.String); + method public static junit.framework.Test createTest(java.lang.Class<?>, java.lang.String); method public java.lang.String getName(); - method public static java.lang.reflect.Constructor getTestConstructor(java.lang.Class) throws java.lang.NoSuchMethodException; + method public static java.lang.reflect.Constructor<?> getTestConstructor(java.lang.Class<?>) throws java.lang.NoSuchMethodException; method public void run(junit.framework.TestResult); method public void runTest(junit.framework.Test, junit.framework.TestResult); method public void setName(java.lang.String); method public junit.framework.Test testAt(int); method public int testCount(); - method public java.util.Enumeration tests(); + method public java.util.Enumeration<junit.framework.Test> tests(); + method public static junit.framework.Test warning(java.lang.String); } } @@ -42608,13 +42618,13 @@ package junit.runner { method public java.lang.String extractClassName(java.lang.String); method public static java.lang.String getFilteredTrace(java.lang.Throwable); method public static java.lang.String getFilteredTrace(java.lang.String); - method public junit.runner.TestSuiteLoader getLoader(); + method public deprecated junit.runner.TestSuiteLoader getLoader(); method public static java.lang.String getPreference(java.lang.String); method public static int getPreference(java.lang.String, int); method protected static java.util.Properties getPreferences(); method public junit.framework.Test getTest(java.lang.String); - method public static boolean inVAJava(); - method protected java.lang.Class loadSuiteClass(java.lang.String) throws java.lang.ClassNotFoundException; + method public static deprecated boolean inVAJava(); + method protected java.lang.Class<?> loadSuiteClass(java.lang.String) throws java.lang.ClassNotFoundException; method protected java.lang.String processArguments(java.lang.String[]); method protected abstract void runFailed(java.lang.String); method public static void savePreferences() throws java.io.IOException; |