diff options
| -rw-r--r-- | Android.mk | 13 | ||||
| -rw-r--r-- | Common.mk | 20 | ||||
| -rw-r--r-- | src/junit/runner/BaseTestRunner.java | 26 | ||||
| -rw-r--r-- | src/junit/runner/StandardTestSuiteLoader.java | 23 | ||||
| -rw-r--r-- | src/junit/runner/TestRunListener.java | 1 | ||||
| -rw-r--r-- | src/junit/runner/TestSuiteLoader.java | 11 | ||||
| -rw-r--r-- | src/junit/runner/Version.java | 6 | ||||
| -rw-r--r-- | src/junit/runner/package.html | 5 | ||||
| -rw-r--r-- | src/junit/textui/ResultPrinter.java | 9 | ||||
| -rw-r--r-- | src/junit/textui/package.html | 6 |
10 files changed, 8 insertions, 112 deletions
@@ -84,19 +84,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.m include $(BUILD_STATIC_JAVA_LIBRARY) #------------------------------------------------------- -# build a junit-runner jar for the host JVM -# (like the junit classes in the frameworks/base android.test.runner.jar) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(junit-runner-files) -LOCAL_MODULE := junit-runner -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit -LOCAL_MODULE_TAGS := optional -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk -include $(BUILD_STATIC_JAVA_LIBRARY) - -#------------------------------------------------------- # build a junit4-target jar as an alias for junit include $(CLEAR_VARS) @@ -3,7 +3,7 @@ # Shared with frameworks/base. # based off libcore/Docs.mk # Exports: -# core-junit-files, junit-runner-files, junit_to_document. +# core-junit-files, junit_to_document. # They are lists of .java files relative to external/junit/. ifndef junit4_common_include_once @@ -23,26 +23,10 @@ src/junit/framework/TestListener.java \ src/junit/framework/TestResult.java \ src/junit/framework/TestSuite.java -# List of source to build into the android.test.runner library -# - Although they are not part of 4.10 the following classes are -# needed for backwards compatibility in Android API. -# * src/junit/runner/TestSuiteLoader.java -# * src/junit/runner/StandardTestSuiteLoader.java -# -junit-runner-files := \ -src/junit/runner/BaseTestRunner.java \ -src/junit/runner/TestRunListener.java \ -src/junit/runner/TestSuiteLoader.java \ -src/junit/runner/StandardTestSuiteLoader.java \ -src/junit/runner/Version.java \ -src/junit/textui/ResultPrinter.java \ -src/junit/textui/TestRunner.java - # List of junit javadoc source files for Android public API # junit_to_document := \ - $(core-junit-files) \ - $(junit-runner-files) + $(core-junit-files) junit4_common_include_once := 1 endif # junit4_common_include_once diff --git a/src/junit/runner/BaseTestRunner.java b/src/junit/runner/BaseTestRunner.java index e7e0431..6a4b090 100644 --- a/src/junit/runner/BaseTestRunner.java +++ b/src/junit/runner/BaseTestRunner.java @@ -62,8 +62,7 @@ public abstract class BaseTestRunner implements TestListener { } } - // android-changed remove 'static' qualifier for API compatibility - public void setPreference(String key, String value) { + public static void setPreference(String key, String value) { getPreferences().put(key, value); } @@ -201,17 +200,6 @@ public abstract class BaseTestRunner implements TestListener { */ protected abstract void runFailed(String message); - // BEGIN android-changed - add back getLoader() for API compatibility - /** - * Returns the loader to be used. - * - * @deprecated not present in JUnit4.10 - */ - public TestSuiteLoader getLoader() { - return new StandardTestSuiteLoader(); - } - // END android-changed - /** * Returns the loaded Class for a suite name. */ @@ -277,13 +265,6 @@ public abstract class BaseTestRunner implements TestListener { return BaseTestRunner.getFilteredTrace(trace); } - // BEGIN android-changed - add back this method for API compatibility - /** @deprecated not present in JUnit4.10 */ - public static boolean inVAJava() { - return false; - } - // END android-changed - /** * Filters stack frames from internal JUnit classes */ @@ -294,10 +275,7 @@ public abstract class BaseTestRunner implements TestListener { StringWriter sw= new StringWriter(); PrintWriter pw= new PrintWriter(sw); StringReader sr= new StringReader(stack); - // BEGIN android-changed - // Use a sensible default buffer size - BufferedReader br= new BufferedReader(sr, 1000); - // END android-changed + BufferedReader br= new BufferedReader(sr); String line; try { diff --git a/src/junit/runner/StandardTestSuiteLoader.java b/src/junit/runner/StandardTestSuiteLoader.java deleted file mode 100644 index 808963a..0000000 --- a/src/junit/runner/StandardTestSuiteLoader.java +++ /dev/null @@ -1,23 +0,0 @@ -package junit.runner; - -// android-changed - class not present in upstream JUnit 4.10 -// added here to retain BaseTestRunner.getLoader API - -/** - * The standard test suite loader. It can only load the same class once. - * {@hide} - */ -public class StandardTestSuiteLoader implements TestSuiteLoader { - /** - * Uses the system class loader to load the test class - */ - public Class load(String suiteClassName) throws ClassNotFoundException { - return Class.forName(suiteClassName); - } - /** - * Uses the system class loader to load the test class - */ - public Class reload(Class aClass) throws ClassNotFoundException { - return aClass; - } -} diff --git a/src/junit/runner/TestRunListener.java b/src/junit/runner/TestRunListener.java index 0e95819..b11ef07 100644 --- a/src/junit/runner/TestRunListener.java +++ b/src/junit/runner/TestRunListener.java @@ -4,7 +4,6 @@ package junit.runner; * execution of a test run. Unlike TestListener, * this interface using only primitive objects, * making it suitable for remote test execution. - * {@hide} - Not needed for 1.0 SDK */ public interface TestRunListener { /* test status constants*/ diff --git a/src/junit/runner/TestSuiteLoader.java b/src/junit/runner/TestSuiteLoader.java deleted file mode 100644 index 9cc6d81..0000000 --- a/src/junit/runner/TestSuiteLoader.java +++ /dev/null @@ -1,11 +0,0 @@ -package junit.runner; - -/** - * An interface to define how a test suite should be loaded. - * - */ -// TODO: deprecate -public interface TestSuiteLoader { - abstract public Class load(String suiteClassName) throws ClassNotFoundException; - abstract public Class reload(Class aClass) throws ClassNotFoundException; -} diff --git a/src/junit/runner/Version.java b/src/junit/runner/Version.java index dd88c03..21aabfa 100644 --- a/src/junit/runner/Version.java +++ b/src/junit/runner/Version.java @@ -9,11 +9,9 @@ public class Version { } public static String id() { - return "4.10"; + return "4.10-SNAPSHOT"; } - - // android-changed - /** @hide - not needed for public API */ + public static void main(String[] args) { System.out.println(id()); } diff --git a/src/junit/runner/package.html b/src/junit/runner/package.html deleted file mode 100644 index f08fa70..0000000 --- a/src/junit/runner/package.html +++ /dev/null @@ -1,5 +0,0 @@ -<HTML> -<BODY> -Utility classes supporting the junit test framework. -</BODY> -</HTML> diff --git a/src/junit/textui/ResultPrinter.java b/src/junit/textui/ResultPrinter.java index b491452..f2f01f5 100644 --- a/src/junit/textui/ResultPrinter.java +++ b/src/junit/textui/ResultPrinter.java @@ -2,9 +2,7 @@ package junit.textui; import java.io.PrintStream; -// android-changed -// The following line was removed for compatibility with Android libraries. -// import java.text.NumberFormat; +import java.text.NumberFormat; import java.util.Enumeration; import junit.framework.AssertionFailedError; @@ -101,10 +99,7 @@ public class ResultPrinter implements TestListener { * Duplicated from BaseTestRunner. Fix it. */ protected String elapsedTimeAsString(long runTime) { - // android-changed - // The following line was altered for compatibility with - // Android libraries. - return Double.toString((double)runTime/1000); + return NumberFormat.getInstance().format((double)runTime/1000); } public PrintStream getWriter() { diff --git a/src/junit/textui/package.html b/src/junit/textui/package.html deleted file mode 100644 index 723f2ae..0000000 --- a/src/junit/textui/package.html +++ /dev/null @@ -1,6 +0,0 @@ -<HTML> -<BODY> -Utility classes supporting the junit test framework. -{@hide} - Not needed for 1.0 SDK -</BODY> -</HTML> |