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

Commit 3bc264d1 authored by Brett Chabot's avatar Brett Chabot Committed by Andreas Gampe
Browse files

Migrate BackgroundDexOptServiceIntegrationTests to androidx.test 

See go/jetpack-test-android-migration

Partial cherry-pick of commit a86ec10b96244a32931cd2949be0f55ee3ea14c8.

Test: atest BackgroundDexOptServiceIntegrationTests
Change-Id: I15d10a1962210cde7e079590437009f6a5938db2
Merged-In: I32fe3297656eec6060da6c7e24582bcd5315fb16
parent a8ff8b25

tests/BackgroundDexOptServiceIntegrationTests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
android_test {

    name: "BackgroundDexOptServiceIntegrationTests",

    srcs: ["src/**/*.java"],

    static_libs: ["android-support-test"],

    static_libs: ["androidx.test.rules"],

    platform_apis: true,

    test_suites: ["device-tests"],

    certificate: "platform",

tests/BackgroundDexOptServiceIntegrationTests/AndroidManifest.xml

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



    <instrumentation

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

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

        android:targetPackage="com.android.frameworks.bgdexopttest"

        android:label="Integration test for BackgroundDexOptService" />

</manifest>

tests/BackgroundDexOptServiceIntegrationTests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,6 +50,6 @@ 
    <option name="test-tag" value="BackgroundDexOptServiceIntegrationTests"/>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

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

</configuration>

tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java

+2 −3
Original line number Diff line number Diff line
@@ -17,17 +17,16 @@ 
package com.android.server.pm;



import android.app.AlarmManager;

import android.app.UiAutomation;

import android.content.Context;

import android.os.Environment;

import android.os.ParcelFileDescriptor;

import android.os.SystemProperties;

import android.os.storage.StorageManager;

import android.support.test.InstrumentationRegistry;

import android.util.Log;



import androidx.test.InstrumentationRegistry;



import org.junit.After;

import org.junit.AfterClass;

import org.junit.Assert;

import org.junit.Before;

import org.junit.BeforeClass;