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

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

Merge "Migrate packages/apps/Settings to androidx.test"

parents cec9f138 031dcf50

tests/anomaly-tester/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ LOCAL_CERTIFICATE := platform 
LOCAL_JAVA_LIBRARIES := android.test.runner



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    mockito-target \

    ub-uiautomator \

    truth-prebuilt \

tests/anomaly-tester/AndroidManifest.xml

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



    <instrumentation

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

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

        android:targetPackage="com.android.settings"

        android:label="Settings Test Cases">

    </instrumentation>

tests/anomaly-tester/src/com/android/settings/anomaly/tests/BluetoothAnomalyTest.java

+3 −2
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ import static com.google.common.truth.Truth.assertWithMessage; 
import android.app.Instrumentation;

import android.content.Context;

import android.content.Intent;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;

import android.text.format.DateUtils;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

tests/anomaly-tester/src/com/android/settings/anomaly/tests/WakelockAnomalyTest.java

+3 −2
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ import static com.google.common.truth.Truth.assertWithMessage; 
import android.app.Instrumentation;

import android.content.Context;

import android.content.Intent;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;

import android.text.format.DateUtils;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

tests/uitests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ LOCAL_JAVA_LIBRARIES := \ 
    android.test.base



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    app-helpers-core \

    launcher-helper-lib \

    metrics-helper-lib \