detox 20.14.0-prerelease.1 → 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.1/detox-20.14.0-prerelease.1.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.1</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.1</latest>
-    <release>20.14.0-prerelease.1</release>
+    <latest>20.14.0-prerelease.2</latest>
+    <release>20.14.0-prerelease.2</release>
     <versions>
-      <version>20.14.0-prerelease.1</version>
+      <version>20.14.0-prerelease.2</version>
     </versions>
-    <lastUpdated>20231207132752</lastUpdated>
+    <lastUpdated>20231210110218</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-a5fbdb5f4cfe92e4baf46b825a864c91
+5eb089354bf7e6365077c660d176d63c

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

@@ -1 +1 @@
-fdfcfe46dd0c8cd54f89a761002026c0cd8190b2
+1dc810e178b23e373e4891b93830741d37f1df15

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

@@ -1 +1 @@
-941e726a6f918bf8a8f7b7b31f1c26eb782454fe94637558a7db2240c4069873
+6346b5dc9a255df56aea84bb619de85ebb65ee1982d0e8759c3be02fe6460f02

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

@@ -1 +1 @@
-aa7ce9a334943c2654001478df332f4ae943aa91c7d583870726a72f71c80163ec30e62c6c476ee7f9dc82bba2954bba54dca6504f6d4835fb6f22bbcdc6c6e2
+f86e5affbf923bef18101c744088e4fee87177ad0cf66bc72e9010bbab37ba9f9d1a99792e5031f76ca6d5c59029f7247ed380811eca80b523b519dd02d962cb

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

@@ -13,39 +13,39 @@ 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)
+        val serverAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, TERMINATION_ACTION)
 
-        initActionHandlers(actionsDispatcher, externalAdapter, testEngineFacade, rnHostHolder)
-        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", meaning - right after a connection is established and the handshake
+     * 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 sync (latches) would be required
-     * thanks to the usage of Handlers. However, for a reason we're not yet sure of, in this type of a solution,
-     * errors / crashes would be reported not by instrumentation itself, but based on the `AppWillTerminateWithError`
-     * message. For a reason we're not sure of yet, it is ignored by the test runner at this point.
+     * 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) {
@@ -54,11 +54,11 @@ object DetoxMain {
     }
 
     private fun awaitHandshake() {
-        loginMonitor.await()
+        handshakeLock.await()
     }
 
     private fun onLoginSuccess() {
-        loginMonitor.countDown()
+        handshakeLock.countDown()
     }
 
     private fun doTeardown(serverAdapter: DetoxServerAdapter, actionsDispatcher: DetoxActionsDispatcher, testEngineFacade: TestEngineFacade) {
@@ -68,30 +68,28 @@ object DetoxMain {
         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 ->
-                synchronized(this@DetoxMain) {
-                    readyHandler.handle(params, messageId)
-                }
-            }
-            associateActionHandler("loginSuccess") { _, _ -> this@DetoxMain.onLoginSuccess() }
-            associateActionHandler("reactNativeReload") { 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) {
-                    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)
@@ -102,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)
         }
     }
 

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.1",
+  "version": "20.14.0-prerelease.2",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -109,5 +109,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "9f0d8ffd8b670a6575e2f97f4e604f6ce767de73"
+  "gitHead": "1707cce5d1e9922af476f3a47d34e3abfa2f0615"
 }

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

@@ -1 +0,0 @@
-efa8385779687a7552a1939a9c8bf6fe

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

@@ -1 +0,0 @@
-101174d6efcc4c3d6345187ba36580c69a2a85cb

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

@@ -1 +0,0 @@
-d619749f1bd215f97a95125e7a6116a7726e2db9030f2b8f5ef0aad8f58882a4

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

@@ -1 +0,0 @@
-997784e15a3f0ff43ad1d5071b8aa57ca91e78bd6acdae715113788f53c69d8c6cdcb992e71ef88eabaa88b47c430f05455c018a0a734113cb780dd3a8321a07

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

@@ -1 +0,0 @@
-b302e04fca9f2cad3286ef322a4dec4b

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

@@ -1 +0,0 @@
-5d123db8609c50172f853c041d5e612de4702637

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

@@ -1 +0,0 @@
-75b2298b573526569f309412704e734ec6001ba71dcf0881c90a4ebd64938a45

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

@@ -1 +0,0 @@
-f7e7ef9b6e16ee7b2a70fe67a96746ea7ac2e2cfc088265c31ba1bd9d4c94ca76a8c2d205ed19fa9138f3c9f23f452ea64b5c474afffba42ed687bd6c55b9b81

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

@@ -1 +0,0 @@
-b096766881e5d6242eaf8ee3977b93a6

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

@@ -1 +0,0 @@
-1599f587830337398b9c239a20c69211254756b0

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

@@ -1 +0,0 @@
-d147079616a4b6739b14e99ad6ba8e3d082666a765afc2df81b87ecf9a004a86

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

@@ -1 +0,0 @@
-51e2e0600ce32dea98d699033b50f42d21b8adc64821a6e2bb5e31b20e4cc20313c397bc143a9d70ea7afbbb065618a8bdcec1856b9ea447c6a81737b9edf6dc

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

@@ -1 +0,0 @@
-f73acc957c266c1fef076f602b66861c

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

@@ -1 +0,0 @@
-340fc63dd4b514f7367b05f97dd3c43f909bf9cc

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

@@ -1 +0,0 @@
-4451cfbd861ce7846f1e73930b9e16ac7ff3e465bdb372ed5951dd97d083d68e

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

@@ -1 +0,0 @@
-70641a31152ce0957cc51fbedd21dbf4021eca76af86dd0aaadb4b8b0671ec97c367f20da996497f123be5b150b682e30c1b3aa179fce8af337e296527823b34