detox 20.14.0-smoke.0 → 20.14.1

package/.eslintignore

@@ -1,3 +1,4 @@
+*.d.ts
 /src/android/espressoapi/**/*.js
 /coverage
 /ios

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-javadoc.jar.md5

@@ -0,0 +1 @@
+df336477c5bb07869456e1a65d69d5c7

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-javadoc.jar.sha1

@@ -0,0 +1 @@
+aaa63a4199f17a89c7e884202ca33554cf0c4410

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-javadoc.jar.sha256

@@ -0,0 +1 @@
+fe1c75ae0cbabeeb848ffb9e80b591b6f6f2d37c899e05717a58d967748f4860

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-javadoc.jar.sha512

@@ -0,0 +1 @@
+4e2f5bc2efecc31716ae9e70a2e87da45ebcda42a0f4d8d192ae7f2c68ad1f801e3758590be3d2bb3f8bd4a44dbed255e2a4f95abc2f9c44bd9d4879520ac51d

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-sources.jar.md5

@@ -0,0 +1 @@
+3ee1d9a4a119b7c6627434ad73e41638

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-sources.jar.sha1

@@ -0,0 +1 @@
+4a270aaa691aa23b7b14ae32e77cb56de9cfdc95

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-sources.jar.sha256

@@ -0,0 +1 @@
+47099e074808fb5626c109b5b09c464cabd9cad5c2844cdc98a1868e2b10238a

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-sources.jar.sha512

@@ -0,0 +1 @@
+c4c1f64a63da6e106ca90cfcab4e8d095d0f97c4341e6f3a54203116438264e1e2e262f3e2278b064b3283d4bbbddad88afc48c8d9a5f8bf410e0cc653c307f0

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.aar.md5

@@ -0,0 +1 @@
+5802af204da6a4e44339eb5b544e816d

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.aar.sha1

@@ -0,0 +1 @@
+530bd1ee5be0479b9d48b33722b521ef408d82b7

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.aar.sha256

@@ -0,0 +1 @@
+4efd5d50625590c576c69a3a722d8df776fa213cff6e1fa254ec429d4db6fb58

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.aar.sha512

@@ -0,0 +1 @@
+19b779508bf7d9059f23fd638114bb817eee061bf018fcf793b451f63b3c5d8519e20f85fceffa61863d59244f168692d1e4e8d861be979200a2130c4486b9e8

