Skip to content

Commit

Permalink
Remove android_library_instrumentation_tests usages in favor of axt_a…
Browse files Browse the repository at this point in the history
…ndroid_library_test.

PiperOrigin-RevId: 567439955
  • Loading branch information
brettchabot authored and copybara-androidxtest committed Sep 21, 2023
1 parent 5fdd761 commit 5d69602
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 11 deletions.
4 changes: 3 additions & 1 deletion build_extensions/android_app_instrumentation_tests.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ def android_app_instrumentation_tests(
library_args = {},
binary_args = {},
**kwargs):
"""A macro for an instrumentation test whose target under test is an android_binary.
"""DEPRECATED: use axt_android_library_test instead.
A macro for an instrumentation test whose target under test is an android_binary.
The intent of this wrapper is to simplify the build API for creating instrumentation test rules
for simple cases, while still supporting build_cleaner for automatic dependency management.
Expand Down
10 changes: 5 additions & 5 deletions espresso/idling_resource/javatests/androidx/test/espresso/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
# Tests for espresso idling resources

load(
"//build_extensions:android_library_instrumentation_tests.bzl",
"android_library_instrumentation_tests",
"//build_extensions:android_library_test.bzl",
"axt_android_library_test",
)

package(default_applicable_licenses = ["//espresso:license"])

licenses(["notice"])

android_library_instrumentation_tests(
name = "instrumentation_tests",
srcs = glob(["**/*.java"]),
axt_android_library_test(
name = "IdlingRegistryTest",
srcs = ["IdlingRegistryTest.java"],
deps = [
"//core",
"//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Description:
# Tests for espresso idling resources

load(
"//build_extensions:android_library_test.bzl",
"axt_android_library_test",
)

package(default_applicable_licenses = ["//espresso:license"])

licenses(["notice"])

axt_android_library_test(
name = "CountingIdlingResourceTest",
srcs = ["CountingIdlingResourceTest.java"],
deps = [
"//core",
"//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
"//ext/junit",
"//runner/android_junit_runner",
"@maven//:junit_junit",
"@maven//:org_mockito_mockito_core",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
# Tests for Network Idling Resources

load(
"//build_extensions:android_library_instrumentation_tests.bzl",
"android_library_instrumentation_tests",
"//build_extensions:android_library_test.bzl",
"axt_android_library_test",
)

package(default_applicable_licenses = ["//espresso:license"])

licenses(["notice"])

android_library_instrumentation_tests(
name = "instrumentation_tests",
srcs = glob(["**/*.java"]),
axt_android_library_test(
name = "UriIdlingResourceTest",
srcs = ["UriIdlingResourceTest.java"],
deps = [
"//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
Expand Down

0 comments on commit 5d69602

Please sign in to comment.