Skip to content

Commit 5bd43d1

Browse files
Brett ChabotAndroid (Google) Code Review
Brett Chabot
authored and
Android (Google) Code Review
committed
Merge "Upgrade junit.runner classes to their JUnit4.10 implementation."
2 parents 544f1c3 + f1253cd commit 5bd43d1

19 files changed

+844
-800
lines changed

‎api/16.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41832,7 +41832,7 @@ package junit.framework {
4183241832
method public static void fail();
4183341833
}
4183441834

41835-
public class AssertionFailedError extends java.lang.Error {
41835+
public class AssertionFailedError extends java.lang.AssertionError {
4183641836
ctor public AssertionFailedError();
4183741837
ctor public AssertionFailedError(java.lang.String);
4183841838
}
@@ -41890,9 +41890,9 @@ package junit.framework {
4189041890
method public synchronized void addListener(junit.framework.TestListener);
4189141891
method public void endTest(junit.framework.Test);
4189241892
method public synchronized int errorCount();
41893-
method public synchronized java.util.Enumeration errors();
41893+
method public synchronized java.util.Enumeration<junit.framework.TestFailure> errors();
4189441894
method public synchronized int failureCount();
41895-
method public synchronized java.util.Enumeration failures();
41895+
method public synchronized java.util.Enumeration<junit.framework.TestFailure> failures();
4189641896
method public synchronized void removeListener(junit.framework.TestListener);
4189741897
method protected void run(junit.framework.TestCase);
4189841898
method public synchronized int runCount();
@@ -41909,21 +41909,21 @@ package junit.framework {
4190941909

4191041910
public class TestSuite implements junit.framework.Test {
4191141911
ctor public TestSuite();
41912-
ctor public TestSuite(java.lang.Class, java.lang.String);
41913-
ctor public TestSuite(java.lang.Class);
41912+
ctor public TestSuite(java.lang.Class<?>);
41913+
ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>, java.lang.String);
4191441914
ctor public TestSuite(java.lang.String);
4191541915
method public void addTest(junit.framework.Test);
41916-
method public void addTestSuite(java.lang.Class);
41916+
method public void addTestSuite(java.lang.Class<? extends junit.framework.TestCase>);
4191741917
method public int countTestCases();
41918-
method public static junit.framework.Test createTest(java.lang.Class, java.lang.String);
41918+
method public static junit.framework.Test createTest(java.lang.Class<?>, java.lang.String);
4191941919
method public java.lang.String getName();
41920-
method public static java.lang.reflect.Constructor getTestConstructor(java.lang.Class) throws java.lang.NoSuchMethodException;
41920+
method public static java.lang.reflect.Constructor<?> getTestConstructor(java.lang.Class) throws java.lang.NoSuchMethodException;
4192141921
method public void run(junit.framework.TestResult);
4192241922
method public void runTest(junit.framework.Test, junit.framework.TestResult);
4192341923
method public void setName(java.lang.String);
4192441924
method public junit.framework.Test testAt(int);
4192541925
method public int testCount();
41926-
method public java.util.Enumeration tests();
41926+
method public java.util.Enumeration<junit.framework.Test> tests();
4192741927
}
4192841928

4192941929
}
@@ -41946,7 +41946,7 @@ package junit.runner {
4194641946
method protected static java.util.Properties getPreferences();
4194741947
method public junit.framework.Test getTest(java.lang.String);
4194841948
method public static boolean inVAJava();
41949-
method protected java.lang.Class loadSuiteClass(java.lang.String) throws java.lang.ClassNotFoundException;
41949+
method protected java.lang.Class<?> loadSuiteClass(java.lang.String) throws java.lang.ClassNotFoundException;
4195041950
method protected java.lang.String processArguments(java.lang.String[]);
4195141951
method protected abstract void runFailed(java.lang.String);
4195241952
method public static void savePreferences() throws java.io.IOException;

‎api/current.txt‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19697,12 +19697,12 @@ package android.test {
1969719697
method public final void testApplicationTestCaseSetUpProperly() throws java.lang.Exception;
1969819698
}
1969919699

19700-
public class AssertionFailedError extends java.lang.Error {
19700+
public deprecated class AssertionFailedError extends java.lang.Error {
1970119701
ctor public AssertionFailedError();
1970219702
ctor public AssertionFailedError(java.lang.String);
1970319703
}
1970419704

19705-
public class ComparisonFailure extends android.test.AssertionFailedError {
19705+
public deprecated class ComparisonFailure extends android.test.AssertionFailedError {
1970619706
ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String);
1970719707
}
1970819708

@@ -19744,6 +19744,7 @@ package android.test {
1974419744
ctor public InstrumentationTestSuite(android.app.Instrumentation);
1974519745
ctor public InstrumentationTestSuite(java.lang.String, android.app.Instrumentation);
1974619746
ctor public InstrumentationTestSuite(java.lang.Class, android.app.Instrumentation);
19747+
method public void addTestSuite(java.lang.Class);
1974719748
}
1974819749

1974919750
public class IsolatedContext extends android.content.ContextWrapper {
@@ -42498,15 +42499,21 @@ package junit.framework {
4249842499
method public static void assertTrue(boolean);
4249942500
method public static void fail(java.lang.String);
4250042501
method public static void fail();
42502+
method public static void failNotEquals(java.lang.String, java.lang.Object, java.lang.Object);
42503+
method public static void failNotSame(java.lang.String, java.lang.Object, java.lang.Object);
42504+
method public static void failSame(java.lang.String);
42505+
method public static java.lang.String format(java.lang.String, java.lang.Object, java.lang.Object);
4250142506
}
4250242507

42503-
public class AssertionFailedError extends java.lang.Error {
42508+
public class AssertionFailedError extends java.lang.AssertionError {
4250442509
ctor public AssertionFailedError();
4250542510
ctor public AssertionFailedError(java.lang.String);
4250642511
}
4250742512

4250842513
public class ComparisonFailure extends junit.framework.AssertionFailedError {
4250942514
ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String);
42515+
method public java.lang.String getActual();
42516+
method public java.lang.String getExpected();
4251042517
}
4251142518

4251242519
public abstract interface Protectable {
@@ -42558,9 +42565,9 @@ package junit.framework {
4255842565
method public synchronized void addListener(junit.framework.TestListener);
4255942566
method public void endTest(junit.framework.Test);
4256042567
method public synchronized int errorCount();
42561-
method public synchronized java.util.Enumeration errors();
42568+
method public synchronized java.util.Enumeration<junit.framework.TestFailure> errors();
4256242569
method public synchronized int failureCount();
42563-
method public synchronized java.util.Enumeration failures();
42570+
method public synchronized java.util.Enumeration<junit.framework.TestFailure> failures();
4256442571
method public synchronized void removeListener(junit.framework.TestListener);
4256542572
method protected void run(junit.framework.TestCase);
4256642573
method public synchronized int runCount();
@@ -42577,21 +42584,24 @@ package junit.framework {
4257742584

4257842585
public class TestSuite implements junit.framework.Test {
4257942586
ctor public TestSuite();
42580-
ctor public TestSuite(java.lang.Class, java.lang.String);
42581-
ctor public TestSuite(java.lang.Class);
42587+
ctor public TestSuite(java.lang.Class<?>);
42588+
ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>, java.lang.String);
4258242589
ctor public TestSuite(java.lang.String);
42590+
ctor public TestSuite(java.lang.Class<?>...);
42591+
ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>[], java.lang.String);
4258342592
method public void addTest(junit.framework.Test);
42584-
method public void addTestSuite(java.lang.Class);
42593+
method public void addTestSuite(java.lang.Class<? extends junit.framework.TestCase>);
4258542594
method public int countTestCases();
42586-
method public static junit.framework.Test createTest(java.lang.Class, java.lang.String);
42595+
method public static junit.framework.Test createTest(java.lang.Class<?>, java.lang.String);
4258742596
method public java.lang.String getName();
42588-
method public static java.lang.reflect.Constructor getTestConstructor(java.lang.Class) throws java.lang.NoSuchMethodException;
42597+
method public static java.lang.reflect.Constructor<?> getTestConstructor(java.lang.Class<?>) throws java.lang.NoSuchMethodException;
4258942598
method public void run(junit.framework.TestResult);
4259042599
method public void runTest(junit.framework.Test, junit.framework.TestResult);
4259142600
method public void setName(java.lang.String);
4259242601
method public junit.framework.Test testAt(int);
4259342602
method public int testCount();
42594-
method public java.util.Enumeration tests();
42603+
method public java.util.Enumeration<junit.framework.Test> tests();
42604+
method public static junit.framework.Test warning(java.lang.String);
4259542605
}
4259642606

4259742607
}
@@ -42608,13 +42618,13 @@ package junit.runner {
4260842618
method public java.lang.String extractClassName(java.lang.String);
4260942619
method public static java.lang.String getFilteredTrace(java.lang.Throwable);
4261042620
method public static java.lang.String getFilteredTrace(java.lang.String);
42611-
method public junit.runner.TestSuiteLoader getLoader();
42621+
method public deprecated junit.runner.TestSuiteLoader getLoader();
4261242622
method public static java.lang.String getPreference(java.lang.String);
4261342623
method public static int getPreference(java.lang.String, int);
4261442624
method protected static java.util.Properties getPreferences();
4261542625
method public junit.framework.Test getTest(java.lang.String);
42616-
method public static boolean inVAJava();
42617-
method protected java.lang.Class loadSuiteClass(java.lang.String) throws java.lang.ClassNotFoundException;
42626+
method public static deprecated boolean inVAJava();
42627+
method protected java.lang.Class<?> loadSuiteClass(java.lang.String) throws java.lang.ClassNotFoundException;
4261842628
method protected java.lang.String processArguments(java.lang.String[]);
4261942629
method protected abstract void runFailed(java.lang.String);
4262042630
method public static void savePreferences() throws java.io.IOException;

‎test-runner/src/android/test/AssertionFailedError.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
/**
2020
* Thrown when an assertion failed.
2121
*
22-
* Note: Most users of this class should simply use junit.framework.AssertionFailedError,
23-
* which provides the same functionality.
22+
* @deprecated use junit.framework.AssertionFailedError
2423
*/
2524
public class AssertionFailedError extends Error {
2625

‎test-runner/src/android/test/ComparisonFailure.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
/**
2020
* Thrown when an assert equals for Strings failed.
2121
*
22-
* Note: Most users of this class should simply use junit.framework.ComparisonFailure,
23-
* which provides the same functionality at a lighter weight.
22+
* @deprecated use junit.framework.ComparisonFailure
2423
*/
2524
public class ComparisonFailure extends AssertionFailedError {
2625
private junit.framework.ComparisonFailure mComparison;

0 commit comments

Comments
 (0)