From f24779c8c7a3f647f65944e02425b751e580b393 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Tue, 31 Jul 2018 16:54:41 +0900 Subject: Build android.test.* with java_sdk_library android.test.* are built with java_sdk_library and api files are added by running "make update-api". android.test.base_static is created for allowing to use android.test.base as a static library. Bug:77577799 Test: make -j Test: make checkapi Test: make checkapi fails with a random change in the txt file Test: adb shell cmd package list libraries |\ grep android.test.* And check the android.test.* libraries Change-Id: Ia27612657532e50b077a9c55dbef59ee3ec04b8a --- test-base/Android.bp | 71 ++++--- test-base/Android.mk | 44 ----- test-base/api/android-test-base-current.txt | 227 ----------------------- test-base/api/android-test-base-removed.txt | 0 test-base/api/apicheck_msg_android_test_base.txt | 17 -- test-base/api/current.txt | 227 +++++++++++++++++++++++ test-base/api/removed.txt | 0 test-base/api/system-current.txt | 0 test-base/api/system-removed.txt | 0 test-base/api/test-current.txt | 0 test-base/api/test-removed.txt | 0 11 files changed, 258 insertions(+), 328 deletions(-) delete mode 100644 test-base/api/android-test-base-current.txt delete mode 100644 test-base/api/android-test-base-removed.txt delete mode 100644 test-base/api/apicheck_msg_android_test_base.txt create mode 100644 test-base/api/current.txt create mode 100644 test-base/api/removed.txt create mode 100644 test-base/api/system-current.txt create mode 100644 test-base/api/system-removed.txt create mode 100644 test-base/api/test-current.txt create mode 100644 test-base/api/test-removed.txt (limited to 'test-base') diff --git a/test-base/Android.bp b/test-base/Android.bp index d25b47727c0b..0b8a02a815d9 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -19,9 +19,8 @@ // This contains the junit.framework and android.test classes that were in // Android API level 25 excluding those from android.test.runner. // Also contains the com.android.internal.util.Predicate[s] classes. -java_library { +java_sdk_library { name: "android.test.base", - installable: true, srcs: ["src/**/*.java"], @@ -29,11 +28,38 @@ java_library { javacflags: ["-Xep:DepAnn:ERROR"], }, + hostdex: true, + + api_packages: [ + "android.test", + "android.test.suitebuilder.annotation", + "com.android.internal.util", + "junit.framework", + ], + + droiddoc_options: ["stubsourceonly"], + compile_dex: true, +} + +// Build the android.test.base_static library +// ========================================== +// This is only intended for inclusion in the android.test.runner-minus-junit, +// robolectric_android-all-stub and repackaged.android.test.* libraries. +// Must not be used elewhere. +java_library_static { + name: "android.test.base_static", + installable: false, + + srcs: ["src/**/*.java"], + + errorprone: { + javacflags: ["-Xep:DepAnn:ERROR"], + }, + // Needs to be consistent with the repackaged version of this make target. java_version: "1.8", sdk_version: "current", - hostdex: true, } // Build the legacy-test library @@ -46,7 +72,7 @@ java_library { installable: true, sdk_version: "current", - static_libs: ["android.test.base"], + static_libs: ["android.test.base_static"], } // Build the repackaged.android.test.base library @@ -57,7 +83,7 @@ java_library_static { name: "repackaged.android.test.base", sdk_version: "current", - static_libs: ["android.test.base"], + static_libs: ["android.test.base_static"], jarjar_rules: "jarjar-rules.txt", // Pin java_version until jarjar is certified to support later versions. http://b/72703434 @@ -84,38 +110,3 @@ java_library_static { ], } -droiddoc { - name: "android-test-base-api-stubs-gen-docs", - srcs: [ - "src/**/*.java", - ], - custom_template: "droiddoc-templates-sdk", - installable: false, - args: "-stubpackages android.test:" + - "android.test.suitebuilder.annotation:" + - "com.android.internal.util:" + - "junit.framework -stubsourceonly -nodocs", - sdk_version: "current", - api_tag_name: "ANDROID_TEST_BASE", - api_filename: "android-test-base-api.txt", - removed_api_filename: "android-test-base-removed.txt", -} - -// Build the android.test.base.stubs library -// ========================================= -java_library_static { - name: "android.test.base.stubs", - srcs: [ - ":android-test-base-api-stubs-gen-docs", - ], - product_variables: { - pdk: { - enabled: false, - }, - unbundled_build: { - enabled: false, - }, - }, - sdk_version: "current", - compile_dex: true, -} diff --git a/test-base/Android.mk b/test-base/Android.mk index baf5726ff8bd..a9d30cf3131a 100644 --- a/test-base/Android.mk +++ b/test-base/Android.mk @@ -16,50 +16,6 @@ LOCAL_PATH:= $(call my-dir) -# For unbundled build we'll use the prebuilt jar from prebuilts/sdk. -ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) - -ANDROID_TEST_BASE_API_FILE := $(LOCAL_PATH)/api/android-test-base-current.txt -ANDROID_TEST_BASE_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-base-removed.txt - -full_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,android.test.base.stubs,,COMMON)/classes.jar -# Archive a copy of the classes.jar in SDK build. -$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.base.stubs.jar) - -# Check that the android.test.base.stubs library has not changed -# ============================================================== - -# Check that the API we're building hasn't changed from the not-yet-released -# SDK version. -$(eval $(call check-api, \ - check-android-test-base-api-current, \ - $(ANDROID_TEST_BASE_API_FILE), \ - $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_API_FILE), \ - $(ANDROID_TEST_BASE_REMOVED_API_FILE), \ - $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_REMOVED_API_FILE), \ - -error 2 -error 3 -error 4 -error 5 -error 6 \ - -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ - -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \ - -error 25 -error 26 -error 27, \ - cat $(LOCAL_PATH)/api/apicheck_msg_android_test_base.txt, \ - check-android-test-base-api, \ - $(OUT_DOCS)/android-test-base-api-stubs-gen-docs-stubs.srcjar \ - )) - -.PHONY: check-android-test-base-api -checkapi: check-android-test-base-api - -.PHONY: update-android-test-base-api -update-api: update-android-test-base-api - -update-android-test-base-api: $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_API_FILE) | $(ACP) - @echo Copying current.txt - $(hide) $(ACP) $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_API_FILE) $(ANDROID_TEST_BASE_API_FILE) - @echo Copying removed.txt - $(hide) $(ACP) $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_REMOVED_API_FILE) $(ANDROID_TEST_BASE_REMOVED_API_FILE) - -endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true - ifeq ($(HOST_OS),linux) # Build the legacy-performance-test-hostdex library # ================================================= diff --git a/test-base/api/android-test-base-current.txt b/test-base/api/android-test-base-current.txt deleted file mode 100644 index 7ebd6aa8a4a2..000000000000 --- a/test-base/api/android-test-base-current.txt +++ /dev/null @@ -1,227 +0,0 @@ -package android.test { - - public deprecated class AndroidTestCase extends junit.framework.TestCase { - ctor public AndroidTestCase(); - method public void assertActivityRequiresPermission(java.lang.String, java.lang.String, java.lang.String); - method public void assertReadingContentUriRequiresPermission(android.net.Uri, java.lang.String); - method public void assertWritingContentUriRequiresPermission(android.net.Uri, java.lang.String); - method public android.content.Context getContext(); - method protected void scrubClass(java.lang.Class) throws java.lang.IllegalAccessException; - method public void setContext(android.content.Context); - method public void testAndroidTestCaseSetupProperly(); - field protected android.content.Context mContext; - } - - public abstract deprecated class FlakyTest implements java.lang.annotation.Annotation { - } - - public deprecated class InstrumentationTestCase extends junit.framework.TestCase { - ctor public InstrumentationTestCase(); - method public android.app.Instrumentation getInstrumentation(); - method public deprecated void injectInsrumentation(android.app.Instrumentation); - method public void injectInstrumentation(android.app.Instrumentation); - method public final T launchActivity(java.lang.String, java.lang.Class, android.os.Bundle); - method public final T launchActivityWithIntent(java.lang.String, java.lang.Class, android.content.Intent); - method public void runTestOnUiThread(java.lang.Runnable) throws java.lang.Throwable; - method public void sendKeys(java.lang.String); - method public void sendKeys(int...); - method public void sendRepeatedKeys(int...); - } - - public deprecated class InstrumentationTestSuite extends junit.framework.TestSuite { - 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 abstract deprecated interface PerformanceTestCase { - method public abstract boolean isPerformanceOnly(); - method public abstract int startPerformance(android.test.PerformanceTestCase.Intermediates); - } - - public static abstract interface PerformanceTestCase.Intermediates { - method public abstract void addIntermediate(java.lang.String); - method public abstract void addIntermediate(java.lang.String, long); - method public abstract void finishTiming(boolean); - method public abstract void setInternalIterations(int); - method public abstract void startTiming(boolean); - } - - public abstract deprecated class UiThreadTest implements java.lang.annotation.Annotation { - } - -} - -package android.test.suitebuilder.annotation { - - public abstract deprecated class LargeTest implements java.lang.annotation.Annotation { - } - - public abstract deprecated class MediumTest implements java.lang.annotation.Annotation { - } - - public abstract deprecated class SmallTest implements java.lang.annotation.Annotation { - } - - public abstract deprecated class Smoke implements java.lang.annotation.Annotation { - } - - public abstract deprecated class Suppress implements java.lang.annotation.Annotation { - } - -} - -package com.android.internal.util { - - public abstract deprecated interface Predicate { - method public abstract boolean apply(T); - } - -} - -package junit.framework { - - public class Assert { - ctor protected Assert(); - method public static void assertEquals(java.lang.String, java.lang.Object, java.lang.Object); - method public static void assertEquals(java.lang.Object, java.lang.Object); - method public static void assertEquals(java.lang.String, java.lang.String, java.lang.String); - method public static void assertEquals(java.lang.String, java.lang.String); - method public static void assertEquals(java.lang.String, double, double, double); - method public static void assertEquals(double, double, double); - method public static void assertEquals(java.lang.String, float, float, float); - method public static void assertEquals(float, float, float); - method public static void assertEquals(java.lang.String, long, long); - method public static void assertEquals(long, long); - method public static void assertEquals(java.lang.String, boolean, boolean); - method public static void assertEquals(boolean, boolean); - method public static void assertEquals(java.lang.String, byte, byte); - method public static void assertEquals(byte, byte); - method public static void assertEquals(java.lang.String, char, char); - method public static void assertEquals(char, char); - method public static void assertEquals(java.lang.String, short, short); - method public static void assertEquals(short, short); - method public static void assertEquals(java.lang.String, int, int); - method public static void assertEquals(int, int); - method public static void assertFalse(java.lang.String, boolean); - method public static void assertFalse(boolean); - method public static void assertNotNull(java.lang.Object); - method public static void assertNotNull(java.lang.String, java.lang.Object); - method public static void assertNotSame(java.lang.String, java.lang.Object, java.lang.Object); - method public static void assertNotSame(java.lang.Object, java.lang.Object); - method public static void assertNull(java.lang.Object); - method public static void assertNull(java.lang.String, java.lang.Object); - method public static void assertSame(java.lang.String, java.lang.Object, java.lang.Object); - method public static void assertSame(java.lang.Object, java.lang.Object); - method public static void assertTrue(java.lang.String, boolean); - 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.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 { - method public abstract void protect() throws java.lang.Throwable; - } - - public abstract interface Test { - method public abstract int countTestCases(); - method public abstract void run(junit.framework.TestResult); - } - - public abstract class TestCase extends junit.framework.Assert implements junit.framework.Test { - ctor public TestCase(); - ctor public TestCase(java.lang.String); - method public int countTestCases(); - method protected junit.framework.TestResult createResult(); - method public java.lang.String getName(); - method public junit.framework.TestResult run(); - method public void run(junit.framework.TestResult); - method public void runBare() throws java.lang.Throwable; - method protected void runTest() throws java.lang.Throwable; - method public void setName(java.lang.String); - method protected void setUp() throws java.lang.Exception; - method protected void tearDown() throws java.lang.Exception; - } - - public class TestFailure { - ctor public TestFailure(junit.framework.Test, java.lang.Throwable); - method public java.lang.String exceptionMessage(); - method public junit.framework.Test failedTest(); - method public boolean isFailure(); - method public java.lang.Throwable thrownException(); - method public java.lang.String trace(); - field protected junit.framework.Test fFailedTest; - field protected java.lang.Throwable fThrownException; - } - - public abstract interface TestListener { - method public abstract void addError(junit.framework.Test, java.lang.Throwable); - method public abstract void addFailure(junit.framework.Test, junit.framework.AssertionFailedError); - method public abstract void endTest(junit.framework.Test); - method public abstract void startTest(junit.framework.Test); - } - - public class TestResult { - ctor public TestResult(); - method public synchronized void addError(junit.framework.Test, java.lang.Throwable); - method public synchronized void addFailure(junit.framework.Test, junit.framework.AssertionFailedError); - 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 int failureCount(); - method public synchronized java.util.Enumeration failures(); - method public synchronized void removeListener(junit.framework.TestListener); - method protected void run(junit.framework.TestCase); - method public synchronized int runCount(); - method public void runProtected(junit.framework.Test, junit.framework.Protectable); - method public synchronized boolean shouldStop(); - method public void startTest(junit.framework.Test); - method public synchronized void stop(); - method public synchronized boolean wasSuccessful(); - field protected java.util.Vector fErrors; - field protected java.util.Vector fFailures; - field protected java.util.Vector fListeners; - field protected int fRunTests; - } - - public class TestSuite implements junit.framework.Test { - ctor public TestSuite(); - ctor public TestSuite(java.lang.Class); - ctor public TestSuite(java.lang.Class, java.lang.String); - ctor public TestSuite(java.lang.String); - ctor public TestSuite(java.lang.Class...); - ctor public TestSuite(java.lang.Class[], java.lang.String); - method public void addTest(junit.framework.Test); - method public void addTestSuite(java.lang.Class); - method public int countTestCases(); - 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 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 static junit.framework.Test warning(java.lang.String); - } - -} - diff --git a/test-base/api/android-test-base-removed.txt b/test-base/api/android-test-base-removed.txt deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test-base/api/apicheck_msg_android_test_base.txt b/test-base/api/apicheck_msg_android_test_base.txt deleted file mode 100644 index 144aecc21bce..000000000000 --- a/test-base/api/apicheck_msg_android_test_base.txt +++ /dev/null @@ -1,17 +0,0 @@ - -****************************** -You have tried to change the API from what has been previously approved. - -To make these errors go away, you have two choices: - 1) You can add "@hide" javadoc comments to the methods, etc. listed in the - errors above. - - 2) You can update android-test-base-current.txt by executing the following command: - make update-android-test-base-api - - To submit the revised android-test-base-current.txt to the main Android repository, - you will need approval. -****************************** - - - diff --git a/test-base/api/current.txt b/test-base/api/current.txt new file mode 100644 index 000000000000..7ebd6aa8a4a2 --- /dev/null +++ b/test-base/api/current.txt @@ -0,0 +1,227 @@ +package android.test { + + public deprecated class AndroidTestCase extends junit.framework.TestCase { + ctor public AndroidTestCase(); + method public void assertActivityRequiresPermission(java.lang.String, java.lang.String, java.lang.String); + method public void assertReadingContentUriRequiresPermission(android.net.Uri, java.lang.String); + method public void assertWritingContentUriRequiresPermission(android.net.Uri, java.lang.String); + method public android.content.Context getContext(); + method protected void scrubClass(java.lang.Class) throws java.lang.IllegalAccessException; + method public void setContext(android.content.Context); + method public void testAndroidTestCaseSetupProperly(); + field protected android.content.Context mContext; + } + + public abstract deprecated class FlakyTest implements java.lang.annotation.Annotation { + } + + public deprecated class InstrumentationTestCase extends junit.framework.TestCase { + ctor public InstrumentationTestCase(); + method public android.app.Instrumentation getInstrumentation(); + method public deprecated void injectInsrumentation(android.app.Instrumentation); + method public void injectInstrumentation(android.app.Instrumentation); + method public final T launchActivity(java.lang.String, java.lang.Class, android.os.Bundle); + method public final T launchActivityWithIntent(java.lang.String, java.lang.Class, android.content.Intent); + method public void runTestOnUiThread(java.lang.Runnable) throws java.lang.Throwable; + method public void sendKeys(java.lang.String); + method public void sendKeys(int...); + method public void sendRepeatedKeys(int...); + } + + public deprecated class InstrumentationTestSuite extends junit.framework.TestSuite { + 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 abstract deprecated interface PerformanceTestCase { + method public abstract boolean isPerformanceOnly(); + method public abstract int startPerformance(android.test.PerformanceTestCase.Intermediates); + } + + public static abstract interface PerformanceTestCase.Intermediates { + method public abstract void addIntermediate(java.lang.String); + method public abstract void addIntermediate(java.lang.String, long); + method public abstract void finishTiming(boolean); + method public abstract void setInternalIterations(int); + method public abstract void startTiming(boolean); + } + + public abstract deprecated class UiThreadTest implements java.lang.annotation.Annotation { + } + +} + +package android.test.suitebuilder.annotation { + + public abstract deprecated class LargeTest implements java.lang.annotation.Annotation { + } + + public abstract deprecated class MediumTest implements java.lang.annotation.Annotation { + } + + public abstract deprecated class SmallTest implements java.lang.annotation.Annotation { + } + + public abstract deprecated class Smoke implements java.lang.annotation.Annotation { + } + + public abstract deprecated class Suppress implements java.lang.annotation.Annotation { + } + +} + +package com.android.internal.util { + + public abstract deprecated interface Predicate { + method public abstract boolean apply(T); + } + +} + +package junit.framework { + + public class Assert { + ctor protected Assert(); + method public static void assertEquals(java.lang.String, java.lang.Object, java.lang.Object); + method public static void assertEquals(java.lang.Object, java.lang.Object); + method public static void assertEquals(java.lang.String, java.lang.String, java.lang.String); + method public static void assertEquals(java.lang.String, java.lang.String); + method public static void assertEquals(java.lang.String, double, double, double); + method public static void assertEquals(double, double, double); + method public static void assertEquals(java.lang.String, float, float, float); + method public static void assertEquals(float, float, float); + method public static void assertEquals(java.lang.String, long, long); + method public static void assertEquals(long, long); + method public static void assertEquals(java.lang.String, boolean, boolean); + method public static void assertEquals(boolean, boolean); + method public static void assertEquals(java.lang.String, byte, byte); + method public static void assertEquals(byte, byte); + method public static void assertEquals(java.lang.String, char, char); + method public static void assertEquals(char, char); + method public static void assertEquals(java.lang.String, short, short); + method public static void assertEquals(short, short); + method public static void assertEquals(java.lang.String, int, int); + method public static void assertEquals(int, int); + method public static void assertFalse(java.lang.String, boolean); + method public static void assertFalse(boolean); + method public static void assertNotNull(java.lang.Object); + method public static void assertNotNull(java.lang.String, java.lang.Object); + method public static void assertNotSame(java.lang.String, java.lang.Object, java.lang.Object); + method public static void assertNotSame(java.lang.Object, java.lang.Object); + method public static void assertNull(java.lang.Object); + method public static void assertNull(java.lang.String, java.lang.Object); + method public static void assertSame(java.lang.String, java.lang.Object, java.lang.Object); + method public static void assertSame(java.lang.Object, java.lang.Object); + method public static void assertTrue(java.lang.String, boolean); + 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.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 { + method public abstract void protect() throws java.lang.Throwable; + } + + public abstract interface Test { + method public abstract int countTestCases(); + method public abstract void run(junit.framework.TestResult); + } + + public abstract class TestCase extends junit.framework.Assert implements junit.framework.Test { + ctor public TestCase(); + ctor public TestCase(java.lang.String); + method public int countTestCases(); + method protected junit.framework.TestResult createResult(); + method public java.lang.String getName(); + method public junit.framework.TestResult run(); + method public void run(junit.framework.TestResult); + method public void runBare() throws java.lang.Throwable; + method protected void runTest() throws java.lang.Throwable; + method public void setName(java.lang.String); + method protected void setUp() throws java.lang.Exception; + method protected void tearDown() throws java.lang.Exception; + } + + public class TestFailure { + ctor public TestFailure(junit.framework.Test, java.lang.Throwable); + method public java.lang.String exceptionMessage(); + method public junit.framework.Test failedTest(); + method public boolean isFailure(); + method public java.lang.Throwable thrownException(); + method public java.lang.String trace(); + field protected junit.framework.Test fFailedTest; + field protected java.lang.Throwable fThrownException; + } + + public abstract interface TestListener { + method public abstract void addError(junit.framework.Test, java.lang.Throwable); + method public abstract void addFailure(junit.framework.Test, junit.framework.AssertionFailedError); + method public abstract void endTest(junit.framework.Test); + method public abstract void startTest(junit.framework.Test); + } + + public class TestResult { + ctor public TestResult(); + method public synchronized void addError(junit.framework.Test, java.lang.Throwable); + method public synchronized void addFailure(junit.framework.Test, junit.framework.AssertionFailedError); + 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 int failureCount(); + method public synchronized java.util.Enumeration failures(); + method public synchronized void removeListener(junit.framework.TestListener); + method protected void run(junit.framework.TestCase); + method public synchronized int runCount(); + method public void runProtected(junit.framework.Test, junit.framework.Protectable); + method public synchronized boolean shouldStop(); + method public void startTest(junit.framework.Test); + method public synchronized void stop(); + method public synchronized boolean wasSuccessful(); + field protected java.util.Vector fErrors; + field protected java.util.Vector fFailures; + field protected java.util.Vector fListeners; + field protected int fRunTests; + } + + public class TestSuite implements junit.framework.Test { + ctor public TestSuite(); + ctor public TestSuite(java.lang.Class); + ctor public TestSuite(java.lang.Class, java.lang.String); + ctor public TestSuite(java.lang.String); + ctor public TestSuite(java.lang.Class...); + ctor public TestSuite(java.lang.Class[], java.lang.String); + method public void addTest(junit.framework.Test); + method public void addTestSuite(java.lang.Class); + method public int countTestCases(); + 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 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 static junit.framework.Test warning(java.lang.String); + } + +} + diff --git a/test-base/api/removed.txt b/test-base/api/removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/test-base/api/system-current.txt b/test-base/api/system-current.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/test-base/api/system-removed.txt b/test-base/api/system-removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/test-base/api/test-current.txt b/test-base/api/test-current.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/test-base/api/test-removed.txt b/test-base/api/test-removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 -- cgit v1.2.3