From a337f516cdce2882bb2a9661229f92a14d898fe3 Mon Sep 17 00:00:00 2001 From: Ang Li Date: Mon, 28 Jan 2019 17:30:29 -0800 Subject: Migrate to `androidx`. (#101) --- examples/ex2_espresso/src/androidTest/AndroidManifest.xml | 2 +- .../android/mobly/snippet/example2/EspressoTest.java | 14 +++++++------- .../android/mobly/snippet/example2/MainActivity.java | 2 +- .../android/mobly/snippet/example2/EspressoSnippet.java | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'examples/ex2_espresso/src') diff --git a/examples/ex2_espresso/src/androidTest/AndroidManifest.xml b/examples/ex2_espresso/src/androidTest/AndroidManifest.xml index eaedb4d..0dc87bc 100644 --- a/examples/ex2_espresso/src/androidTest/AndroidManifest.xml +++ b/examples/ex2_espresso/src/androidTest/AndroidManifest.xml @@ -6,6 +6,6 @@ diff --git a/examples/ex2_espresso/src/androidTest/java/com/google/android/mobly/snippet/example2/EspressoTest.java b/examples/ex2_espresso/src/androidTest/java/com/google/android/mobly/snippet/example2/EspressoTest.java index 770823e..f41374e 100644 --- a/examples/ex2_espresso/src/androidTest/java/com/google/android/mobly/snippet/example2/EspressoTest.java +++ b/examples/ex2_espresso/src/androidTest/java/com/google/android/mobly/snippet/example2/EspressoTest.java @@ -16,18 +16,18 @@ package com.google.android.mobly.snippet.example2; -import android.support.test.espresso.action.ViewActions; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.espresso.action.ViewActions; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; /** * This test is not part of the snippet code. It's a regular espresso instrumentation test which diff --git a/examples/ex2_espresso/src/main/java/com/google/android/mobly/snippet/example2/MainActivity.java b/examples/ex2_espresso/src/main/java/com/google/android/mobly/snippet/example2/MainActivity.java index 940418a..0cc0b54 100644 --- a/examples/ex2_espresso/src/main/java/com/google/android/mobly/snippet/example2/MainActivity.java +++ b/examples/ex2_espresso/src/main/java/com/google/android/mobly/snippet/example2/MainActivity.java @@ -17,7 +17,7 @@ package com.google.android.mobly.snippet.example2; import java.util.Locale; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; diff --git a/examples/ex2_espresso/src/snippet/java/com/google/android/mobly/snippet/example2/EspressoSnippet.java b/examples/ex2_espresso/src/snippet/java/com/google/android/mobly/snippet/example2/EspressoSnippet.java index b76a892..8ea7c21 100644 --- a/examples/ex2_espresso/src/snippet/java/com/google/android/mobly/snippet/example2/EspressoSnippet.java +++ b/examples/ex2_espresso/src/snippet/java/com/google/android/mobly/snippet/example2/EspressoSnippet.java @@ -16,13 +16,13 @@ package com.google.android.mobly.snippet.example2; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; -import android.support.test.espresso.action.ViewActions; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.action.ViewActions; +import androidx.test.rule.ActivityTestRule; import com.google.android.mobly.snippet.Snippet; import com.google.android.mobly.snippet.rpc.Rpc; import org.junit.Rule; -- cgit v1.2.3