package/Detox-android/com/wix/detox/{20.14.0-smoke.0/detox-20.14.0-smoke.0.pom → 20.14.1/detox-20.14.1.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.14.0-smoke.0</version>
+  <version>20.14.1</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.pom.md5

@@ -0,0 +1 @@
+fdbbf729d55d7657238f4ffdfdf21b18

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.pom.sha1

@@ -0,0 +1 @@
+2ee22e6f82bbbd550d383530de9ac1403e716dbc

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.pom.sha256

@@ -0,0 +1 @@
+9522ff285942a4332b1602849b17fa910d603dd019c4cbcc454e8c2a64b0859d

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.pom.sha512

@@ -0,0 +1 @@
+1ff01de68f6d101e206f63bab0e67e93492a2c3661d3f763f08d4acbf647c207e095f74a9bfbb7b55a7faacf6545ed130037085258c7869fee01f80a45ecf7f1

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.14.0-smoke.0</latest>
-    <release>20.14.0-smoke.0</release>
+    <latest>20.14.1</latest>
+    <release>20.14.1</release>
     <versions>
-      <version>20.14.0-smoke.0</version>
+      <version>20.14.1</version>
     </versions>
-    <lastUpdated>20231004101112</lastUpdated>
+    <lastUpdated>20231212155320</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-db9bf329cefd7a3174b46ce70f497a99
+3e4214cc64c1e5edc2a3032be61a5545

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-2166ac54d8a199afca7309e193e586480014f074
+0196bb30f6b15f7ca321049999448d9242cc34fb

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-d872213b54196e083fdfac1b0f921ba338e96aa4d21e1971ac9f8e70cd20003c
+00f7fa47240f24b4188f773b9652d64f1e08a0dd32fdf918ab48b7e56215909b

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-1ca24fd031e6a4bd8ac6197a4ff263b33a25a60b075291dac8ea33c8127623a8dbf65462f9e65d77ce493f1a2f07e09fbb5e9219e52e8ed457a3c293a86b118b
+ac2fac1e5878e4d303daa66ed9174cb6bbb4304fcc1ddbc30dad48e47a9ac87106e849fb1d85bdcbb32a6d5955cff4b7a47a341a0203ca040d40bb852019e312

package/android/detox/build.gradle

@@ -21,8 +21,12 @@ def _rnNativeArtifact = rnInfo.isRN71OrHigher
             : 'com.facebook.react:react-native:+'
 
 android {
-    compileSdkVersion _compileSdkVersion
-    buildToolsVersion _buildToolsVersion
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
+    if (agpVersion >= 7) {
+        namespace "com.wix.detox"
+    }
+    compileSdk _compileSdkVersion
+    buildToolsVersion = _buildToolsVersion
 
     defaultConfig {
         minSdkVersion _minSdkVersion
@@ -33,7 +37,7 @@ android {
         consumerProguardFiles 'proguard-rules.pro'
     }
 
-    flavorDimensions 'detox'
+    flavorDimensions = ['detox']
     productFlavors {
         full {
             dimension 'detox'
@@ -48,7 +52,7 @@ android {
         unitTests.returnDefaultValues = true
         unitTests.all { t ->
             reports {
-                html.enabled true
+                html.required = true
             }
             testLogging {
                 events "passed", "skipped", "failed", "standardOut", "standardError"

package/android/detox/src/full/java/com/wix/detox/Detox.java

@@ -123,13 +123,7 @@ public final class Detox {
         DetoxConfig.CONFIG.apply();
 
         sActivityLaunchHelper = new ActivityLaunchHelper(activityTestRule);
-
-        try {
-            DetoxMain.run(context, sActivityLaunchHelper);
-        } catch (Exception e) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException("Detox got interrupted prematurely", e);
-        }
+        DetoxMain.run(context, sActivityLaunchHelper);
     }
 
     public static void launchMainActivity() {

package/android/detox/src/full/java/com/wix/detox/DetoxMain.kt

@@ -2,53 +2,63 @@ package com.wix.detox
 
 import android.content.Context
 import android.util.Log
-import com.wix.detox.adapters.server.CleanupActionHandler
-import com.wix.detox.adapters.server.DetoxActionHandler
-import com.wix.detox.adapters.server.DetoxActionsDispatcher
-import com.wix.detox.adapters.server.DetoxServerAdapter
-import com.wix.detox.adapters.server.DetoxServerInfo
-import com.wix.detox.adapters.server.InstrumentsEventsActionsHandler
-import com.wix.detox.adapters.server.InstrumentsRecordingStateActionHandler
-import com.wix.detox.adapters.server.InvokeActionHandler
-import com.wix.detox.adapters.server.OutboundServerAdapter
-import com.wix.detox.adapters.server.PrematureReadyHandler
-import com.wix.detox.adapters.server.QueryStatusActionHandler
-import com.wix.detox.adapters.server.ReactNativeReloadActionHandler
-import com.wix.detox.adapters.server.ReadyActionHandler
+import com.wix.detox.adapters.server.*
 import com.wix.detox.common.DetoxLog
 import com.wix.detox.espresso.UiControllerSpy
 import com.wix.detox.instruments.DetoxInstrumentsManager
 import com.wix.detox.reactnative.ReactNativeExtension
 import com.wix.invoke.MethodInvocation
+import java.util.concurrent.CountDownLatch
 
-private const val INIT_ACTION = "_init"
-private const val IS_READY_ACTION = "isReady"
 private const val TERMINATION_ACTION = "_terminate"
 
 object DetoxMain {
+    private val handshakeLock = CountDownLatch(1)
+
     @JvmStatic
     fun run(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
         val detoxServerInfo = DetoxServerInfo()
         val testEngineFacade = TestEngineFacade()
         val actionsDispatcher = DetoxActionsDispatcher()
-        val externalAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, IS_READY_ACTION, TERMINATION_ACTION)
+        val serverAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, TERMINATION_ACTION)
+
+        initCrashHandler(serverAdapter)
+        initANRListener(serverAdapter)
+        initEspresso()
+        initReactNative()
+
+        setupActionHandlers(actionsDispatcher, serverAdapter, testEngineFacade, rnHostHolder)
+        serverAdapter.connect()
 
-        initActionHandlers(activityLaunchHelper, actionsDispatcher, externalAdapter, testEngineFacade, rnHostHolder)
-        actionsDispatcher.dispatchAction(INIT_ACTION, "", 0)
+        launchActivityOnCue(rnHostHolder, activityLaunchHelper)
         actionsDispatcher.join()
     }
 
-    private fun doInit(externalAdapter: DetoxServerAdapter) {
-        initCrashHandler(externalAdapter)
-        initANRListener(externalAdapter)
-        initEspresso()
-        initReactNative()
+    /**
+     * Launch the tested activity "on cue", namely, right after a connection is established and the handshake
+     * completes successfully.
+     *
+     * This has to be synchronized so that an `isReady` isn't handled *before* the activity is launched (albeit not fully
+     * initialized - all native modules and everything) and a react context is available.
+     *
+     * As a better alternative, it would make sense to execute this as a simple action from within the actions
+     * dispatcher (i.e. handler of `loginSuccess`), in which case, no inter-thread locking would be required
+     * thanks to the usage of Handlers. However, in this type of a solution, errors / crashes would be reported
+     * not by instrumentation itself, but based on the `AppWillTerminateWithError` message; In it's own, it is a good
+     * thing, but for a reason we're not sure of yet, it is ignored by the test runner at this point in the flow.
+     */
+    @Synchronized
+    private fun launchActivityOnCue(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
+        awaitHandshake()
+        launchActivity(rnHostHolder, activityLaunchHelper)
+    }
 
-        externalAdapter.connect()
+    private fun awaitHandshake() {
+        handshakeLock.await()
     }
 
-    private fun onConnected(activityLaunchHelper: ActivityLaunchHelper, rnHostHolder: Context) {
-        launchApp(rnHostHolder, activityLaunchHelper)
+    private fun onLoginSuccess() {
+        handshakeLock.countDown()
     }
 
     private fun doTeardown(serverAdapter: DetoxServerAdapter, actionsDispatcher: DetoxActionsDispatcher, testEngineFacade: TestEngineFacade) {
@@ -58,50 +68,28 @@ object DetoxMain {
         actionsDispatcher.teardown()
     }
 
-    private fun initActionHandlers(activityLaunchHelper: ActivityLaunchHelper, actionsDispatcher: DetoxActionsDispatcher, serverAdapter: DetoxServerAdapter, testEngineFacade: TestEngineFacade, rnHostHolder: Context) {
+    private fun setupActionHandlers(actionsDispatcher: DetoxActionsDispatcher, serverAdapter: DetoxServerAdapter, testEngineFacade: TestEngineFacade, rnHostHolder: Context) {
+        class SynchronizedActionHandler(private val actionHandler: DetoxActionHandler): DetoxActionHandler {
+            override fun handle(params: String, messageId: Long) {
+                synchronized(this@DetoxMain) {
+                    actionHandler.handle(params, messageId)
+                }
+            }
+        }
+
         // Primary actions
         with(actionsDispatcher) {
-            var prematureIsReadyHandler: PrematureReadyHandler? = PrematureReadyHandler()
-            val rnReloadHandler = ReactNativeReloadActionHandler(rnHostHolder, serverAdapter, testEngineFacade)
-
-            associateActionHandler(INIT_ACTION, object: DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) =
-                    synchronized(this@DetoxMain) {
-                        this@DetoxMain.doInit(serverAdapter)
-                    }
-            })
-            associateActionHandler(IS_READY_ACTION, prematureIsReadyHandler!!)
-
-            associateActionHandler("loginSuccess", object: DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) {
-                    synchronized(this@DetoxMain) {
-                        this@DetoxMain.onConnected(activityLaunchHelper, rnHostHolder)
-                        associateActionHandler(IS_READY_ACTION, ReadyActionHandler(serverAdapter, testEngineFacade))
-
-                        prematureIsReadyHandler?.let {
-                            if (it.isActionPending) {
-                                actionsDispatcher.dispatchAction(IS_READY_ACTION, it.params!!, it.messageId!!)
-                            }
-                            prematureIsReadyHandler = null
-                        }
-                    }
-                }
-            })
-            associateActionHandler("reactNativeReload", object: DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) =
-                    synchronized(this@DetoxMain) {
-                        rnReloadHandler.handle(params, messageId)
-                    }
-            })
+            val readyHandler = SynchronizedActionHandler( ReadyActionHandler(serverAdapter, testEngineFacade) )
+            val rnReloadHandler = SynchronizedActionHandler( ReactNativeReloadActionHandler(rnHostHolder, serverAdapter, testEngineFacade) )
+
+            associateActionHandler("loginSuccess", ::onLoginSuccess)
+            associateActionHandler("isReady", readyHandler)
+            associateActionHandler("reactNativeReload", rnReloadHandler)
             associateActionHandler("invoke", InvokeActionHandler(MethodInvocation(), serverAdapter))
             associateActionHandler("cleanup", CleanupActionHandler(serverAdapter, testEngineFacade) {
                 dispatchAction(TERMINATION_ACTION, "", 0)
             })
-            associateActionHandler(TERMINATION_ACTION, object: DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) {
-                    this@DetoxMain.doTeardown(serverAdapter, actionsDispatcher, testEngineFacade)
-                }
-            })
+            associateActionHandler(TERMINATION_ACTION) { -> doTeardown(serverAdapter, actionsDispatcher, testEngineFacade) }
 
             if (DetoxInstrumentsManager.supports()) {
                 val instrumentsManager = DetoxInstrumentsManager(rnHostHolder)
@@ -112,13 +100,8 @@ object DetoxMain {
 
         // Secondary actions
         with(actionsDispatcher) {
-            val queryStatusHandler = QueryStatusActionHandler(serverAdapter, testEngineFacade)
-            associateActionHandler("currentStatus", object: DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) =
-                    synchronized(this@DetoxMain) {
-                        queryStatusHandler.handle(params, messageId)
-                    }
-            }, false)
+            val queryStatusHandler = SynchronizedActionHandler( QueryStatusActionHandler(serverAdapter, testEngineFacade) )
+            associateSecondaryActionHandler("currentStatus", queryStatusHandler)
         }
     }
 
@@ -138,7 +121,7 @@ object DetoxMain {
         ReactNativeExtension.initIfNeeded()
     }
 
-    private fun launchApp(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
+    private fun launchActivity(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
         Log.i(DetoxLog.LOG_TAG, "Launching the tested activity!")
         activityLaunchHelper.launchActivityUnderTest()
         ReactNativeExtension.waitForRNBootstrap(rnHostHolder)

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxActionHandlers.kt

@@ -3,7 +3,6 @@ package com.wix.detox.adapters.server
 import android.content.Context
 import android.util.Log
 import com.wix.detox.TestEngineFacade
-import com.wix.detox.common.DetoxLog
 import com.wix.detox.common.extractRootCause
 import com.wix.detox.instruments.DetoxInstrumentsException
 import com.wix.detox.instruments.DetoxInstrumentsManager
@@ -28,20 +27,6 @@ class ReadyActionHandler(
     }
 }
 
-class PrematureReadyHandler(): DetoxActionHandler {
-    var isActionPending = false
-    var params: String? = null
-    var messageId: Long? = null
-
-    override fun handle(params: String, messageId: Long) {
-        Log.i(DetoxLog.LOG_TAG, "Got a premature ready action, saving for later...")
-
-        this.isActionPending = true
-        this.params = params
-        this.messageId = messageId
-    }
-}
-
 open class ReactNativeReloadActionHandler(
         private val appContext: Context,
         private val outboundServerAdapter: OutboundServerAdapter,

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxActionsDispatcher.kt

@@ -11,11 +11,18 @@ class DetoxActionsDispatcher {
     private val primaryExec = ActionsExecutor("detox.primary")
     private val secondaryExec = ActionsExecutor("detox.secondary")
 
-    fun associateActionHandler(type: String, actionHandler: DetoxActionHandler, isPrimary: Boolean = true) {
-        val actionsExecutor = (if (isPrimary) primaryExec else secondaryExec)
-        actionsExecutor.associateHandler(type, actionHandler)
+    fun associateActionHandler(type: String, actionHandler: DetoxActionHandler) =
+        associateActionHandler(type, actionHandler, true)
+
+    fun associateActionHandler(type: String, handlerFunc: () -> Unit) {
+        associateActionHandler(type, object: DetoxActionHandler {
+            override fun handle(params: String, messageId: Long) = handlerFunc()
+        })
     }
 
+    fun associateSecondaryActionHandler(type: String, actionHandler: DetoxActionHandler) =
+        associateActionHandler(type, actionHandler, false)
+
     fun dispatchAction(type: String, params: String, messageId: Long) {
         (primaryExec.executeAction(type, params, messageId) ||
             secondaryExec.executeAction(type, params, messageId))
@@ -33,6 +40,11 @@ class DetoxActionsDispatcher {
         primaryExec.join()
         secondaryExec.join()
     }
+
+    private fun associateActionHandler(type: String, actionHandler: DetoxActionHandler, isPrimary: Boolean = true) {
+        val actionsExecutor = (if (isPrimary) primaryExec else secondaryExec)
+        actionsExecutor.associateHandler(type, actionHandler)
+    }
 }
 
 private class ActionsExecutor(name: String) {
@@ -74,7 +86,5 @@ private class ActionsExecutor(name: String) {
         handler.looper.quit()
     }
 
-    fun join() {
-        thread.join()
-    }
+    fun join() = thread.join()
 }

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxServerAdapter.kt

@@ -10,7 +10,6 @@ interface OutboundServerAdapter {
 class DetoxServerAdapter(
         private val actionsDispatcher: DetoxActionsDispatcher,
         private val detoxServerInfo: DetoxServerInfo,
-        private val readyActionType: String,
         private val terminationActionType: String)
     : WebSocketClient.WSEventsHandler, OutboundServerAdapter {
 
@@ -27,7 +26,6 @@ class DetoxServerAdapter(
 
     override fun onConnect() {
         Log.i(DetoxLog.LOG_TAG, "Connected to server!")
-        actionsDispatcher.dispatchAction(readyActionType, "", -1000L)
     }
 
     override fun onClosed() {

package/android/detox/src/full/java/com/wix/detox/espresso/web/WebElement.java

@@ -62,12 +62,12 @@ public class WebElement {
         return getWebViewInteraction().withElement(get()).perform(DriverAtoms.getText()).get();
     }
 
-    public Evaluation runScript(String script) {
-        return getWebViewInteraction().withElement(get()).perform(new SimpleAtom(script)).get();
+    public Object runScript(String script) {
+        return getWebViewInteraction().withElement(get()).perform(new SimpleAtom(script)).get().getValue();
     }
 
-    public Evaluation runScriptWithArgs(String script, final ArrayList<Object> args) {
-        return getWebViewInteraction().withElement(get()).perform(Atoms.scriptWithArgs(script, args)).get();
+    public Object runScriptWithArgs(String script, final ArrayList<Object> args) {
+        return getWebViewInteraction().withElement(get()).perform(Atoms.scriptWithArgs(script, args)).get().getValue();
     }
 
     public String getCurrentUrl() {

package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt

@@ -36,7 +36,6 @@ object ReactNativeExtension {
             val reactContext = awaitNewReactNativeContext(it, null)
 
             enableOrDisableSynchronization(reactContext)
-            hackRN50WaitForReady()
         }
     }
 
@@ -66,7 +65,6 @@ object ReactNativeExtension {
             val reactContext = awaitNewReactNativeContext(it, previousReactContext)
 
             enableOrDisableSynchronization(reactContext, networkSyncEnabled)
-            hackRN50WaitForReady()
         }
     }
 
@@ -152,18 +150,6 @@ object ReactNativeExtension {
         }
     }
 
-    private fun hackRN50WaitForReady() {
-        if (ReactNativeInfo.rnVersion().minor in 50..62) {
-            try {
-                //TODO- Temp hack to make Detox usable for RN>=50 till we find a better sync solution.
-                Thread.sleep(1000)
-            } catch (e: InterruptedException) {
-                e.printStackTrace()
-            }
-
-        }
-    }
-
     private fun clearIdlingResources() {
         rnIdlingResources?.unregisterAll()
         rnIdlingResources = null

package/android/detox/src/full/java/com/wix/invoke/types/Invocation.java

@@ -68,9 +68,9 @@ public class Invocation {
                 argument = args.get(i);
             } else if(args.get(i).getClass() == JSONArray.class) {
                 JSONArray jsonArray = (JSONArray) args.get(i);
-                List<String> list = new ArrayList<>();
+                List<Object> list = new ArrayList<>();
                 for (int j = 0; j < jsonArray.length(); j++) {
-                    list.add(jsonArray.getString(j));
+                    list.add(jsonArray.get(j));
                 }
                 argument = list;
             } else {

package/android/detox/src/main/java/com/wix/detox/espresso/action/common/MotionEvents.kt

@@ -9,8 +9,37 @@ import androidx.test.espresso.action.MotionEvents
 private val PRECISION = floatArrayOf(16f, 16f)
 
 class MotionEvents {
-    fun obtainMoveEvent(downEvent: MotionEvent, eventTime: Long, x: Float, y: Float): MotionEvent
-            = MotionEvents.obtainMovement(downEvent.downTime, eventTime, floatArrayOf(x, y))!!
+    fun obtainMoveEvent(downEvent: MotionEvent, eventTime: Long, x: Float, y: Float): MotionEvent {
+        val pointerProperties = MotionEvent.PointerProperties().apply {
+            clear()
+            id = 0
+            toolType = MotionEvent.TOOL_TYPE_UNKNOWN
+        }
+        val pointerCoords = MotionEvent.PointerCoords().apply {
+            clear()
+            this.x = x
+            this.y = y
+            this.pressure = 0f
+            this.size = 1f
+        }
+
+        return MotionEvent.obtain(
+              downEvent.downTime,
+              eventTime,
+              MotionEvent.ACTION_MOVE,
+              1, // pointerCounts
+              arrayOf(pointerProperties),
+              arrayOf(pointerCoords),
+              0, // metaState
+              downEvent.buttonState,
+              downEvent.xPrecision,
+              downEvent.yPrecision,
+              0, // deviceId
+              0, // edgeFlags
+              downEvent.source,
+              0
+        )
+    }
 
     fun obtainDownEvent(x: Float, y: Float, precision: FloatArray = PRECISION)
         = obtainDownEvent(x, y, precision, null)
@@ -46,8 +75,35 @@ class MotionEvents {
                 0)
     }
 
-    fun obtainUpEvent(downEvent: MotionEvent, eventTime: Long, x: Float, y: Float): MotionEvent
-            = MotionEvent.obtain(downEvent.downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0)!!
+    fun obtainUpEvent(downEvent: MotionEvent, eventTime: Long, x: Float, y: Float): MotionEvent {
+        val pointerProperties = MotionEvent.PointerProperties().apply {
+          id = 0
+          toolType = MotionEvent.TOOL_TYPE_UNKNOWN
+        }
+        val pointerCoords = MotionEvent.PointerCoords().apply {
+          clear()
+          this.x = x
+          this.y = y
+          this.pressure = 0f
+          this.size = 1f
+        }
+        return MotionEvent.obtain(
+              downEvent.downTime,
+              eventTime,
+              MotionEvent.ACTION_UP,
+              1, // pointerCounts
+              arrayOf(pointerProperties),
+              arrayOf(pointerCoords),
+              0, // metaState
+              downEvent.buttonState,
+              downEvent.xPrecision,
+              downEvent.yPrecision,
+              0, // deviceId
+              0, // edgeFlags
+              downEvent.source,
+              0
+        )
+    }
 
     fun sendDownAsync(uiController: UiController, x: Float, y: Float, precision: FloatArray = PRECISION): MotionEvent {
         val downEvent = obtainDownEvent(x, y, precision, null)