Skip to content

Commit 61eaca3

Browse files
brettchabotcopybara-androidxtest
brettchabot
authored and
copybara-androidxtest
committed
Internal
PiperOrigin-RevId: 605439108
1 parent 1b22973 commit 61eaca3

File tree

2 files changed

+6
-362
lines changed

2 files changed

+6
-362
lines changed

‎testapps/ui_testapp/javatests/androidx/test/ui/app/BUILD

Lines changed: 1 addition & 354 deletions
Original file line numberDiff line numberDiff line change
@@ -2,357 +2,4 @@
22
# Sample UI tests.
33

44
load("//build_extensions:android_app_instrumentation_tests.bzl", "android_app_instrumentation_tests")
5-
load("@build_bazel_rules_android//android:rules.bzl", "android_library")
6-
load(
7-
"//build_extensions:phone_devices.bzl",
8-
"apis",
9-
"devices",
10-
"gmscore_channel",
11-
)
12-
13-
licenses(["notice"])
14-
15-
package(
16-
default_applicable_licenses = ["//:license"],
17-
default_visibility = ["//opensource/visibility:testing_pkg"],
18-
)
19-
20-
android_library(
21-
name = "test_resources",
22-
assets = glob(["assets/**"]),
23-
assets_dir = "assets",
24-
manifest = "AndroidManifest.xml",
25-
)
26-
27-
android_library(
28-
name = "local_manifest",
29-
exports_manifest = 1,
30-
manifest = "AndroidManifest.xml",
31-
)
32-
33-
# Test classes that are supposed to run with only a subset of the sdks in DEVICES
34-
# Don't forget to add targets for these!
35-
SUPPRESSED_RANGE_TEST_CLASSES = [
36-
"DrawerActionsTest.java",
37-
"DuplicateViewActivityTest.java",
38-
"LongListMatchers.java",
39-
"MultipleWindowTest.java",
40-
"TransitionActivityMainTest.java",
41-
"TruncatedViewHierarchyActivityTest.java",
42-
"provider/FlightsContentProviderByRuleTest.java",
43-
"WebViewTest.java",
44-
"MainActivityTest.java",
45-
]
46-
47-
FLAKY_TESTS = ["VerticalSwipeTest.java"]
48-
49-
android_library(
50-
name = "LongListMatchers",
51-
testonly = 1,
52-
srcs = ["LongListMatchers.java"],
53-
deps = [
54-
"//espresso/core/java/androidx/test/espresso/matcher",
55-
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
56-
"@maven//:com_google_guava_guava",
57-
"@maven//:org_hamcrest_hamcrest_core",
58-
"@maven//:org_hamcrest_hamcrest_library",
59-
],
60-
)
61-
62-
android_app_instrumentation_tests(
63-
name = "samples",
64-
size = "large",
65-
srcs = glob(
66-
include = ["**/*.java"],
67-
exclude = SUPPRESSED_RANGE_TEST_CLASSES + FLAKY_TESTS,
68-
),
69-
binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
70-
tags = [
71-
"stable",
72-
],
73-
deps = [
74-
":LongListMatchers",
75-
":local_manifest",
76-
"//core",
77-
"//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
78-
"//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
79-
"//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
80-
"//espresso/contrib/java/androidx/test/espresso/contrib:picker_actions",
81-
"//espresso/core/java/androidx/test/espresso",
82-
"//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
83-
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
84-
"//espresso/intents/java/androidx/test/espresso/intent:intents",
85-
"//espresso/intents/java/androidx/test/espresso/intent/matcher",
86-
"//espresso/web/java/androidx/test/espresso/web/action",
87-
"//espresso/web/java/androidx/test/espresso/web/assertion",
88-
"//espresso/web/java/androidx/test/espresso/web/matcher",
89-
"//espresso/web/java/androidx/test/espresso/web/model",
90-
"//espresso/web/java/androidx/test/espresso/web/sugar",
91-
"//espresso/web/java/androidx/test/espresso/web/webdriver",
92-
"//ext/junit",
93-
"//opensource/androidx:annotation",
94-
"//runner/android_junit_runner",
95-
"//runner/rules",
96-
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
97-
"@maven//:androidx_core_core",
98-
"@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
99-
"@maven//:com_google_guava_guava",
100-
"@maven//:junit_junit",
101-
"@maven//:org_hamcrest_hamcrest_core",
102-
"@maven//:org_hamcrest_hamcrest_library",
103-
],
104-
)
105-
106-
android_app_instrumentation_tests(
107-
name = "DrawerActionsTest",
108-
size = "large",
109-
srcs = ["DrawerActionsTest.java"],
110-
binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
111-
device_list = devices(
112-
apis(min_api = 21),
113-
),
114-
tags = [
115-
"stable",
116-
],
117-
deps = [
118-
"//core",
119-
"//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
120-
"//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
121-
"//espresso/contrib/java/androidx/test/espresso/contrib:picker_actions",
122-
"//espresso/core/java/androidx/test/espresso",
123-
"//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
124-
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
125-
"//espresso/intents/java/androidx/test/espresso/intent:intents",
126-
"//espresso/intents/java/androidx/test/espresso/intent/matcher",
127-
"//espresso/web/java/androidx/test/espresso/web/action",
128-
"//espresso/web/java/androidx/test/espresso/web/assertion",
129-
"//espresso/web/java/androidx/test/espresso/web/matcher",
130-
"//espresso/web/java/androidx/test/espresso/web/model",
131-
"//espresso/web/java/androidx/test/espresso/web/sugar",
132-
"//espresso/web/java/androidx/test/espresso/web/webdriver",
133-
"//ext/junit",
134-
"//opensource/androidx:annotation",
135-
"//runner/android_junit_runner",
136-
"//runner/rules",
137-
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
138-
"@maven//:androidx_core_core",
139-
"@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
140-
"@maven//:com_google_guava_guava",
141-
"@maven//:junit_junit",
142-
"@maven//:org_hamcrest_hamcrest_library",
143-
],
144-
)
145-
146-
android_app_instrumentation_tests(
147-
name = "MultipleWindowTest",
148-
size = "large",
149-
srcs = ["MultipleWindowTest.java"],
150-
binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
151-
device_list = devices(
152-
apis(min_api = 24),
153-
),
154-
tags = [
155-
"stable",
156-
],
157-
deps = [
158-
"//core",
159-
"//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
160-
"//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
161-
"//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
162-
"//espresso/contrib/java/androidx/test/espresso/contrib:picker_actions",
163-
"//espresso/core/java/androidx/test/espresso",
164-
"//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
165-
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
166-
"//espresso/intents/java/androidx/test/espresso/intent:intents",
167-
"//espresso/intents/java/androidx/test/espresso/intent/matcher",
168-
"//espresso/web/java/androidx/test/espresso/web/action",
169-
"//espresso/web/java/androidx/test/espresso/web/assertion",
170-
"//espresso/web/java/androidx/test/espresso/web/matcher",
171-
"//espresso/web/java/androidx/test/espresso/web/model",
172-
"//espresso/web/java/androidx/test/espresso/web/sugar",
173-
"//espresso/web/java/androidx/test/espresso/web/webdriver",
174-
"//ext/junit",
175-
"//runner/android_junit_runner",
176-
"//runner/rules",
177-
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
178-
"@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
179-
"@maven//:com_google_guava_guava",
180-
"@maven//:junit_junit",
181-
"@maven//:org_hamcrest_hamcrest_library",
182-
],
183-
)
184-
185-
android_app_instrumentation_tests(
186-
name = "TransitionActivityMainTest",
187-
size = "large",
188-
srcs = ["TransitionActivityMainTest.java"],
189-
binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
190-
device_list = devices(
191-
apis(min_api = 21),
192-
),
193-
tags = [
194-
"stable",
195-
],
196-
deps = [
197-
"//core",
198-
"//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
199-
"//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
200-
"//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
201-
"//espresso/contrib/java/androidx/test/espresso/contrib:picker_actions",
202-
"//espresso/core/java/androidx/test/espresso",
203-
"//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
204-
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
205-
"//espresso/intents/java/androidx/test/espresso/intent:intents",
206-
"//espresso/intents/java/androidx/test/espresso/intent/matcher",
207-
"//espresso/web/java/androidx/test/espresso/web/action",
208-
"//espresso/web/java/androidx/test/espresso/web/assertion",
209-
"//espresso/web/java/androidx/test/espresso/web/matcher",
210-
"//espresso/web/java/androidx/test/espresso/web/model",
211-
"//espresso/web/java/androidx/test/espresso/web/sugar",
212-
"//espresso/web/java/androidx/test/espresso/web/webdriver",
213-
"//ext/junit",
214-
"//runner/android_junit_runner",
215-
"//runner/rules",
216-
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
217-
"@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
218-
"@maven//:com_google_guava_guava",
219-
"@maven//:junit_junit",
220-
"@maven//:org_hamcrest_hamcrest_library",
221-
],
222-
)
223-
224-
android_app_instrumentation_tests(
225-
name = "webview_tests",
226-
size = "large",
227-
srcs = [
228-
"MainActivityTest.java",
229-
"WebViewTest.java",
230-
],
231-
binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
232-
device_list = devices(
233-
apis(
234-
# TODO(b/232962936) aosp api 26 does not include webview
235-
exclude_apis = [26],
236-
),
237-
) + devices(
238-
[26],
239-
gms_channel = gmscore_channel.PREBUILT,
240-
),
241-
tags = [
242-
"stable",
243-
],
244-
deps = [
245-
"//core",
246-
"//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
247-
"//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
248-
"//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
249-
"//espresso/contrib/java/androidx/test/espresso/contrib:picker_actions",
250-
"//espresso/core/java/androidx/test/espresso",
251-
"//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
252-
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
253-
"//espresso/intents/java/androidx/test/espresso/intent:intents",
254-
"//espresso/intents/java/androidx/test/espresso/intent/matcher",
255-
"//espresso/web/java/androidx/test/espresso/web/action",
256-
"//espresso/web/java/androidx/test/espresso/web/assertion",
257-
"//espresso/web/java/androidx/test/espresso/web/matcher",
258-
"//espresso/web/java/androidx/test/espresso/web/model",
259-
"//espresso/web/java/androidx/test/espresso/web/sugar",
260-
"//espresso/web/java/androidx/test/espresso/web/webdriver",
261-
"//ext/junit",
262-
"//runner/android_junit_runner",
263-
"//runner/rules",
264-
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
265-
"@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
266-
"@maven//:com_google_guava_guava",
267-
"@maven//:junit_junit",
268-
"@maven//:org_hamcrest_hamcrest_library",
269-
],
270-
)
271-
272-
# TODO(b/150875830) Broken on API 27+. Add back to "samples" when fixed
273-
# TODO(b/150644182) Additional failures on simulated device sponge/f40d8989-703a-4765-8bbc-78b9e3247303
274-
android_app_instrumentation_tests(
275-
name = "provider/FlightsContentProviderByRuleTest",
276-
size = "large",
277-
srcs = ["provider/FlightsContentProviderByRuleTest.java"],
278-
binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
279-
device_list = devices(
280-
apis(max_api = 26),
281-
),
282-
tags = [
283-
"stable",
284-
],
285-
deps = [
286-
":local_manifest",
287-
":test_resources",
288-
"//core",
289-
"//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
290-
"//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
291-
"//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
292-
"//espresso/contrib/java/androidx/test/espresso/contrib:picker_actions",
293-
"//espresso/core/java/androidx/test/espresso",
294-
"//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
295-
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
296-
"//espresso/intents/java/androidx/test/espresso/intent:intents",
297-
"//espresso/intents/java/androidx/test/espresso/intent/matcher",
298-
"//espresso/web/java/androidx/test/espresso/web/action",
299-
"//espresso/web/java/androidx/test/espresso/web/assertion",
300-
"//espresso/web/java/androidx/test/espresso/web/matcher",
301-
"//espresso/web/java/androidx/test/espresso/web/model",
302-
"//espresso/web/java/androidx/test/espresso/web/sugar",
303-
"//espresso/web/java/androidx/test/espresso/web/webdriver",
304-
"//ext/junit",
305-
"//opensource/androidx:annotation",
306-
"//runner/android_junit_runner",
307-
"//runner/rules",
308-
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
309-
"@maven//:androidx_core_core",
310-
"@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
311-
"@maven//:com_google_guava_guava",
312-
"@maven//:junit_junit",
313-
],
314-
)
315-
316-
test_suite(
317-
name = "sample_tests",
318-
tags = ["stable"],
319-
)
320-
321-
android_app_instrumentation_tests(
322-
name = "VerticalSwipeTest",
323-
srcs = ["VerticalSwipeTest.java"],
324-
binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
325-
tags = [
326-
# TODO(b/202177238): flaky
327-
"notap",
328-
],
329-
deps = [
330-
":LongListMatchers",
331-
":local_manifest",
332-
"//core",
333-
"//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
334-
"//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
335-
"//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
336-
"//espresso/contrib/java/androidx/test/espresso/contrib:picker_actions",
337-
"//espresso/core/java/androidx/test/espresso",
338-
"//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
339-
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
340-
"//espresso/intents/java/androidx/test/espresso/intent:intents",
341-
"//espresso/intents/java/androidx/test/espresso/intent/matcher",
342-
"//espresso/web/java/androidx/test/espresso/web/action",
343-
"//espresso/web/java/androidx/test/espresso/web/assertion",
344-
"//espresso/web/java/androidx/test/espresso/web/matcher",
345-
"//espresso/web/java/androidx/test/espresso/web/model",
346-
"//espresso/web/java/androidx/test/espresso/web/sugar",
347-
"//espresso/web/java/androidx/test/espresso/web/webdriver",
348-
"//ext/junit",
349-
"//opensource/androidx:annotation",
350-
"//runner/android_junit_runner",
351-
"//runner/rules",
352-
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
353-
"@maven//:androidx_core_core",
354-
"@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
355-
"@maven//:com_google_guava_guava",
356-
"@maven//:junit_junit",
357-
],
358-
)
5+
load("//build_extensions:android_library_test.bzl", "axt_android_library_test")

