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

Commit 6567a94a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate... 

Merge "Migrate frameworks/base/core/tests/overlaytests/host/test-apps/UpdateOverlay to androidx.test"
parents 964d112c b45dc903

core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk

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

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/host/test-apps/UpdateOverlay/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        <uses-library android:name="android.test.runner" />

    </application>



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

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

        android:targetPackage="com.android.server.om.hosttest.update_overlay_test"

        android:label="Update Overlay Test"/>

</manifest>

core/tests/overlaytests/host/test-apps/UpdateOverlay/src/com/android/server/om/hosttest/update_overlay_test/UpdateOverlayTest.java

+4 −3
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ import static org.junit.Assert.assertEquals; 


import android.content.res.Configuration;

import android.content.res.Resources;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;