WIP eventto

BUILD

@@ -26,6 +26,7 @@ maven_repository(
         "//espresso/intents/java/androidx/test/espresso/intent:espresso_intents_maven_artifact",
         "//espresso/remote/java/androidx/test/espresso/remote:espresso_remote_maven_artifact",
         "//espresso/web/java/androidx/test/espresso/web:espresso_web_maven_artifact",
+        "//eventto/java/androidx/test/eventto:eventto_maven_artifact",
         "//ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
         "//ext/truth/java/androidx/test/ext/truth:truth_maven_artifact",
         "//ktx/core/java/androidx/test/core:core_maven_artifact",

build_extensions/axt_versions.bzl

@@ -4,16 +4,17 @@ Use tools/release/validate_and_propagate_versions.sh to propagate these versions
 //:axt_m2_repository and gradle-tests/settings.gradle
 """
 
-RUNNER_VERSION = "1.7.0-alpha01"
-RULES_VERSION = "1.7.0-alpha01"
-MONITOR_VERSION = "1.8.0-alpha01"
-ESPRESSO_VERSION = "3.7.0-alpha01"
-CORE_VERSION = "1.7.0-alpha01"
-ESPRESSO_DEVICE_VERSION = "1.1.0-alpha01"
-ANDROIDX_JUNIT_VERSION = "1.3.0-alpha01"
-ANDROIDX_TRUTH_VERSION = "1.7.0-alpha01"
-ORCHESTRATOR_VERSION = "1.6.0-alpha01"
-SERVICES_VERSION = "1.6.0-alpha01"
+RUNNER_VERSION = "1.7.0-alpha02"
+RULES_VERSION = "1.7.0-alpha02"
+MONITOR_VERSION = "1.8.0-alpha02"
+ESPRESSO_VERSION = "3.7.0-alpha02"
+CORE_VERSION = "1.7.0-alpha02"
+ESPRESSO_DEVICE_VERSION = "1.1.0-alpha02"
+EVENTTO_VERSION = "0.0.1-alpha02"
+ANDROIDX_JUNIT_VERSION = "1.3.0-alpha02"
+ANDROIDX_TRUTH_VERSION = "1.7.0-alpha02"
+ORCHESTRATOR_VERSION = "1.6.0-alpha02"
+SERVICES_VERSION = "1.6.0-alpha02"
 
 # Full maven artifact strings for apks.
 SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VERSION

build_extensions/maven/maven_registry.bzl

@@ -7,6 +7,7 @@ load(
     "CORE_VERSION",
     "ESPRESSO_DEVICE_VERSION",
     "ESPRESSO_VERSION",
+    "EVENTTO_VERSION",
     "MONITOR_VERSION",
     "ORCHESTRATOR_VERSION",
     "RULES_VERSION",
@@ -36,6 +37,7 @@ _TARGET_TO_MAVEN_ARTIFACT = {
     "//espresso/intents/java/": "androidx.test.espresso:espresso-intents:%s" % ESPRESSO_VERSION,
     "//espresso/remote/java/": "androidx.test.espresso:espresso-remote:%s" % ESPRESSO_VERSION,
     "//espresso/web/java/": "androidx.test.espresso:espresso-web:%s" % ESPRESSO_VERSION,
+    "//eventto/java/": "androidx.test.eventto:eventto:%s" % EVENTTO_VERSION,
     "//ext/junit/java/": "androidx.test.ext:junit:%s" % ANDROIDX_JUNIT_VERSION,
     "//ktx/ext/junit/java/": "androidx.test.ext:junit-ktx:%s" % ANDROIDX_JUNIT_VERSION,
     "//ext/truth/java/": "androidx.test.ext:truth:%s" % ANDROIDX_TRUTH_VERSION,

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

@@ -28,6 +28,7 @@ android_library(
             "ViewHierarchyExceptionHandler.java",
         ],
     ),
+    visibility = ["//visibility:public"],
     deps = [
         ":default_failure_handler",
         ":idling_resource_registry",
@@ -65,6 +66,7 @@ android_library(
         "Interrogator.java",
         "LooperIdlingResourceInterrogationHandler.java",
     ],
+    visibility = ["//visibility:public"],
     deps = [
         "//espresso/core/java/androidx/test/espresso:interface",
         "//espresso/core/java/androidx/test/espresso/util",

espresso/core/java/androidx/test/espresso/base/BaseLayerModule.java

@@ -120,7 +120,7 @@ public ActiveRootLister provideActiveRootLister(RootsOracle rootsOracle) {
   @Provides
   @Singleton
   public EventInjector provideEventInjector() {
-    // Adroid uses input manager to inject events.
+    // Android uses input manager to inject events.
     // Instrumentation does not check if the event presses went through by checking the
     // boolean return value of injectInputEvent, which is why we created this class to better
     // handle lost/dropped press events. Instrumentation cannot be used as a fallback strategy,

espresso/core/java/androidx/test/espresso/base/EventInjector.java

@@ -27,7 +27,7 @@
  * Responsible for selecting the proper strategy for injecting MotionEvents to the application under
  * test.
  */
-final class EventInjector {
+public final class EventInjector {
   private static final String TAG = EventInjector.class.getSimpleName();
   private final EventInjectionStrategy injectionStrategy;
 

espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java

@@ -32,7 +32,7 @@
  * An {@link EventInjectionStrategy} that uses the input manager to inject Events. This strategy
  * supports API level 16 and above.
  */
-final class InputManagerEventInjectionStrategy implements EventInjectionStrategy {
+public final class InputManagerEventInjectionStrategy implements EventInjectionStrategy {
   private static final String TAG = "EventInjectionStrategy";
   // The delay time to allow the soft keyboard to dismiss.
   private static final long KEYBOARD_DISMISSAL_DELAY_MILLIS = 1000L;

espresso/core/java/androidx/test/espresso/base/Interrogator.java

@@ -31,7 +31,7 @@
 import java.lang.reflect.Method;
 
 /** Isolates the nasty details of touching the message queue. */
-final class Interrogator {
+public final class Interrogator {
 
   private static final String TAG = "Interrogator";
   private static final Method messageQueueNextMethod;
@@ -106,7 +106,7 @@ interface QueueInterrogationHandler<R> {
    * Informed of the state of the looper/queue and controls whether to continue interrogation or
    * quit.
    */
-  interface InterrogationHandler<R> extends QueueInterrogationHandler<R> {
+  public interface InterrogationHandler<R> extends QueueInterrogationHandler<R> {
     /**
      * Notifies that the queue is about to dispatch a task.
      *
@@ -129,7 +129,7 @@ interface InterrogationHandler<R> extends QueueInterrogationHandler<R> {
    *
    * @param handler an interrogation handler that controls whether to continue looping or not.
    */
-  static <R> R loopAndInterrogate(InterrogationHandler<R> handler) {
+  public static <R> R loopAndInterrogate(InterrogationHandler<R> handler) {
     checkSanity();
     interrogating.set(Boolean.TRUE);
     boolean stillInterested = true;

espresso/core/java/androidx/test/espresso/base/ViewFinderImpl.java

@@ -45,7 +45,7 @@ public final class ViewFinderImpl implements ViewFinder {
   private final Provider<View> rootViewProvider;
 
   @Inject
-  ViewFinderImpl(Matcher<View> viewMatcher, Provider<View> rootViewProvider) {
+  public ViewFinderImpl(Matcher<View> viewMatcher, Provider<View> rootViewProvider) {
     this.viewMatcher = viewMatcher;
     this.rootViewProvider = rootViewProvider;
   }

eventto/BUILD

@@ -0,0 +1,6 @@
+alias(
+    name = "eventto",
+    testonly = 1,
+    actual = "//eventto/java/androidx/test/eventto",
+    visibility = ["//visibility:public"],
+)

eventto/java/androidx/test/eventto/AndroidManifest.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.eventto" >
+
+
+    <uses-sdk
+        android:minSdkVersion="21"
+        android:targetSdkVersion="34" />
+
+</manifest>

eventto/java/androidx/test/eventto/BUILD

@@ -0,0 +1,51 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+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"],
+    default_visibility = ["//visibility:public"],
+)
+
+android_library(
+    name = "eventto",
+    testonly = 1,
+    srcs = glob(["*.java"]),
+    manifest = "AndroidManifest.xml",
+    visibility = [
+        "//eventto:__pkg__",
+    ],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:espresso_compiletime",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_aar(
+    name = "eventto_aar",
+    testonly = 1,
+    expected_class_prefixes = [
+        "androidx.test.eventto",
+    ],
+    included_dep = ":eventto",
+)
+
+maven_artifact(
+    name = "eventto_maven_artifact",
+    testonly = 1,
+    last_updated = "20240709000000",
+    target = ":eventto_aar",
+)

eventto/java/androidx/test/eventto/Eventto.java

@@ -0,0 +1,21 @@
+package androidx.test.eventto;
+
+import android.view.View;
+import androidx.annotation.CheckResult;
+import java.time.Duration;
+import javax.annotation.CheckReturnValue;
+import org.hamcrest.Matcher;
+
+public class Eventto {
+  private Eventto() {}
+
+  @CheckReturnValue
+  @CheckResult
+  public static EventtoViewInteraction onView(Matcher<View> matcher) {
+    return new EventtoViewInteraction(matcher);
+  }
+
+  public static void setDefaultTimeout(Duration duration) {
+    EventtoViewInteraction.setDefaultTimeout(duration);
+  }
+}

eventto/java/androidx/test/eventto/EventtoUiControlller.java

@@ -0,0 +1,61 @@
+package androidx.test.eventto;
+
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.InjectEventSecurityException;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.os.Handler;
+import static android.os.Looper.getMainLooper;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import android.util.Log;
+import java.util.concurrent.atomic.AtomicBoolean;
+import androidx.test.espresso.base.Interrogator;
+import androidx.test.espresso.base.EventInjector;
+
+class EventtoUiController {
+//        implements UiController {
+//   private final Handler mainHandler;
+//   private final QueueIdler queueIdler;
+//   private final ExecutorService keyEventExecutor =
+//           Executors.newSingleThreadExecutor(
+//                   new ThreadFactoryBuilder().setNameFormat("Eventto Key Event #%d").build());
+//   private final EventInjector eventInjector;
+//
+//   EventtoUiController() {
+//      this.mainHandler = new Handler(getMainLooper());
+//      this.queueIdler = new QueueIdler();
+//      this.eventInjector = new EventInjector(new InputManagerEventInjectionStrategy());
+//   }
+//
+//   @Override
+//   public boolean injectMotionEvent(MotionEvent event) throws InjectEventSecurityException {
+//      Log.i("EventtoUiController", "injectMotionEvent using ui automation");
+//
+//      getInstrumentation().getUiAutomation().injectInputEvent(event, false);
+//      return true;
+//   }
+//
+//   @Override
+//   public boolean injectKeyEvent(KeyEvent event) {
+//      throw new UnsupportedOperationException();
+//   }
+//
+//   @Override
+//   public boolean injectString(String str) throws InjectEventSecurityException {
+//      throw new UnsupportedOperationException();
+//   }
+//
+//   @Override
+//   public void loopMainThreadUntilIdle() {
+//      queueIdler.idle();
+//   }
+//
+//   @Override
+//   public void loopMainThreadForAtLeast(long millisDelay) {
+//      AtomicBoolean elapsedTimeReached = new AtomicBoolean(false);
+//      mainHandler.postDelayed(() -> elapsedTimeReached.set(true), millisDelay);
+//      queueIdler.idleUntil(() -> elapsedTimeReached.get()) ;
+//      loopMainThreadUntilIdle();
+//   }
+}

eventto/java/androidx/test/eventto/EventtoViewAction.java

@@ -0,0 +1,32 @@
+package androidx.test.eventto;
+
+import android.view.View;
+import org.hamcrest.Matcher;
+
+public interface EventtoViewAction {
+
+  /**
+   * A mechanism for ViewActions to specify what type of views they can operate on.
+   *
+   * <p>A ViewAction can demand that the view passed to perform meets certain constraints. For
+   * example it may want to ensure the view is already in the viewable physical screen of the device
+   * or is of a certain type.
+   *
+   * @return a <a href="http://hamcrest.org/JavaHamcrest/javadoc/1.3/org/hamcrest/Matcher.html">
+   *     <code>Matcher</code></a> that will be tested prior to calling perform.
+   */
+  public Matcher<View> getConstraints();
+
+  /**
+   * Returns a description of the view action. The description should not be overly long and should
+   * fit nicely in a sentence like: "performing %description% action on view with id ..."
+   */
+  public String getDescription();
+
+  /**
+   * Performs this action on the given view.
+   *
+   * @param view the view to act upon. never null.
+   */
+  public void perform(View view);
+}