Internal Code Change

copybara-androidxtest · copybara-androidxtest · commit dbe2479b1ea8 · 2023-05-22T13:39:57.000-07:00
PiperOrigin-RevId: 534168017
diff --git a/core/javatests/androidx/test/core/app/BUILD b/core/javatests/androidx/test/core/app/BUILD
@@ -89,7 +89,6 @@ axt_android_local_test(
         "//runner/monitor/java/androidx/test:monitor",
         "@maven//:androidx_lifecycle_lifecycle_common",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
@@ -103,7 +102,6 @@ axt_android_local_test(
         "//core",
         "//ext/junit",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/core/javatests/androidx/test/core/content/pm/BUILD b/core/javatests/androidx/test/core/content/pm/BUILD
@@ -18,7 +18,6 @@ axt_android_local_test(
         "//core",
         "//ext/junit",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
@@ -42,7 +41,6 @@ axt_android_local_test(
         "//core",
         "//ext/junit",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/core/javatests/androidx/test/core/os/BUILD b/core/javatests/androidx/test/core/os/BUILD
@@ -18,7 +18,6 @@ axt_android_local_test(
         "//core",
         "//ext/junit",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/core/javatests/androidx/test/core/view/BUILD b/core/javatests/androidx/test/core/view/BUILD
@@ -19,7 +19,6 @@ axt_android_local_test(
         "//ext/junit",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/espresso/core/javatests/androidx/test/espresso/util/BUILD b/espresso/core/javatests/androidx/test/espresso/util/BUILD
@@ -34,6 +34,5 @@ axt_android_local_test(
         "//espresso/core/java/androidx/test/espresso/util",
         "//runner/android_junit_runner",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
diff --git a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/BUILD b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/BUILD
@@ -18,7 +18,6 @@ axt_android_local_test(
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
         "//ext/junit",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
         "@maven//:org_mockito_mockito_core",
     ],
 )
@@ -34,7 +33,6 @@ axt_android_local_test(
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
         "//ext/junit",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
         "@maven//:org_mockito_mockito_core",
     ],
 )
diff --git a/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD b/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD
@@ -17,7 +17,6 @@ axt_android_local_test(
         "//runner/monitor",
         "@maven//:androidx_lifecycle_lifecycle_common",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
@@ -59,7 +58,6 @@ axt_android_local_test(
         "//core",
         "//ext/junit",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD b/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD
@@ -17,7 +17,6 @@ axt_android_local_test(
         "//runner/monitor",
         "@maven//:androidx_lifecycle_lifecycle_common",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/ext/truth/javatests/androidx/test/ext/truth/content/BUILD b/ext/truth/javatests/androidx/test/ext/truth/content/BUILD
@@ -17,7 +17,6 @@ axt_android_local_test(
         "//runner/rules",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/ext/truth/javatests/androidx/test/ext/truth/location/BUILD b/ext/truth/javatests/androidx/test/ext/truth/location/BUILD
@@ -17,7 +17,6 @@ axt_android_local_test(
         "//runner/rules",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/ext/truth/javatests/androidx/test/ext/truth/os/BUILD b/ext/truth/javatests/androidx/test/ext/truth/os/BUILD
@@ -17,7 +17,6 @@ axt_android_local_test(
         "//runner/rules",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
@@ -47,7 +46,6 @@ axt_android_local_test(
         "//runner/rules",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/ext/truth/javatests/androidx/test/ext/truth/util/BUILD b/ext/truth/javatests/androidx/test/ext/truth/util/BUILD
@@ -17,7 +17,6 @@ axt_android_local_test(
         "//runner/rules",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/ktx/core/javatests/androidx/test/core/app/BUILD b/ktx/core/javatests/androidx/test/core/app/BUILD
@@ -24,7 +24,6 @@ axt_android_local_test(
         "@maven//:androidx_lifecycle_lifecycle_common",
         "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD
@@ -25,7 +25,6 @@ axt_android_local_test(
         "//runner/monitor",
         "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
@@ -65,7 +64,6 @@ axt_android_local_test(
         "@maven//:androidx_lifecycle_lifecycle_common",
         "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD
@@ -54,7 +54,6 @@ axt_android_local_test(
         "//ext/junit",
         "//runner/android_junit_runner",
         "//services/events/java/androidx/test/services/events",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
         "@maven//:org_mockito_mockito_core",
@@ -69,7 +68,6 @@ axt_android_local_test(
     ],
     deps = [
         "//runner/android_junit_runner",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
         "@maven//:org_mockito_mockito_core",
@@ -86,7 +84,6 @@ axt_android_local_test(
         "//runner/android_junit_runner",
         "//services/events/java/androidx/test/services/events",
         "@maven//:androidx_annotation_annotation",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
         "@maven//:org_mockito_mockito_core",
@@ -115,6 +112,5 @@ axt_android_local_test(
         "//ext/junit",
         "//runner/android_junit_runner",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD
@@ -234,7 +234,6 @@ axt_android_local_test(
         "//runner/android_junit_runner",
         "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/runner/android_junit_runner/javatests/androidx/test/orchestrator/callback/BUILD b/runner/android_junit_runner/javatests/androidx/test/orchestrator/callback/BUILD
@@ -14,7 +14,6 @@ axt_android_local_test(
     deps = [
         "//runner/android_junit_runner",
         "//services/events/java/androidx/test/services/events",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
         "@maven//:org_mockito_mockito_core",
@@ -30,7 +29,6 @@ axt_android_local_test(
     deps = [
         "//runner/android_junit_runner",
         "//services/events/java/androidx/test/services/events",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
         "@maven//:org_mockito_mockito_core",
diff --git a/runner/android_junit_runner/javatests/androidx/test/orchestrator/junit/BUILD b/runner/android_junit_runner/javatests/androidx/test/orchestrator/junit/BUILD
@@ -15,7 +15,6 @@ axt_android_local_test(
         "//runner/android_junit_runner",
         "//runner/android_junit_runner/javatests/androidx/test/orchestrator:sample_junit_test",
         "//services/events/java/androidx/test/services/events",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
         "@maven//:org_mockito_mockito_core",
diff --git a/runner/android_junit_runner/javatests/androidx/test/orchestrator/listeners/BUILD b/runner/android_junit_runner/javatests/androidx/test/orchestrator/listeners/BUILD
@@ -15,7 +15,6 @@ axt_android_local_test(
         "//runner/android_junit_runner",
         "//runner/android_junit_runner/javatests/androidx/test/orchestrator:sample_junit_test",
         "//services/events/java/androidx/test/services/events",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_mockito_mockito_core",
     ],
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/BUILD b/runner/android_junit_runner/javatests/androidx/test/runner/BUILD
@@ -35,7 +35,6 @@ axt_android_local_test(
     deps = [
         "//runner/android_junit_runner",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
@@ -50,6 +49,5 @@ axt_android_local_test(
         "//runner/android_junit_runner",
         "@maven//:androidx_tracing_tracing",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
diff --git a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/BUILD b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/BUILD
@@ -29,7 +29,6 @@ axt_android_local_test(
         "//ext/junit",
         "//runner/android_test_orchestrator",
         "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
     ],
@@ -46,7 +45,6 @@ axt_android_local_test(
         "//ext/junit",
         "//runner/android_test_orchestrator",
         "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
     ],
@@ -63,7 +61,6 @@ axt_android_local_test(
         "//ext/junit",
         "//runner/android_test_orchestrator",
         "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
     ],
diff --git a/runner/monitor/javatests/androidx/test/internal/util/BUILD b/runner/monitor/javatests/androidx/test/internal/util/BUILD
@@ -18,6 +18,5 @@ axt_android_local_test(
     deps = [
         "//runner/monitor",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
diff --git a/runner/monitor/javatests/androidx/test/platform/io/BUILD b/runner/monitor/javatests/androidx/test/platform/io/BUILD
@@ -27,7 +27,6 @@ axt_android_local_test(
         "@maven//:androidx_annotation_annotation",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_mockito_mockito_core",
     ],
diff --git a/runner/monitor/javatests/androidx/test/platform/tracing/BUILD b/runner/monitor/javatests/androidx/test/platform/tracing/BUILD
@@ -30,7 +30,6 @@ axt_android_local_test(
         "//runner/monitor",
         "@maven//:androidx_tracing_tracing",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
diff --git a/services/events/javatests/androidx/test/services/events/discovery/BUILD b/services/events/javatests/androidx/test/services/events/discovery/BUILD
@@ -21,7 +21,6 @@ axt_android_local_test(
         "//ext/junit",
         "//services/events/java/androidx/test/services/events",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
@@ -35,7 +34,6 @@ axt_android_local_test(
         "//ext/junit",
         "//services/events/java/androidx/test/services/events",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )
 
@@ -49,6 +47,5 @@ axt_android_local_test(
         "//ext/junit",
         "//services/events/java/androidx/test/services/events",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ axt_android_local_test(`
`89`	`89`	`"//runner/monitor/java/androidx/test:monitor",`
`90`	`90`	`"@maven//:androidx_lifecycle_lifecycle_common",`
`91`	`91`	`"@maven//:com_google_truth_truth",`
`92`		`- "@maven//:junit_junit",`
`93`	`92`	`],`
`94`	`93`	`)`
`95`	`94`
`@@ -103,7 +102,6 @@ axt_android_local_test(`
`103`	`102`	`"//core",`
`104`	`103`	`"//ext/junit",`
`105`	`104`	`"@maven//:com_google_truth_truth",`
`106`		`- "@maven//:junit_junit",`
`107`	`105`	`],`
`108`	`106`	`)`
`109`	`107`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ axt_android_local_test(`
`18`	`18`	`"//core",`
`19`	`19`	`"//ext/junit",`
`20`	`20`	`"@maven//:com_google_truth_truth",`
`21`		`- "@maven//:junit_junit",`
`22`	`21`	`],`
`23`	`22`	`)`
`24`	`23`
`@@ -42,7 +41,6 @@ axt_android_local_test(`
`42`	`41`	`"//core",`
`43`	`42`	`"//ext/junit",`
`44`	`43`	`"@maven//:com_google_truth_truth",`
`45`		`- "@maven//:junit_junit",`
`46`	`44`	`],`
`47`	`45`	`)`
`48`	`46`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ axt_android_local_test(`
`19`	`19`	`"//ext/junit",`
`20`	`20`	`"@maven//:com_google_guava_guava",`
`21`	`21`	`"@maven//:com_google_truth_truth",`
`22`		`- "@maven//:junit_junit",`
`23`	`22`	`],`
`24`	`23`	`)`
`25`	`24`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,5 @@ axt_android_local_test(`
`34`	`34`	`"//espresso/core/java/androidx/test/espresso/util",`
`35`	`35`	`"//runner/android_junit_runner",`
`36`	`36`	`"@maven//:com_google_truth_truth",`
`37`		`- "@maven//:junit_junit",`
`38`	`37`	`],`
`39`	`38`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ axt_android_local_test(`
`17`	`17`	`"//runner/monitor",`
`18`	`18`	`"@maven//:androidx_lifecycle_lifecycle_common",`
`19`	`19`	`"@maven//:com_google_truth_truth",`
`20`		`- "@maven//:junit_junit",`
`21`	`20`	`],`
`22`	`21`	`)`
`23`	`22`
`@@ -59,7 +58,6 @@ axt_android_local_test(`
`59`	`58`	`"//core",`
`60`	`59`	`"//ext/junit",`
`61`	`60`	`"@maven//:com_google_truth_truth",`
`62`		`- "@maven//:junit_junit",`
`63`	`61`	`],`
`64`	`62`	`)`
`65`	`63`