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

Merge "Don't use impl lib of android.test.[mock|base|runners]" am: 89a59d29a4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318287

Change-Id: I0ef4731abf973ba7508792aa668994853dbd3156
This commit is contained in:
Jiyong Park
2020-06-28 23:50:01 +00:00
committed by Automerger Merge Worker
parent 533a19175c 89a59d29a4
commit c9b3d41736
6 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test-base/Android.bp
View File

@@ -38,6 +38,7 @@ java_sdk_library {
], ],
compile_dex: true, compile_dex: true,
default_to_stubs: true,
} }
// Build the android.test.base_static library // Build the android.test.base_static library

1
test-mock/Android.bp
View File

@@ -37,6 +37,7 @@ java_sdk_library {
"android.test.mock", "android.test.mock",
], ],
compile_dex: true, compile_dex: true,
default_to_stubs: true,
} }
// Make the current.txt available for use by the cts/tests/signature tests. // Make the current.txt available for use by the cts/tests/signature tests.

3
test-mock/src/android/test/mock/MockContentProvider.java
View File

@@ -29,6 +29,7 @@ import android.content.pm.ProviderInfo;
import android.content.res.AssetFileDescriptor; import android.content.res.AssetFileDescriptor;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.ICancellationSignal; import android.os.ICancellationSignal;
@@ -282,7 +283,7 @@ public class MockContentProvider extends ContentProvider {
* @hide * @hide
*/ */
public IBinder getIContentProviderBinder() { public IBinder getIContentProviderBinder() {
throw new UnsupportedOperationException("unimplemented mock method"); return new Binder();
} }
/** /**

1
test-runner/Android.bp
View File

@@ -41,6 +41,7 @@ java_sdk_library {
], ],
compile_dex: true, compile_dex: true,
default_to_stubs: true,
} }
// Build the android.test.runner-minus-junit library // Build the android.test.runner-minus-junit library

1
test-runner/api/current.txt
View File

@@ -78,6 +78,7 @@ package android.test {
@Deprecated public class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider { @Deprecated public class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {
ctor @Deprecated public InstrumentationTestRunner(); ctor @Deprecated public InstrumentationTestRunner();
method @Deprecated protected void addTestListener(junit.framework.TestListener);
method @Deprecated public junit.framework.TestSuite getAllTests(); method @Deprecated public junit.framework.TestSuite getAllTests();
method @Deprecated protected android.test.AndroidTestRunner getAndroidTestRunner(); method @Deprecated protected android.test.AndroidTestRunner getAndroidTestRunner();
method @Deprecated public android.os.Bundle getArguments(); method @Deprecated public android.os.Bundle getArguments();

1
test-runner/src/android/test/InstrumentationTestRunner.java
View File

@@ -410,7 +410,6 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu
/** /**
* Add a {@link TestListener} * Add a {@link TestListener}
* @hide
*/ */
protected void addTestListener(TestListener listener){ protected void addTestListener(TestListener listener){
if(mTestRunner!=null && listener!=null){ if(mTestRunner!=null && listener!=null){