detox 20.14.0-prerelease.0 → 20.14.0-prerelease.2

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2-javadoc.jar.md5

@@ -0,0 +1 @@
+e1dbfeba2b0b444b4311cccd5c4c008a

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2-javadoc.jar.sha1

@@ -0,0 +1 @@
+e0a1d1fbab61c5893fdb46e2235e1dc6965bd844

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2-javadoc.jar.sha256

@@ -0,0 +1 @@
+6d2d413c447f14ec84981d3da97088eb6ead4abeeffab793c0e3807ba0ea0a20

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2-javadoc.jar.sha512

@@ -0,0 +1 @@
+f3d84c1967a303c3c707f7078767ef0296c9f7371f8357040f8fa42489e46686f79820c4da968a56ed5c0d6061595bc779960b8ceaf442025eb84781fd23a542

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2-sources.jar.md5

@@ -0,0 +1 @@
+c89a64efb61062b35edfa9de7d8b2e00

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2-sources.jar.sha1

@@ -0,0 +1 @@
+66be2d4b4d91e76a8909fc7545fcf13a60eba43e

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2-sources.jar.sha256

@@ -0,0 +1 @@
+13dea4a5f63caef936464c15a71159cde4bc2b0c80341428c3316e61bdff8acb

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2-sources.jar.sha512

@@ -0,0 +1 @@
+ef3ae29d6f7e051f506fd883f538bda1c818b2024e79cd06874a8dc315f136bfe64f9376b1dab7fc0cc95dda74d3fd69aab4788d87b6526793e85ee081b8018d

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2.aar.md5

@@ -0,0 +1 @@
+8d86651a5283de3c9553a1c45ae34def

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2.aar.sha1

@@ -0,0 +1 @@
+ee568f1ad8cdbb5d491fa566632d846fb9db0a80

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2.aar.sha256

@@ -0,0 +1 @@
+39db53cfe1ef966fb18c2dc4f30c56f1e6d9b63c393f114f63d51e9848bfc28a

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2.aar.sha512

@@ -0,0 +1 @@
+160c2f2c9d386372d094eb9c41b97007e61811f642d794298630f6b4af6db906f75d34da02afe86febcb2fe06baf32e3a9f5d68e018abab1299ca025974b1503

package/Detox-android/com/wix/detox/{20.14.0-prerelease.0/detox-20.14.0-prerelease.0.pom → 20.14.0-prerelease.2/detox-20.14.0-prerelease.2.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.14.0-prerelease.0</version>
+  <version>20.14.0-prerelease.2</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.0-prerelease.2/detox-20.14.0-prerelease.2.pom.md5

@@ -0,0 +1 @@
+e973e8bfa03ed352cbbd3635a81a9e79

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2.pom.sha1

@@ -0,0 +1 @@
+5e0a40ff9b9798ca9e76525ada5bc3199f6c2517

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2.pom.sha256

@@ -0,0 +1 @@
+2156c5da6b37fc3bce8c585df1b1edba48f4794f00d5736a9055c1f425e5d60f

package/Detox-android/com/wix/detox/20.14.0-prerelease.2/detox-20.14.0-prerelease.2.pom.sha512

@@ -0,0 +1 @@
+9162d09b7e867b0ce6a1ebdfba18172824c29c7e7921dfcd0721b22f0549e115afef385167db7f7e443c80db2fb08066194aacb6c497774d1d79720592fd3f51

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-prerelease.0</latest>
-    <release>20.14.0-prerelease.0</release>
+    <latest>20.14.0-prerelease.2</latest>
+    <release>20.14.0-prerelease.2</release>
     <versions>
-      <version>20.14.0-prerelease.0</version>
+      <version>20.14.0-prerelease.2</version>
     </versions>
-    <lastUpdated>20231206150336</lastUpdated>
+    <lastUpdated>20231210110218</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-374b144f9306034184388c9579fcda60
+5eb089354bf7e6365077c660d176d63c

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

@@ -1 +1 @@
-aeb72dae3a76fd71e383c8b1bbc7871bf39b5424
+1dc810e178b23e373e4891b93830741d37f1df15

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

@@ -1 +1 @@
-94e4275040ab622783723cea7783afc664a6b9759ea43e8d3c57b48e1eb34290
+6346b5dc9a255df56aea84bb619de85ebb65ee1982d0e8759c3be02fe6460f02

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

@@ -1 +1 @@
-8ed181a738180833c36cf5066afb55082d4067c3924e5f240deef147ee818058a09ad14f3a2800cb46538e67872fd79b8437561b37eadd9e2f9f7d38b5454285
+f86e5affbf923bef18101c744088e4fee87177ad0cf66bc72e9010bbab37ba9f9d1a99792e5031f76ca6d5c59029f7247ed380811eca80b523b519dd02d962cb

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

@@ -13,40 +13,52 @@ import java.util.concurrent.CountDownLatch
 private const val TERMINATION_ACTION = "_terminate"
 
 object DetoxMain {
-    private val loginMonitor = CountDownLatch(1)
+    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, TERMINATION_ACTION)
-
-        initActionHandlers(actionsDispatcher, externalAdapter, testEngineFacade, rnHostHolder)
-//        actionsDispatcher.dispatchAction(INIT_ACTION, "", 0)
-init(externalAdapter)
-synchronized(this) {
-    awaitHandshake()
-    launchApp(rnHostHolder, activityLaunchHelper)
-}
-        actionsDispatcher.join()
-    }
+        val serverAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, TERMINATION_ACTION)
 
