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

Commit 93225120 authored by KOUSHIK PANUGANTI's avatar KOUSHIK PANUGANTI
Browse files

Migrate frameworks/base/core/tests/packagemanagertests to androidx.test 

See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: I77ed585671ba19f2d0f6c862cd17b24db954c615
parent dd54e67f

core/tests/packagemanagertests/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := \ 
    $(call all-java-files-under, src)

    $(call all-java-files-under, src)





LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    frameworks-base-testutils \

    frameworks-base-testutils \

    mockito-target-minus-junit4

    mockito-target-minus-junit4

core/tests/packagemanagertests/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
    </application>

    </application>





    <instrumentation

    <instrumentation

            android:name="android.support.test.runner.AndroidJUnitRunner"

            android:name="androidx.test.runner.AndroidJUnitRunner"

            android:targetPackage="com.android.frameworks.coretests.packagemanager"

            android:targetPackage="com.android.frameworks.coretests.packagemanager"

            android:label="Frameworks PackageManager Core Tests" />

            android:label="Frameworks PackageManager Core Tests" />

core/tests/packagemanagertests/src/android/content/pm/KernelPackageMappingTests.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -22,10 +22,11 @@ import android.content.Context; 
import android.os.FileUtils;

import android.os.FileUtils;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.UserManager;

import android.os.UserManager;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.util.Log;

import android.util.Log;





import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.After;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;