From 69104884933a7efbb64874225ea6ca9c2b7f07ec Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Wed, 27 Mar 2024 13:40:45 -0700 Subject: [PATCH] Rewrite EspressoTest#closeSoftKeyboard. It was never actually opening the soft keyboard. This caused failures in the upcoming android platform that no longer silently ignores attempts to close keyboard that isn't open. This commit rewrites the test so it opens the virtual keyboard and asserts it is open before proceeding. PiperOrigin-RevId: 619640236 --- BUILD | 2 +- .../java/androidx/test/annotation/BUILD | 2 +- .../android_app_instrumentation_tests.bzl | 2 +- .../android_library_instrumentation_tests.bzl | 2 +- core/java/androidx/test/core/BUILD | 2 +- core/javatests/androidx/test/core/app/BUILD | 2 +- .../androidx/test/core/content/pm/BUILD | 2 +- core/javatests/androidx/test/core/os/BUILD | 2 +- core/javatests/androidx/test/core/view/BUILD | 2 +- .../test/espresso/accessibility/BUILD | 4 +- .../java/androidx/test/espresso/contrib/BUILD | 4 +- .../core/java/androidx/test/espresso/BUILD | 2 +- .../javatests/androidx/test/espresso/BUILD | 2 +- .../androidx/test/espresso/EspressoTest.java | 44 +++++-------------- .../androidx/test/espresso/matcher/BUILD | 2 +- .../androidx/test/espresso/remote/BUILD | 2 +- .../java/androidx/test/espresso/device/BUILD | 2 +- .../test/espresso/idling/concurrent/BUILD | 6 +-- .../java/androidx/test/espresso/BUILD | 6 +-- .../androidx/test/espresso/idling/net/BUILD | 4 +- .../java/androidx/test/espresso/intent/BUILD | 4 +- .../java/androidx/test/espresso/remote/BUILD | 2 +- .../androidx/test/espresso/remote/BUILD | 2 +- .../web/java/androidx/test/espresso/web/BUILD | 4 +- ext/junit/java/androidx/test/ext/junit/BUILD | 2 +- .../androidx/test/ext/junit/rules/BUILD | 2 +- .../androidx/test/ext/junit/runners/BUILD | 2 +- ext/truth/java/androidx/test/ext/truth/BUILD | 2 +- ktx/core/java/androidx/test/core/BUILD | 4 +- .../javatests/androidx/test/core/app/BUILD | 2 +- .../junit/java/androidx/test/ext/junit/BUILD | 4 +- .../androidx/test/ext/junit/rules/BUILD | 2 +- opensource/androidx/BUILD | 4 +- .../java/androidx/test/BUILD | 4 +- .../javatests/androidx/test/BUILD | 2 +- .../androidx/test/internal/runner/BUILD | 2 +- .../internal/runner/junit4/statement/BUILD | 2 +- .../javatests/androidx/test/runner/BUILD | 8 ++-- .../android_test_orchestrator/stubapp/BUILD | 2 +- runner/monitor/java/androidx/test/BUILD | 4 +- .../javatests/androidx/test/platform/io/BUILD | 2 +- .../androidx/test/platform/tracing/BUILD | 8 ++-- runner/rules/java/androidx/test/BUILD | 4 +- services/BUILD | 4 +- .../test/services/shellexecutor/BUILD | 2 +- .../java/androidx/test/services/storage/BUILD | 2 +- .../java/androidx/test/foldable/app/BUILD | 2 +- .../java/androidx/test/multidex/app/BUILD | 2 +- .../java/androidx/test/multiwindow/app/BUILD | 2 +- 49 files changed, 82 insertions(+), 102 deletions(-) diff --git a/BUILD b/BUILD index 657618e39..1a5760073 100644 --- a/BUILD +++ b/BUILD @@ -1,6 +1,6 @@ -load("//build_extensions/maven:maven_repo.bzl", "maven_repository") load("@rules_jvm_external//:defs.bzl", "artifact") load("@rules_license//rules:license.bzl", "license") +load("//build_extensions/maven:maven_repo.bzl", "maven_repository") package(default_visibility = ["//:__subpackages__"]) diff --git a/annotation/java/androidx/test/annotation/BUILD b/annotation/java/androidx/test/annotation/BUILD index d5cc108aa..78c18ae6c 100644 --- a/annotation/java/androidx/test/annotation/BUILD +++ b/annotation/java/androidx/test/annotation/BUILD @@ -1,10 +1,10 @@ # Description: Build rules for building androidx.test.annotation from source +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") # all users should reference the equivalent targets in //annotation package( diff --git a/build_extensions/android_app_instrumentation_tests.bzl b/build_extensions/android_app_instrumentation_tests.bzl index 6f30111cc..970f5fa84 100644 --- a/build_extensions/android_app_instrumentation_tests.bzl +++ b/build_extensions/android_app_instrumentation_tests.bzl @@ -1,6 +1,5 @@ """A rule wrapper for an instrumentation test for an android binary.""" -load("//build_extensions:kt_android_library.bzl", "kt_android_library") load( "//build_extensions:generate_instrumentation_tests.bzl", "generate_instrumentation_tests", @@ -10,6 +9,7 @@ load( "infer_java_package_name", "infer_java_package_name_from_label", ) +load("//build_extensions:kt_android_library.bzl", "kt_android_library") load("//build_extensions:register_extension_info.bzl", "register_extension_info") def android_app_instrumentation_tests( diff --git a/build_extensions/android_library_instrumentation_tests.bzl b/build_extensions/android_library_instrumentation_tests.bzl index 98edce196..8617ea21f 100644 --- a/build_extensions/android_library_instrumentation_tests.bzl +++ b/build_extensions/android_library_instrumentation_tests.bzl @@ -1,6 +1,5 @@ """A rule wrapper for an instrumentation test for an android library.""" -load("//build_extensions:kt_android_library.bzl", "kt_android_library") load( "//build_extensions:generate_instrumentation_tests.bzl", "generate_instrumentation_tests", @@ -9,6 +8,7 @@ load( "//build_extensions:infer_java_package_name.bzl", "infer_java_package_name", ) +load("//build_extensions:kt_android_library.bzl", "kt_android_library") load("//build_extensions:register_extension_info.bzl", "register_extension_info") def android_library_instrumentation_tests( diff --git a/core/java/androidx/test/core/BUILD b/core/java/androidx/test/core/BUILD index 88c890164..b3bd22852 100644 --- a/core/java/androidx/test/core/BUILD +++ b/core/java/androidx/test/core/BUILD @@ -1,11 +1,11 @@ # Description: Build rules for building androidx.test.truth from source +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions:kt_android_library.bzl", "kt_android_library") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") # all users should reference the equivalent targets in //core package( diff --git a/core/javatests/androidx/test/core/app/BUILD b/core/javatests/androidx/test/core/app/BUILD index 3f9d90229..57fe42647 100644 --- a/core/javatests/androidx/test/core/app/BUILD +++ b/core/javatests/androidx/test/core/app/BUILD @@ -1,9 +1,9 @@ # Description: Tests for androidx.test.core +load("@build_bazel_rules_android//android:rules.bzl", "android_binary") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") load("//build_extensions:axt_android_application_test.bzl", "axt_android_application_test") load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") -load("@build_bazel_rules_android//android:rules.bzl", "android_binary") load("//build_extensions:phone_devices.bzl", "devices") package( diff --git a/core/javatests/androidx/test/core/content/pm/BUILD b/core/javatests/androidx/test/core/content/pm/BUILD index 30c05b302..57b7c6f9a 100644 --- a/core/javatests/androidx/test/core/content/pm/BUILD +++ b/core/javatests/androidx/test/core/content/pm/BUILD @@ -1,7 +1,7 @@ # Description: Tests for androidx.test.core -load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") +load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") package( default_applicable_licenses = ["//:license"], diff --git a/core/javatests/androidx/test/core/os/BUILD b/core/javatests/androidx/test/core/os/BUILD index dcb211319..c3bc34138 100644 --- a/core/javatests/androidx/test/core/os/BUILD +++ b/core/javatests/androidx/test/core/os/BUILD @@ -1,7 +1,7 @@ # Description: Tests for androidx.test.core -load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") +load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") package( default_applicable_licenses = ["//:license"], diff --git a/core/javatests/androidx/test/core/view/BUILD b/core/javatests/androidx/test/core/view/BUILD index b0d695c82..ac6d7c5e2 100644 --- a/core/javatests/androidx/test/core/view/BUILD +++ b/core/javatests/androidx/test/core/view/BUILD @@ -1,7 +1,7 @@ # Description: Tests for androidx.test.core -load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") +load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") package( default_applicable_licenses = ["//:license"], diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD b/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD index 035ca05fb..60e203304 100644 --- a/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD +++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD @@ -1,8 +1,8 @@ load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") # Description: # Espresso Accessibility APIs diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/BUILD b/espresso/contrib/java/androidx/test/espresso/contrib/BUILD index 3ee7f4ed9..e6d524bff 100644 --- a/espresso/contrib/java/androidx/test/espresso/contrib/BUILD +++ b/espresso/contrib/java/androidx/test/espresso/contrib/BUILD @@ -1,9 +1,9 @@ +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") +load("//build_extensions:jetify.bzl", "jetify_android_library") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:jetify.bzl", "jetify_android_library") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") # Description: # Contributed / non-core functionality of Espresso. Tools which add on to diff --git a/espresso/core/java/androidx/test/espresso/BUILD b/espresso/core/java/androidx/test/espresso/BUILD index 622e09da0..dd975d94e 100644 --- a/espresso/core/java/androidx/test/espresso/BUILD +++ b/espresso/core/java/androidx/test/espresso/BUILD @@ -1,11 +1,11 @@ # Description: # Espresso - the new UI Test API for Android. +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") licenses(["notice"]) diff --git a/espresso/core/javatests/androidx/test/espresso/BUILD b/espresso/core/javatests/androidx/test/espresso/BUILD index 3700e938b..77efc54bb 100644 --- a/espresso/core/javatests/androidx/test/espresso/BUILD +++ b/espresso/core/javatests/androidx/test/espresso/BUILD @@ -1,6 +1,7 @@ # Description: # Tests for espresso core +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", @@ -9,7 +10,6 @@ load( "//build_extensions:axt_android_application_test.bzl", "axt_android_application_test", ) -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package(default_applicable_licenses = ["//espresso:license"]) diff --git a/espresso/core/javatests/androidx/test/espresso/EspressoTest.java b/espresso/core/javatests/androidx/test/espresso/EspressoTest.java index ad644f2fa..348ed72a8 100644 --- a/espresso/core/javatests/androidx/test/espresso/EspressoTest.java +++ b/espresso/core/javatests/androidx/test/espresso/EspressoTest.java @@ -16,6 +16,7 @@ package androidx.test.espresso; +import static androidx.test.core.app.ApplicationProvider.getApplicationContext; import static androidx.test.espresso.Espresso.onData; import static androidx.test.espresso.Espresso.onIdle; import static androidx.test.espresso.Espresso.onView; @@ -32,7 +33,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.any; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasValue; @@ -58,7 +58,6 @@ import androidx.test.ui.app.KeyboardTestActivity; import androidx.test.ui.app.MainActivity; import androidx.test.ui.app.R; -import androidx.test.ui.app.SendActivity; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; @@ -262,45 +261,26 @@ public void openOverflowInActionMode() { } @Test - public void closeSoftKeyboard() { - onData(allOf(instanceOf(Map.class), hasValue(SendActivity.class.getSimpleName()))) + public void closeSoftKeyboard() throws InterruptedException { + onData(allOf(instanceOf(Map.class), hasValue(KeyboardTestActivity.class.getSimpleName()))) .perform(click()); + // click on the edit text which bring the soft keyboard up + onView(withId(R.id.editTextUserInput)).perform(typeText("Espresso")); - onView(withId(R.id.enter_data_edit_text)) - .perform( - new ViewAction() { - @Override - public Matcher getConstraints() { - return any(View.class); - } - + onView(withId(R.id.editTextUserInput)) + .check( + new ViewAssertion() { @Override - public void perform(UiController uiController, View view) { - // This doesn't do anything if hardware keyboard is present - that is, soft keyboard - // is _not_ present. Whether it's present or not can be verified under the following - // device settings: Settings > Language & Input > Under Keyboard and input method + public void check(View view, NoMatchingViewException noViewFoundException) { InputMethodManager imm = (InputMethodManager) - getInstrumentation() - .getTargetContext() - .getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(view, 0); - uiController.loopMainThreadUntilIdle(); - } - - @Override - public String getDescription() { - return "show soft input"; + getApplicationContext().getSystemService(Context.INPUT_METHOD_SERVICE); + assertTrue(imm.isActive(view)); } }); - onView(withId(R.id.enter_data_edit_text)).perform(ViewActions.closeSoftKeyboard()); + onView(withId(R.id.editTextUserInput)).perform(ViewActions.closeSoftKeyboard()); - assertThat(tracer.getSpans()) - .containsAtLeast( - "beginSpan: Espresso.perform(show soft input, view.getId() is )", - "+-endSpan: Espresso.perform(show soft input, view.getId() is )") - .inOrder(); assertThat(tracer.getSpans()) .containsAtLeast( "beginSpan: Espresso.perform(CloseKeyboardAction, view.getId() is )", diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/BUILD b/espresso/core/javatests/androidx/test/espresso/matcher/BUILD index aefdb8008..77932df06 100644 --- a/espresso/core/javatests/androidx/test/espresso/matcher/BUILD +++ b/espresso/core/javatests/androidx/test/espresso/matcher/BUILD @@ -1,11 +1,11 @@ # Description: # Tests for espresso matchers +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", ) -load("@build_bazel_rules_android//android:rules.bzl", "android_library") load( "//build_extensions:phone_devices.bzl", "apis", diff --git a/espresso/core/javatests/androidx/test/espresso/remote/BUILD b/espresso/core/javatests/androidx/test/espresso/remote/BUILD index b3606c104..6e6bb5122 100644 --- a/espresso/core/javatests/androidx/test/espresso/remote/BUILD +++ b/espresso/core/javatests/androidx/test/espresso/remote/BUILD @@ -1,11 +1,11 @@ # Description: # Tests for espresso remote classes +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", ) -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package(default_applicable_licenses = ["//espresso:license"]) diff --git a/espresso/device/java/androidx/test/espresso/device/BUILD b/espresso/device/java/androidx/test/espresso/device/BUILD index 0f88d7f7e..d43c4abb9 100644 --- a/espresso/device/java/androidx/test/espresso/device/BUILD +++ b/espresso/device/java/androidx/test/espresso/device/BUILD @@ -1,12 +1,12 @@ # Description: # EspressoDevice - the new Synchronized Device State Change API for Android. +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions:kt_android_library.bzl", "kt_android_library") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") licenses(["notice"]) diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD index 08f004a0c..84b38bd9d 100644 --- a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD +++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD @@ -2,10 +2,10 @@ # Light weight module that contains IdlinResources around concurrent Java APIs load("@build_bazel_rules_android//android:rules.bzl", "android_library") -load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") -load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") +load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") +load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") package( default_applicable_licenses = ["//espresso:license"], diff --git a/espresso/idling_resource/java/androidx/test/espresso/BUILD b/espresso/idling_resource/java/androidx/test/espresso/BUILD index e7fe37a5f..691ba6186 100644 --- a/espresso/idling_resource/java/androidx/test/espresso/BUILD +++ b/espresso/idling_resource/java/androidx/test/espresso/BUILD @@ -2,11 +2,11 @@ # Light weight module represents a resources of an application under test which can cause # asynchronous background work to happen during test execution. +load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package( default_applicable_licenses = ["//espresso:license"], diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD index 536409990..ce153a281 100644 --- a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD +++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD @@ -1,8 +1,8 @@ load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") # Description: # Network Idling Resources diff --git a/espresso/intents/java/androidx/test/espresso/intent/BUILD b/espresso/intents/java/androidx/test/espresso/intent/BUILD index ac5441e9c..09560920e 100644 --- a/espresso/intents/java/androidx/test/espresso/intent/BUILD +++ b/espresso/intents/java/androidx/test/espresso/intent/BUILD @@ -2,10 +2,10 @@ # Common library for testing inter and intra app communication via intents. load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") licenses(["notice"]) diff --git a/espresso/remote/java/androidx/test/espresso/remote/BUILD b/espresso/remote/java/androidx/test/espresso/remote/BUILD index deec55b5b..7d08c1428 100644 --- a/espresso/remote/java/androidx/test/espresso/remote/BUILD +++ b/espresso/remote/java/androidx/test/espresso/remote/BUILD @@ -1,11 +1,11 @@ # Description: # Remote package for espresso. +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") licenses(["notice"]) diff --git a/espresso/remote/javatests/androidx/test/espresso/remote/BUILD b/espresso/remote/javatests/androidx/test/espresso/remote/BUILD index 75aa5a37b..b9bca8a5b 100644 --- a/espresso/remote/javatests/androidx/test/espresso/remote/BUILD +++ b/espresso/remote/javatests/androidx/test/espresso/remote/BUILD @@ -1,11 +1,11 @@ # Description: # Tests for espresso remote classes +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", ) -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package(default_applicable_licenses = ["//espresso:license"]) diff --git a/espresso/web/java/androidx/test/espresso/web/BUILD b/espresso/web/java/androidx/test/espresso/web/BUILD index 550dcc072..3ac245caf 100644 --- a/espresso/web/java/androidx/test/espresso/web/BUILD +++ b/espresso/web/java/androidx/test/espresso/web/BUILD @@ -1,8 +1,8 @@ load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") licenses(["notice"]) diff --git a/ext/junit/java/androidx/test/ext/junit/BUILD b/ext/junit/java/androidx/test/ext/junit/BUILD index 70c055030..b17ea2d2c 100644 --- a/ext/junit/java/androidx/test/ext/junit/BUILD +++ b/ext/junit/java/androidx/test/ext/junit/BUILD @@ -1,11 +1,11 @@ # Description: Build rules for building androidx.test.junit from source +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions:kt_android_library.bzl", "kt_android_library") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") # all users should reference the equivalent targets in //ext/junit package( diff --git a/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD b/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD index a970fe375..f694a514e 100644 --- a/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD +++ b/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD @@ -1,5 +1,5 @@ -load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") +load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") package(default_applicable_licenses = ["//:license"]) diff --git a/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD b/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD index ece1be937..5f65d57b8 100644 --- a/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD +++ b/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD @@ -1,5 +1,5 @@ -load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") +load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") package(default_applicable_licenses = ["//:license"]) diff --git a/ext/truth/java/androidx/test/ext/truth/BUILD b/ext/truth/java/androidx/test/ext/truth/BUILD index ae5212b80..42564ea87 100644 --- a/ext/truth/java/androidx/test/ext/truth/BUILD +++ b/ext/truth/java/androidx/test/ext/truth/BUILD @@ -1,10 +1,10 @@ # Description: Build rules for building androidx.test.truth from source +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") # all users should reference the equivalent targets in //ext/truth package( diff --git a/ktx/core/java/androidx/test/core/BUILD b/ktx/core/java/androidx/test/core/BUILD index 179b32517..cf67a2e6b 100644 --- a/ktx/core/java/androidx/test/core/BUILD +++ b/ktx/core/java/androidx/test/core/BUILD @@ -1,11 +1,11 @@ # androidx.test.core Kotlin extensions load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions:kt_android_library.bzl", "kt_android_library") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:api_checks.bzl", "api_checks") -load("//build_extensions:dackka_test.bzl", "dackka_test") licenses(["notice"]) diff --git a/ktx/core/javatests/androidx/test/core/app/BUILD b/ktx/core/javatests/androidx/test/core/app/BUILD index c9c223fde..a30e44ef6 100644 --- a/ktx/core/javatests/androidx/test/core/app/BUILD +++ b/ktx/core/javatests/androidx/test/core/app/BUILD @@ -1,7 +1,7 @@ # Description: Tests for androidx.test.core ktx extension -load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") +load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") licenses(["notice"]) diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/BUILD b/ktx/ext/junit/java/androidx/test/ext/junit/BUILD index e7e04905c..77fb1d568 100644 --- a/ktx/ext/junit/java/androidx/test/ext/junit/BUILD +++ b/ktx/ext/junit/java/androidx/test/ext/junit/BUILD @@ -1,11 +1,11 @@ # androidx.ext.junit Kotlin extensions load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions:kt_android_library.bzl", "kt_android_library") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") licenses(["notice"]) diff --git a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD index 4524a827a..fe498a2f5 100644 --- a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD +++ b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD @@ -1,7 +1,7 @@ # Description: Tests for androidx.test.ext.junit.rules Kotlin extension -load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") +load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") licenses(["notice"]) diff --git a/opensource/androidx/BUILD b/opensource/androidx/BUILD index 2dd0a896b..f5c439014 100644 --- a/opensource/androidx/BUILD +++ b/opensource/androidx/BUILD @@ -1,12 +1,12 @@ # Targets to handle androidx dependencies in bazel -package(default_visibility = ["//visibility:public"]) - load( "//build_extensions:axt_deps_versions.bzl", "ANDROIDX_ANNOTATION_VERSION", ) +package(default_visibility = ["//visibility:public"]) + # Alias target for androidx.annotation # Ideally libraries could directly depend on the @maven targets instead, but: # 1. Directly depending on annotation doesn't work since it contains no classes, diff --git a/runner/android_junit_runner/java/androidx/test/BUILD b/runner/android_junit_runner/java/androidx/test/BUILD index bb578d998..0eafe2486 100644 --- a/runner/android_junit_runner/java/androidx/test/BUILD +++ b/runner/android_junit_runner/java/androidx/test/BUILD @@ -1,10 +1,10 @@ # Description: Build rules for building androidx.test from source load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") # all users should reference the equivalent targets in //runner/android_junit_runner package( diff --git a/runner/android_junit_runner/javatests/androidx/test/BUILD b/runner/android_junit_runner/javatests/androidx/test/BUILD index f8def1434..5f5c51138 100644 --- a/runner/android_junit_runner/javatests/androidx/test/BUILD +++ b/runner/android_junit_runner/javatests/androidx/test/BUILD @@ -1,10 +1,10 @@ # Description: Tests for Runner +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", ) -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package( default_applicable_licenses = ["//:license"], diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD index 331e7c6f2..d356992ba 100644 --- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD +++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD @@ -1,9 +1,9 @@ # Description: Tests for Runner +load("@build_bazel_rules_android//android:rules.bzl", "android_binary") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") load("//build_extensions:axt_android_application_test.bzl", "axt_android_application_test") load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") -load("@build_bazel_rules_android//android:rules.bzl", "android_binary") load( "//build_extensions:phone_devices.bzl", "apis", diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/statement/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/statement/BUILD index e915b85e0..97ff0c189 100644 --- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/statement/BUILD +++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/statement/BUILD @@ -1,10 +1,10 @@ # Description: Tests for Runner +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", ) -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package( default_applicable_licenses = ["//:license"], diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/BUILD b/runner/android_junit_runner/javatests/androidx/test/runner/BUILD index 1fad0c77a..b59dda02b 100644 --- a/runner/android_junit_runner/javatests/androidx/test/runner/BUILD +++ b/runner/android_junit_runner/javatests/androidx/test/runner/BUILD @@ -1,13 +1,13 @@ # Description: Tests for Runner -load( - "//build_extensions:axt_android_local_test.bzl", - "axt_android_local_test", -) load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", ) +load( + "//build_extensions:axt_android_local_test.bzl", + "axt_android_local_test", +) package( default_applicable_licenses = ["//:license"], diff --git a/runner/android_test_orchestrator/stubapp/BUILD b/runner/android_test_orchestrator/stubapp/BUILD index 193682ce9..6aa64648e 100644 --- a/runner/android_test_orchestrator/stubapp/BUILD +++ b/runner/android_test_orchestrator/stubapp/BUILD @@ -1,6 +1,6 @@ load("@build_bazel_rules_android//android:rules.bzl", "android_binary") -load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") load("//build_extensions/maven:axt_maven_apk.bzl", "axt_maven_apk") +load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") licenses(["notice"]) diff --git a/runner/monitor/java/androidx/test/BUILD b/runner/monitor/java/androidx/test/BUILD index 49b48eb21..7ffa2d214 100644 --- a/runner/monitor/java/androidx/test/BUILD +++ b/runner/monitor/java/androidx/test/BUILD @@ -1,11 +1,11 @@ # Description: Build rules for building androidx.test from source load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions:kt_android_library.bzl", "kt_android_library") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") # nearly all users should reference the equivalent target in //runner/monitor package( diff --git a/runner/monitor/javatests/androidx/test/platform/io/BUILD b/runner/monitor/javatests/androidx/test/platform/io/BUILD index f90f0240f..e45b48bca 100644 --- a/runner/monitor/javatests/androidx/test/platform/io/BUILD +++ b/runner/monitor/javatests/androidx/test/platform/io/BUILD @@ -1,5 +1,6 @@ # Description: Monitor +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", @@ -8,7 +9,6 @@ load( "//build_extensions:axt_android_local_test.bzl", "axt_android_local_test", ) -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package( default_applicable_licenses = ["//:license"], diff --git a/runner/monitor/javatests/androidx/test/platform/tracing/BUILD b/runner/monitor/javatests/androidx/test/platform/tracing/BUILD index 0362d6c37..3ef533770 100644 --- a/runner/monitor/javatests/androidx/test/platform/tracing/BUILD +++ b/runner/monitor/javatests/androidx/test/platform/tracing/BUILD @@ -1,13 +1,13 @@ # Description: Monitor -load( - "//build_extensions:axt_android_local_test.bzl", - "axt_android_local_test", -) load( "//build_extensions:android_library_test.bzl", "axt_android_library_test", ) +load( + "//build_extensions:axt_android_local_test.bzl", + "axt_android_local_test", +) package( default_applicable_licenses = ["//:license"], diff --git a/runner/rules/java/androidx/test/BUILD b/runner/rules/java/androidx/test/BUILD index d71d35e33..b8ee3431d 100644 --- a/runner/rules/java/androidx/test/BUILD +++ b/runner/rules/java/androidx/test/BUILD @@ -1,8 +1,8 @@ load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("//build_extensions:api_checks.bzl", "api_checks") +load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("//build_extensions:dackka_test.bzl", "dackka_test") -load("//build_extensions:api_checks.bzl", "api_checks") # Description: Build rules for building androidx.test from source licenses(["notice"]) diff --git a/services/BUILD b/services/BUILD index 8a1fa6d50..36164e158 100644 --- a/services/BUILD +++ b/services/BUILD @@ -1,8 +1,8 @@ +load("@build_bazel_rules_android//android:rules.bzl", "android_binary") +load("@rules_license//rules:license.bzl", "license") load("//build_extensions:axt_versions.bzl", "SERVICES_VERSION") load("//build_extensions/maven:axt_maven_apk.bzl", "axt_maven_apk") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_binary") -load("@rules_license//rules:license.bzl", "license") # Description: diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD index 50e48682e..0655cd59d 100644 --- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD +++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD @@ -1,6 +1,6 @@ +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:android_library_test.bzl", "axt_android_library_test") load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package(default_applicable_licenses = ["//services:license"]) diff --git a/services/storage/java/androidx/test/services/storage/BUILD b/services/storage/java/androidx/test/services/storage/BUILD index e7d573391..dbc3662a6 100644 --- a/services/storage/java/androidx/test/services/storage/BUILD +++ b/services/storage/java/androidx/test/services/storage/BUILD @@ -1,11 +1,11 @@ # Description: # Exposes sd card storage to tests regardless of permissions. +load("@build_bazel_rules_android//android:rules.bzl", "android_library") load("//build_extensions:api_checks.bzl", "api_checks") load("//build_extensions:dackka_test.bzl", "dackka_test") load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar") load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact") -load("@build_bazel_rules_android//android:rules.bzl", "android_library") package( default_applicable_licenses = ["//services:license"], diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD b/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD index 7f8d10c75..4dd444161 100644 --- a/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD +++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD @@ -3,8 +3,8 @@ # Description: # Test App used for foldable testing API integration tests. -load("//build_extensions:jetify.bzl", "jetify_android_library") load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library") +load("//build_extensions:jetify.bzl", "jetify_android_library") licenses(["notice"]) diff --git a/testapps/multidex_testapp/java/androidx/test/multidex/app/BUILD b/testapps/multidex_testapp/java/androidx/test/multidex/app/BUILD index 91a6c97f2..793e25d70 100644 --- a/testapps/multidex_testapp/java/androidx/test/multidex/app/BUILD +++ b/testapps/multidex_testapp/java/androidx/test/multidex/app/BUILD @@ -1,5 +1,5 @@ -load("//build_extensions:jetify.bzl", "jetify_android_library") load("@build_bazel_rules_android//android:rules.bzl", "android_binary") +load("//build_extensions:jetify.bzl", "jetify_android_library") # Description: # Common library for testing inter and intra app communication via intents. diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD index a621a9e50..72fcc5888 100644 --- a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD +++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD @@ -3,8 +3,8 @@ # Description: # Test App used for testing API integration tests in multi-window mode. -load("//build_extensions:jetify.bzl", "jetify_android_library") load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library") +load("//build_extensions:jetify.bzl", "jetify_android_library") licenses(["notice"])