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

Migrate BackgroundDexOptServiceIntegrationTests to androidx.test

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

Partial cherry-pick of commit a86ec10b96244a32931cd2949be0f55ee3ea14c8.

Test: atest BackgroundDexOptServiceIntegrationTests
Change-Id: I15d10a1962210cde7e079590437009f6a5938db2
Merged-In: I32fe3297656eec6060da6c7e24582bcd5315fb16
This commit is contained in:
Brett Chabot
2019-03-01 14:43:20 -08:00
committed by Andreas Gampe
parent a8ff8b2529
commit 3bc264d1a0
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/BackgroundDexOptServiceIntegrationTests/Android.bp
View File

@@ -17,7 +17,7 @@
android_test { android_test {
name: "BackgroundDexOptServiceIntegrationTests", name: "BackgroundDexOptServiceIntegrationTests",
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
static_libs: ["android-support-test"], static_libs: ["androidx.test.rules"],
platform_apis: true, platform_apis: true,
test_suites: ["device-tests"], test_suites: ["device-tests"],
certificate: "platform", certificate: "platform",

2
tests/BackgroundDexOptServiceIntegrationTests/AndroidManifest.xml
View File

@@ -34,7 +34,7 @@
</application> </application>
<instrumentation <instrumentation
android:name="android.support.test.runner.AndroidJUnitRunner" android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.frameworks.bgdexopttest" android:targetPackage="com.android.frameworks.bgdexopttest"
android:label="Integration test for BackgroundDexOptService" /> android:label="Integration test for BackgroundDexOptService" />
</manifest> </manifest>

2
tests/BackgroundDexOptServiceIntegrationTests/AndroidTest.xml
View File

@@ -50,6 +50,6 @@
<option name="test-tag" value="BackgroundDexOptServiceIntegrationTests"/> <option name="test-tag" value="BackgroundDexOptServiceIntegrationTests"/>
<test class="com.android.tradefed.testtype.AndroidJUnitTest"> <test class="com.android.tradefed.testtype.AndroidJUnitTest">
<option name="package" value="com.android.frameworks.bgdexopttest"/> <option name="package" value="com.android.frameworks.bgdexopttest"/>
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>
</test> </test>
</configuration> </configuration>

5
tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java
View File

@@ -17,17 +17,16 @@
package com.android.server.pm; package com.android.server.pm;
import android.app.AlarmManager; import android.app.AlarmManager;
import android.app.UiAutomation;
import android.content.Context; import android.content.Context;
import android.os.Environment; import android.os.Environment;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.support.test.InstrumentationRegistry;
import android.util.Log; import android.util.Log;
import androidx.test.InstrumentationRegistry;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;