Skip to content

Update tests to run on API 24+. #2493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −32
Open

Update tests to run on API 24+. #2493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runner/rules/javatests/androidx/test/rule/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ axt_android_library_test(
name = "GrantPermissionRuleTest",
srcs = ["GrantPermissionRuleTest.java"],
# runtime permissions only a thing from api 23+
device_list = devices(apis(min_api = 23)),
device_list = devices(apis(min_api = 24)),
deps = [
"//core",
"//ext/junit",
Expand Down
3 changes: 2 additions & 1 deletion testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="androidx.test.multiprocess.app">
android:targetPackage="androidx.test.multiprocess.app"
android:targetProcesses="*">
<meta-data
android:name="remoteMethod"
android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
Expand Down
12 changes: 4 additions & 8 deletions .../multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,12 @@

<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="androidx.test.multiprocess.app">
android:targetPackage="androidx.test.multiprocess.app"
android:targetProcesses="*">

<!-- explicitly instrument global process: -->
<meta-data
android:name="targetProcess"
android:value="foo.bar.global"/>

<!-- TODO: change to the syntax after next emulator image update -->
<!--android:targetProcess="foo.bar"-->

android:name="remoteMethod"
android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
</instrumentation>

</manifest>
12 changes: 4 additions & 8 deletions .../multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,12 @@

<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="androidx.test.multiprocess.app">
android:targetPackage="androidx.test.multiprocess.app"
android:targetProcesses="*">

<!-- explicitly instrument idling process: -->
<meta-data
android:name="targetProcess"
android:value="androidx.test.multiprocess.app:idling"/>

<!-- TODO: change to the syntax after next emulator image update -->
<!--android:targetProcess=":idling"-->

android:name="remoteMethod"
android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
</instrumentation>

</manifest>
Expand Down
11 changes: 4 additions & 7 deletions ...multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@

<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="androidx.test.multiprocess.app">
android:targetPackage="androidx.test.multiprocess.app"
android:targetProcesses="*">

<!-- explicitly instrument private process: -->
<meta-data
android:name="targetProcess"
android:value="androidx.test.multiprocess.app:PID2"/>

<!-- TODO: change to the syntax after next emulator image update -->
<!--android:targetProcess=":PID2"-->
android:name="remoteMethod"
android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
</instrumentation>

</manifest>
2 changes: 1 addition & 1 deletion testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ licenses(["notice"])
# Tests
# =========================================================

DEVICES = devices([23])
DEVICES = devices([28])

axt_android_application_test(
name = "DefaultProcessActivityTest",
Expand Down
7 changes: 5 additions & 2 deletions ...tiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
package androidx.test.multiprocess.app;

import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.junit.Assert.assertNotNull;

import androidx.test.ext.junit.rules.ActivityScenarioRule;
Expand All @@ -31,11 +34,11 @@
public class GlobalProcessActivityTest {

@Rule
public ActivityScenarioRule<GlobalProcessActivity> rule =
new ActivityScenarioRule<>(GlobalProcessActivity.class);
public ActivityScenarioRule<MainActivity> rule = new ActivityScenarioRule<>(MainActivity.class);

@Test
public void sanityTest() {
onView(withText("GlobalProcessActivity")).perform(click());
assertNotNull(getApplicationContext());
}
}
6 changes: 4 additions & 2 deletions ...pps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ public class IdlingActivityTest {
private static final String IDLING_PROC_NAME = "androidx.test.multiprocess.app:idling";

@Rule
public ActivityScenarioRule<IdlingActivity> activityRule =
new ActivityScenarioRule<>(IdlingActivity.class);
public ActivityScenarioRule<MainActivity> activityRule =
new ActivityScenarioRule<>(MainActivity.class);

@Test
public void verifyChangingTextAsynchronously() {
onView(withText("IdlingActivity")).perform(click());
// Type text and then press the button.
onView(withId(R.id.editTextUserInput))
.perform(typeText(STRING_TO_BE_TYPED), closeSoftKeyboard());
Expand All @@ -61,6 +62,7 @@ public void verifyChangingTextAsynchronously() {

@Test
public void verifyRunningInIdlingProcess() {
onView(withText("IdlingActivity")).perform(click());
onView(withId(R.id.textIdlingProcessName)).check(matches(withText(IDLING_PROC_NAME)));
}
}
5 changes: 3 additions & 2 deletions ...iprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package androidx.test.multiprocess.app;

import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
Expand All @@ -33,11 +34,11 @@ public class PrivateProcessActivityTest {
private static final String PRIVATE_PROC_NAME = "androidx.test.multiprocess.app:PID2";

@Rule
public ActivityScenarioRule<PrivateProcessActivity> rule =
new ActivityScenarioRule<>(PrivateProcessActivity.class);
public ActivityScenarioRule<MainActivity> rule = new ActivityScenarioRule<>(MainActivity.class);

@Test
public void verifyRunningInPrivateProcess() {
onView(withText("PrivateProcessActivity")).perform(click());
onView(withId(R.id.textPrivateProcessName)).check(matches(withText(PRIVATE_PROC_NAME)));
}
}
Loading