-    private fun init(externalAdapter: DetoxServerAdapter) {
-        initCrashHandler(externalAdapter)
-        initANRListener(externalAdapter)
+        initCrashHandler(serverAdapter)
+        initANRListener(serverAdapter)
         initEspresso()
         initReactNative()
 
-        externalAdapter.connect()
+        setupActionHandlers(actionsDispatcher, serverAdapter, testEngineFacade, rnHostHolder)
+        serverAdapter.connect()
+
+        launchActivityOnCue(rnHostHolder, activityLaunchHelper)
+        actionsDispatcher.join()
+    }
+
+    /**
+     * 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)
     }
 
     private fun awaitHandshake() {
-        loginMonitor.await()
+        handshakeLock.await()
     }
 
     private fun onLoginSuccess() {
-        loginMonitor.countDown()
+        handshakeLock.countDown()
     }
 
     private fun doTeardown(serverAdapter: DetoxServerAdapter, actionsDispatcher: DetoxActionsDispatcher, testEngineFacade: TestEngineFacade) {
@@ -56,30 +68,28 @@ synchronized(this) {
         actionsDispatcher.teardown()
     }
 
-    private fun initActionHandlers(actionsDispatcher: DetoxActionsDispatcher, serverAdapter: DetoxServerAdapter, testEngineFacade: TestEngineFacade, rnHostHolder: Context) {
-        // Primary actions
-        with(actionsDispatcher) {
-            val readyHandler = ReadyActionHandler(serverAdapter, testEngineFacade)
-            val rnReloadHandler = ReactNativeReloadActionHandler(rnHostHolder, serverAdapter, testEngineFacade)
-
-            associateActionHandler("isReady") { params, messageId ->
+    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) {
-                    readyHandler.handle(params, messageId)
-                }
-            }
-            associateActionHandler("loginSuccess") { _, _ -> this@DetoxMain.onLoginSuccess() }
-            associateActionHandler("reactNativeReload") { params, messageId ->
-                synchronized(this@DetoxMain) {
-                    rnReloadHandler.handle(params, messageId)
+                    actionHandler.handle(params, messageId)
                 }
             }
+        }
+
+        // Primary actions
+        with(actionsDispatcher) {
+            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) { _, _ ->
-                this@DetoxMain.doTeardown(serverAdapter, actionsDispatcher, testEngineFacade)
-            }
+            associateActionHandler(TERMINATION_ACTION) { -> doTeardown(serverAdapter, actionsDispatcher, testEngineFacade) }
 
             if (DetoxInstrumentsManager.supports()) {
                 val instrumentsManager = DetoxInstrumentsManager(rnHostHolder)
@@ -90,13 +100,8 @@ synchronized(this) {
 
         // 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)
         }
     }
 
@@ -116,7 +121,7 @@ synchronized(this) {
         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/DetoxActionsDispatcher.kt

@@ -11,17 +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: (params: String, messageId: Long) -> Unit) {
+    fun associateActionHandler(type: String, handlerFunc: () -> Unit) {
         associateActionHandler(type, object: DetoxActionHandler {
-            override fun handle(params: String, messageId: Long) = handlerFunc(params, messageId)
+            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))
@@ -39,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) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.14.0-prerelease.0",
+  "version": "20.14.0-prerelease.2",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -109,5 +109,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "4eb7e6729cf5bd3d30f720c40df316fdf38300df"
+  "gitHead": "1707cce5d1e9922af476f3a47d34e3abfa2f0615"
 }

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0-javadoc.jar.md5

@@ -1 +0,0 @@
-5aec7a3796623aa58d8d12e2a79a73d4

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-3530c43ea00d627580747ee9f0d5863ca9813f37

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-8e1b2ec062f53625f04682a7680f945a735f5ce1398779fc75053e06552d1df5

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-609e6c6a9432b4e1ef6a4e0cce31001a69ea5fb95ea2396be34732e5e1cc80accb647c5c9003827cf69754918a3a814deb24d27f14047a3aa6297c92b764ef03

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0-sources.jar.md5

@@ -1 +0,0 @@
-a5d3efc29dc36129f22268aecde7ba01

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0-sources.jar.sha1

@@ -1 +0,0 @@
-c2dffdb56581b4c26ed98b6775e222e1a4486c5e

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0-sources.jar.sha256

@@ -1 +0,0 @@
-c9a52d8a32ecbc37230bcdbb9a4aa67411ca950311e5de327ec44694d77c8872

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0-sources.jar.sha512

@@ -1 +0,0 @@
-402fd90cfcfc8ee4f7faa04e7915ab6f24580ef704dbe0b835bae434abe4bf749987cb7fcc52b6a1f7557275a3ca5e0205438aef2934966948dfdaa66335a162

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0.aar.md5

@@ -1 +0,0 @@
-e4d79ca2a269e97059c4321c69b89508

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0.aar.sha1

@@ -1 +0,0 @@
-a5f8cbcf67d3d87d5036eb6f48372962c64dd12b

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0.aar.sha256

@@ -1 +0,0 @@
-b2459b4c1286baf4f608be3ec55a46688c92ab1a95d840769a3519b4f75c2ea4

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0.aar.sha512

@@ -1 +0,0 @@
-60375b1df9ce89baea8fb435985d83d2fde2a8013f3b12fb1d3e3391ef7ac14e98d10eff9b27fd44acc753c7764244fcb0d9934ce97c4beb534102247a9962f0

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0.pom.md5

@@ -1 +0,0 @@
-1e365cca25c5a49f1bf610fd76df8ff0

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0.pom.sha1

@@ -1 +0,0 @@
-6f1a93a3247a829d64f63a67830adc742dfef0b9

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0.pom.sha256

@@ -1 +0,0 @@
-c2745e1391bb64bed726bf43a1f624f79d13f0a2c7e4ccd9838b64df40d1e3ee

package/Detox-android/com/wix/detox/20.14.0-prerelease.0/detox-20.14.0-prerelease.0.pom.sha512

@@ -1 +0,0 @@
-ca4428ae0cdffbf5bb7967d24f29486735a29ee89bad794bfa451f12467744f48bab8a7adac1fdb73426951aec461ccf3bae0396994c6e4711d1ff347e85369b