Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9b3d417 authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I0ef4731abf973ba7508792aa668994853dbd3156
parents 533a1917 89a59d29

test-base/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ java_sdk_library { 
    ],



    compile_dex: true,

    default_to_stubs: true,

}



// Build the android.test.base_static library

test-mock/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ java_sdk_library { 
        "android.test.mock",

    ],

    compile_dex: true,

    default_to_stubs: true,

}



// Make the current.txt available for use by the cts/tests/signature tests.

test-mock/src/android/test/mock/MockContentProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.pm.ProviderInfo; 
import android.content.res.AssetFileDescriptor;

import android.database.Cursor;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;

import android.os.IBinder;

import android.os.ICancellationSignal;
@@ -282,7 +283,7 @@ public class MockContentProvider extends ContentProvider { 
     * @hide

     */

    public IBinder getIContentProviderBinder() {

        throw new UnsupportedOperationException("unimplemented mock method");

        return new Binder();

    }



    /**

test-runner/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ java_sdk_library { 
    ],



    compile_dex: true,

    default_to_stubs: true,

}



// Build the android.test.runner-minus-junit library

test-runner/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ package android.test { 


  @Deprecated public class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {

    ctor @Deprecated public InstrumentationTestRunner();

    method @Deprecated protected void addTestListener(junit.framework.TestListener);

    method @Deprecated public junit.framework.TestSuite getAllTests();

    method @Deprecated protected android.test.AndroidTestRunner getAndroidTestRunner();

    method @Deprecated public android.os.Bundle getArguments();