Skip to content

Commit 535899b

Browse files
brettchabotcopybara-androidxtest
authored andcommitted
Remove testonly = 0 from bazel targets.
This is a prerequisite to moving to new bazel version, where junit is marked testonly = 1. PiperOrigin-RevId: 736615475
1 parent 8a5a91f commit 535899b

File tree

173 files changed

+423
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+423
-191
lines changed

build_extensions/kt_android_library.bzl

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33

44
load("@io_bazel_rules_kotlin//kotlin:android.bzl", io_kt_android_library = "kt_android_library")
55

6-
def kt_android_library(**kwargs):
7-
io_kt_android_library(**kwargs)
6+
def kt_android_library(testonly = 1, **kwargs):
7+
# explicitly set testonly to 1 because io_kt_android_library doesn't seem to respect package(default_testonly = 1)
8+
io_kt_android_library(testonly = testonly, **kwargs)

core/BUILD

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# Publicly visible androidx.test.core API library
22

3-
package(default_applicable_licenses = ["//:license"])
3+
package(
4+
default_applicable_licenses = ["//:license"],
5+
default_testonly = 1,
6+
)
47

58
licenses(["notice"])
69

710
alias(
811
name = "core",
9-
testonly = 1,
1012
actual = "//core/java/androidx/test/core",
1113
visibility = ["//visibility:public"],
1214
)
@@ -16,7 +18,6 @@ alias(
1618
# for the bootstrap activities
1719
alias(
1820
name = "manifest",
19-
testonly = 1,
2021
actual = "//core/java/androidx/test/core:manifest",
2122
visibility = ["//visibility:public"],
2223
)

core/java/androidx/test/core/BUILD

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
1010
# all users should reference the equivalent targets in //core
1111
package(
1212
default_applicable_licenses = ["//:license"],
13+
default_testonly = 1,
1314
default_visibility = [
1415
":allowlist",
1516
],
@@ -59,7 +60,6 @@ kt_android_library(
5960
# TODO(b/199522848): delete these targets once espresso moves to testonly
6061
android_library(
6162
name = "core",
62-
testonly = 1,
6363
exports = [":core_internal"],
6464
)
6565

@@ -72,7 +72,6 @@ android_library(
7272
# kt_android_library does not produce an aar, so wrap in a android_library for release
7373
android_library(
7474
name = "core_aar_lib",
75-
testonly = 1,
7675
manifest = "AndroidManifest.xml",
7776
resource_files = glob(["res/**"]),
7877
visibility = ["//visibility:private"],
@@ -90,7 +89,6 @@ alias(
9089
# Generate rules for the release artifacts.
9190
axt_android_aar(
9291
name = "core_aar",
93-
testonly = 1,
9492
expected_class_prefixes = [
9593
"androidx.test.core",
9694
],
@@ -99,7 +97,6 @@ axt_android_aar(
9997

10098
maven_artifact(
10199
name = "core_maven_artifact",
102-
testonly = 1,
103100
last_updated = "20180403000000",
104101
target = ":core_aar",
105102
)

core/javatests/androidx/test/core/app/testing/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ licenses(["notice"])
1212

1313
kt_android_library(
1414
name = "testing",
15-
testonly = 1,
1615
srcs = glob([
1716
"**/*.java",
1817
"**/*.kt",

espresso/BUILD

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
load("@rules_license//rules:license.bzl", "license")
22

3-
package(default_applicable_licenses = ["//espresso:license"])
3+
package(
4+
default_applicable_licenses = ["//espresso:license"],
5+
default_testonly = 1,
6+
)
47

58
license(
69
name = "license",

espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ licenses(["notice"])
1010

1111
package(
1212
default_applicable_licenses = ["//espresso:license"],
13+
default_testonly = 1,
1314
default_visibility = ["//:__subpackages__"],
1415
)
1516

1617
android_library(
1718
name = "accessibility_checks",
18-
testonly = 1,
1919
srcs = [
2020
"AccessibilityChecks.java",
2121
],
@@ -31,7 +31,6 @@ android_library(
3131

3232
axt_android_aar(
3333
name = "accessibility_checks_aar",
34-
testonly = 1,
3534
expected_class_prefixes = [
3635
"androidx.test.espresso.accessibility",
3736
],
@@ -40,7 +39,6 @@ axt_android_aar(
4039

4140
maven_artifact(
4241
name = "accessibility_checks_maven_artifact",
43-
testonly = 1,
4442
last_updated = "20170622000000",
4543
target = ":accessibility_checks_aar",
4644
)

espresso/accessibility/javatests/androidx/test/espresso/accessibility/BUILD

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ load(
66
"axt_android_library_test",
77
)
88

9-
package(default_applicable_licenses = ["//espresso:license"])
9+
package(
10+
default_applicable_licenses = ["//espresso:license"],
11+
default_testonly = 1,
12+
)
1013

1114
licenses(["notice"])
1215

espresso/contrib/java/androidx/test/espresso/contrib/BUILD

+1-8
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ licenses(["notice"])
1212

1313
package(
1414
default_applicable_licenses = ["//espresso:license"],
15+
default_testonly = 1,
1516
default_visibility = ["//:__subpackages__"],
1617
)
1718

@@ -51,7 +52,6 @@ android_library(
5152

5253
android_library(
5354
name = "picker_actions",
54-
testonly = 1,
5555
srcs = ["PickerActions.java"],
5656
visibility = ["//visibility:public"],
5757
deps = [
@@ -87,7 +87,6 @@ jetify_android_library(
8787

8888
android_library(
8989
name = "drawer_actions",
90-
testonly = 1,
9190
srcs = [
9291
"DrawerActions.java",
9392
"DrawerMatchers.java",
@@ -116,7 +115,6 @@ android_library(
116115

117116
android_library(
118117
name = "accessibility_checks",
119-
testonly = 1,
120118
srcs = [
121119
"AccessibilityChecks.java",
122120
],
@@ -130,7 +128,6 @@ android_library(
130128

131129
android_library(
132130
name = "design_lib_actions",
133-
testonly = 1,
134131
srcs = ["NavigationViewActions.java"],
135132
visibility = ["//visibility:public"],
136133
deps = [
@@ -146,7 +143,6 @@ android_library(
146143

147144
android_library(
148145
name = "view_pager_actions",
149-
testonly = 1,
150146
srcs = ["ViewPagerActions.java"],
151147
visibility = ["//visibility:public"],
152148
deps = [
@@ -160,7 +156,6 @@ android_library(
160156

161157
android_library(
162158
name = "espresso_contrib_aar_lib",
163-
testonly = 1,
164159
manifest = "AndroidManifest.xml",
165160
resource_files = glob(["res/**"]),
166161
exports = [
@@ -176,7 +171,6 @@ android_library(
176171

177172
axt_android_aar(
178173
name = "espresso_contrib_aar",
179-
testonly = 1,
180174
expected_class_prefixes = [
181175
"androidx.test.espresso.contrib",
182176
],
@@ -185,7 +179,6 @@ axt_android_aar(
185179

186180
maven_artifact(
187181
name = "espresso_contrib_maven_artifact",
188-
testonly = 1,
189182
last_updated = "20170622000000",
190183
target = ":espresso_contrib_aar",
191184
)

espresso/contrib/javatests/androidx/test/espresso/contrib/BUILD

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ load(
77
)
88
load("//build_extensions:jetify.bzl", "jetify_android_library")
99

10-
package(default_applicable_licenses = ["//espresso:license"])
10+
package(
11+
default_applicable_licenses = ["//espresso:license"],
12+
default_testonly = 1,
13+
)
1114

1215
licenses(["notice"])
1316
## Android tests
1417

1518
jetify_android_library(
1619
name = "recycler_view_tests",
17-
testonly = 1,
1820
srcs = [
1921
"RecyclerViewGridLayoutManagerTest.java",
2022
"RecyclerViewIntegrationTest.java",

espresso/core/BUILD

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# Alias for androidx.test.espresso.core API library
22

3-
package(default_applicable_licenses = ["//espresso:license"])
3+
package(
4+
default_applicable_licenses = ["//espresso:license"],
5+
default_testonly = 1,
6+
)
47

58
licenses(["notice"])
69

710
alias(
811
name = "core",
9-
testonly = 1,
1012
actual = "//espresso/core/java/androidx/test/espresso",
1113
visibility = ["//visibility:public"],
1214
)

espresso/core/java/androidx/test/espresso/BUILD

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ package_group(
2525

2626
package(
2727
default_applicable_licenses = ["//espresso:license"],
28+
default_testonly = 1,
2829
default_visibility = ["//visibility:public"],
2930
)
3031

@@ -215,7 +216,6 @@ android_library(
215216

216217
axt_android_aar(
217218
name = "espresso_core_aar",
218-
testonly = 1,
219219
expected_class_prefixes = [
220220
"androidx.test.espresso",
221221
],
@@ -226,7 +226,6 @@ axt_android_aar(
226226

227227
maven_artifact(
228228
name = "espresso_core_maven_artifact",
229-
testonly = 1,
230229
last_updated = "20170622000000",
231230
target = ":espresso_core_aar",
232231
)

espresso/core/java/androidx/test/espresso/action/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ licenses(["notice"])
88

99
package(
1010
default_applicable_licenses = ["//espresso:license"],
11+
default_testonly = 1,
1112
default_visibility = ["//visibility:public"],
1213
)
1314

espresso/core/java/androidx/test/espresso/assertion/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//espresso:license"],
10+
default_testonly = 1,
1011
default_visibility = ["//visibility:public"],
1112
)
1213

espresso/core/java/androidx/test/espresso/base/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//espresso:license"],
10+
default_testonly = 1,
1011
default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
1112
)
1213

@@ -49,7 +50,6 @@ android_library(
4950

5051
android_library(
5152
name = "active_root_lister",
52-
testonly = 1,
5353
srcs = ["ActiveRootLister.java"],
5454
visibility = [
5555
"//espresso/core/java/androidx/test/espresso:espresso_first_party",

espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//:license"],
10+
default_testonly = 1,
1011
default_visibility = ["//espresso/core/java/androidx/test/espresso:__pkg__"],
1112
)
1213

espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//:license"],
10+
default_testonly = 1,
1011
default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
1112
)
1213

espresso/core/java/androidx/test/espresso/internal/data/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ licenses(["notice"])
55

66
package(
77
default_applicable_licenses = ["//espresso:license"],
8+
default_testonly = 1,
89
default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
910
)
1011

espresso/core/java/androidx/test/espresso/internal/data/model/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ licenses(["notice"])
55

66
package(
77
default_applicable_licenses = ["//espresso:license"],
8+
default_testonly = 1,
89
default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
910
)
1011

espresso/core/java/androidx/test/espresso/internal/inject/BUILD

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
load("@build_bazel_rules_android//android:rules.bzl", "android_library")
55

6-
package(default_applicable_licenses = ["//espresso:license"])
6+
package(
7+
default_applicable_licenses = ["//espresso:license"],
8+
default_testonly = 1,
9+
)
710

811
licenses(["notice"])
912

espresso/core/java/androidx/test/espresso/matcher/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//espresso:license"],
10+
default_testonly = 1,
1011
default_visibility = ["//visibility:public"],
1112
)
1213

espresso/core/java/androidx/test/espresso/remote/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//espresso:license"],
10+
default_testonly = 1,
1011
default_visibility = ["//:__subpackages__"],
1112
)
1213

espresso/core/java/androidx/test/espresso/remote/annotation/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//espresso:license"],
10+
default_testonly = 1,
1011
default_visibility = [
1112
"//espresso/core/java/androidx/test/espresso:espresso_pkg",
1213
],

espresso/core/java/androidx/test/espresso/util/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//espresso:license"],
10+
default_testonly = 1,
1011
default_visibility = ["//visibility:public"],
1112
)
1213

espresso/core/java/androidx/test/espresso/util/concurrent/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ licenses(["notice"])
77

88
package(
99
default_applicable_licenses = ["//:license"],
10+
default_testonly = 1,
1011
default_visibility = ["//espresso:__subpackages__"],
1112
)
1213

espresso/core/javatests/androidx/test/espresso/BUILD

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ load(
1111
"axt_android_application_test",
1212
)
1313

14-
package(default_applicable_licenses = ["//espresso:license"])
14+
package(
15+
default_applicable_licenses = ["//espresso:license"],
16+
default_testonly = 1,
17+
)
1518

1619
licenses(["notice"])
1720

0 commit comments

Comments
 (0)