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

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

Merge "Migrate frameworks/base/core/tests/featureflagtests to androidx.test"

parents a695f1da d0d2bbfa

core/tests/featureflagtests/Android.mk

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



LOCAL_DX_FLAGS := --core-library

LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib android-support-test

LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib androidx.test.rules

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base

LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests

LOCAL_PRIVATE_PLATFORM_APIS := true

core/tests/featureflagtests/AndroidManifest.xml

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



    <instrumentation

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

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

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

        android:label="Frameworks FeatureFlagUtils Tests" />

core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java

+3 −2
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ import static junit.framework.Assert.assertTrue; 
import android.content.Context;

import android.os.SystemProperties;

import android.provider.Settings;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;