‎testapps/ui_testapp/javatests/androidx/test/ui/app/VerticalSwipeTest.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,20 @@
2424
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2525
import static androidx.test.espresso.matcher.ViewMatchers.withText;
2626

27-
import androidx.test.core.app.ActivityScenario;
2827
import androidx.test.espresso.action.ViewActions;
28+
import androidx.test.ext.junit.rules.ActivityScenarioRule;
2929
import androidx.test.ext.junit.runners.AndroidJUnit4;
30-
import androidx.test.filters.LargeTest;
31-
import org.junit.Before;
30+
import org.junit.Rule;
3231
import org.junit.Test;
3332
import org.junit.runner.RunWith;
3433

3534
/** Demonstrates use of {@link ViewActions#swipeUp()} and {@link ViewActions#swipeDown()}. */
3635
@RunWith(AndroidJUnit4.class)
37-
@LargeTest
3836
public class VerticalSwipeTest {
3937

40-
@Before
41-
public void setUp() throws Exception {
42-
ActivityScenario.launch(VerticalViewPagerActivity.class);
43-
}
38+
@Rule
39+
public ActivityScenarioRule<VerticalViewPagerActivity> activityScenarioRule =
40+
new ActivityScenarioRule<>(VerticalViewPagerActivity.class);
4441

4542
@Test
4643
public void testSwipingThroughViews() {

0 commit comments

Comments
 (0)