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

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

Browse Source 
See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: I75a79083fa9a8de8967b7c92dd1419069bd39127
This commit is contained in:
KOUSHIK PANUGANTI
2018-12-17 16:27:10 -08:00
parent a96b863ace
commit d0d2bbfacd
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/featureflagtests/Android.mk
View File

@@ -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

2
core/tests/featureflagtests/AndroidManifest.xml
View File

@@ -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" />

5
core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java
View File

@@ -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;