Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove non-junit android.test.base classes from android.jar"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-12-19 17:09:21 +00:00
committed by Android (Google) Code Review
parent 2105f9e774 187a48de62
commit bdbb8811a6
2 changed files with 5 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@@ -274,6 +274,9 @@ non_base_dirs := \
../opt/net/voip/src/java/android/net/rtp \
../opt/net/voip/src/java/android/net/sip \
framework_base_android_test_base_src_files := \
$(call all-java-files-under, test-base/src/junit)
framework_base_android_test_mock_src_files := \
$(call all-java-files-under, test-mock/src/android/test/mock)
@@ -284,7 +287,6 @@ framework_base_android_test_runner_src_files := \
# to document and check apis
files_to_check_apis := \
$(call find-other-java-files, \
test-base/src \
$(non_base_dirs) \
)
@@ -308,6 +310,7 @@ files_to_check_apis_generated := \
files_to_document := \
$(files_to_check_apis) \
$(call find-other-java-files,\
test-base/src \
test-runner/src)
# These are relative to frameworks/base
@@ -327,6 +330,7 @@ framework_docs_LOCAL_SRC_FILES := \
# These are relative to frameworks/base
framework_docs_LOCAL_API_CHECK_SRC_FILES := \
$(framework_base_android_test_base_src_files) \
$(framework_base_android_test_mock_src_files) \
$(framework_base_android_test_runner_src_files) \
$(files_to_check_apis) \

74
api/current.txt
View File

@@ -41511,61 +41511,6 @@ package android.telephony.mbms {
}
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 extends android.app.Activity> T launchActivity(java.lang.String, java.lang.Class<T>, android.os.Bundle);
method public final <T extends android.app.Activity> T launchActivityWithIntent(java.lang.String, java.lang.Class<T>, 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.mock {
public deprecated class MockApplication extends android.app.Application {
@@ -41859,25 +41804,6 @@ package android.test.mock {
}
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 android.text {
public class AlteredCharSequence implements java.lang.CharSequence android.text.GetChars {