detox 20.14.3 → 20.15.0-prerelease.0

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

@@ -0,0 +1 @@
+3cd5c07a1a85e6e6ecb6ceb8b1211b5f

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

@@ -0,0 +1 @@
+5d4de8f6419f956ca8ababe7421ddbcb44205391

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

@@ -0,0 +1 @@
+7b3135220fb3f688adc1b6028f462e8b15b10ba6f847e273c43b5ec8ce6c7787

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

@@ -0,0 +1 @@
+5644850b63ced1e2a2ac4f2d009e576d4d2164140d12493afe4dea9bbf9ae15cd2e67c875de90acaf2664f9095646d885e1a33f89b9f9e1018dd039c317462ff

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

@@ -0,0 +1 @@
+5f1ff10afe844322dd95663ff3b79733

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

@@ -0,0 +1 @@
+978a04494b3655d7bad767746e4b5f87517d425c

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

@@ -0,0 +1 @@
+397159775586aa3ee57476b45c587e64154feba1fff0ff452192f7fbec1df667

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

@@ -0,0 +1 @@
+ae033768f1b9dd43e19f5606c20a8271e22e1f3f5fc88ea1d892fdcb09770f6907427bf81320564c62e5dbd78beab6a798167b0f1d776047e6f0fa5c74dc2c2d

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

@@ -0,0 +1 @@
+c27920150917efb5b25878186e904fe0

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

@@ -0,0 +1 @@
+ad9e12738ca3c82606a58bacea6d50b51687aee9

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

@@ -0,0 +1 @@
+ab07c0011f9cee612e5b56ea42618978b75a5cfff9841766fc3f796e730c3571

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

@@ -0,0 +1 @@
+a26f964a1ef775262740a23fbbeca9e5754a5da7896bcab22a476f684d40168b67ad4a97087a1f6fe484343e70eb32063adfeac3a2879f887e8d7fc616e6eacc

package/Detox-android/com/wix/detox/{20.14.3/detox-20.14.3.pom → 20.15.0-prerelease.0/detox-20.15.0-prerelease.0.pom}

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

@@ -0,0 +1 @@
+5252ce03ecdbc8c6e367a4a6c9f308ca

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

@@ -0,0 +1 @@
+7d885823adf8e1d2217ab89909d53fbc9acb23de

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

@@ -0,0 +1 @@
+a0c47342c3898b2cfe040146683d58d022bca2606d676003dfac59be11cbca05

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

@@ -0,0 +1 @@
+6ab3dd11adfba07baeb98509a3c0e86718a00eeee5b2470429dc10e79e22b74b579a3d5ff06fcc1375f999e5e7a676a3cf49e8a570dd04b6666c63675a1196e1

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.14.3</latest>
-    <release>20.14.3</release>
+    <latest>20.15.0-prerelease.0</latest>
+    <release>20.15.0-prerelease.0</release>
     <versions>
-      <version>20.14.3</version>
+      <version>20.15.0-prerelease.0</version>
     </versions>
-    <lastUpdated>20231219153636</lastUpdated>
+    <lastUpdated>20231220150359</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-fc0fd4a19cec1d107b1bd9fd90013cf4
+273bcf78a3612642a9b19326f7a7fb3a

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

@@ -1 +1 @@
-6d3386088773329bf556fbe64b844403f2b8f037
+08771ff6772b4c990504fbe9ab123ef0e2ddacd7

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

@@ -1 +1 @@
-7e9f03941de1513d09d0e46256c9545fb517e0a1736ef1dc38590f347ff4c515
+3bf9e3855939fc03f5374c0af9878a5110428da69ef8810a2c9bcc13f66a7637

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

@@ -1 +1 @@
-05bb3d2da873b14e798fdf91cf1e41976b36bdbb1dbc1713ff0e9d28010b2856146dff2146f145c7e928eb678939be02b7d9e5c413ad52296951468284daaf85
+7e2da3c400021c8d949fa5d580ea7b6449531ce0329666cd1c8c1b95ee0fb0c5248130b37db7a64bf227f4c3d0e5b0eb3e500c4a969c99fa6e52e6641cefd274

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

@@ -0,0 +1,78 @@
+package com.wix.detox
+
+import android.app.Instrumentation.ActivityMonitor
+import android.content.Context
+import android.content.Intent
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+
+class ActivityLaunchHelper
+    @JvmOverloads constructor(
+        private val activityTestRule: ActivityTestRule<*>,
+        private val launchArgs: LaunchArgs = LaunchArgs(),
+        private val intentsFactory: LaunchIntentsFactory = LaunchIntentsFactory(),
+        private val notificationDataParserGen: (String) -> NotificationDataParser = { path -> NotificationDataParser(path) }
+) {
+    fun launchActivityUnderTest() {
+        val intent = extractInitialIntent()
+        activityTestRule.launchActivity(intent)
+    }
+
+    fun launchMainActivity() {
+        val activity = activityTestRule.activity
+        launchActivitySync(intentsFactory.activityLaunchIntent(activity))
+    }
+
+    fun startActivityFromUrl(url: String) {
+        launchActivitySync(intentsFactory.intentWithUrl(url, false))
+    }
+
+    fun startActivityFromNotification(dataFilePath: String) {
+        val notificationData = notificationDataParserGen(dataFilePath).toBundle()
+        val intent = intentsFactory.intentWithNotificationData(appContext, notificationData, false)
+        launchActivitySync(intent)
+    }
+
+    private fun extractInitialIntent(): Intent =
+        (if (launchArgs.hasUrlOverride()) {
+            intentsFactory.intentWithUrl(launchArgs.urlOverride, true)
+        } else if (launchArgs.hasNotificationPath()) {
+            val notificationData = notificationDataParserGen(launchArgs.notificationPath).toBundle()
+            intentsFactory.intentWithNotificationData(appContext, notificationData, true)
+        } else {
+            intentsFactory.cleanIntent()
+        }).also {
+            it.putExtra(INTENT_LAUNCH_ARGS_KEY, launchArgs.asIntentBundle())
+        }
+
+    private fun launchActivitySync(intent: Intent) {
+        // Ideally, we would just call sActivityTestRule.launchActivity(intent) and get it over with.
+        // BUT!!! as it turns out, Espresso has an issue where doing this for an activity running in the background
+        // would have Espresso set up an ActivityMonitor which will spend its time waiting for the activity to load, *without
+        // ever being released*. It will finally fail after a 45 seconds timeout.
+        // Without going into full details, it seems that activity test rules were not meant to be used this way. However,
+        // the all-new ActivityScenario implementation introduced in androidx could probably support this (e.g. by using
+        // dedicated methods such as moveToState(), which give better control over the lifecycle).
+        // In any case, this is the core reason for this issue: https://github.com/wix/Detox/issues/1125
+        // What it forces us to do, then, is this -
+        // 1. Launch the activity by "ourselves" from the OS (i.e. using context.startActivity()).
+        // 2. Set up an activity monitor by ourselves -- such that it would block until the activity is ready.
+        // ^ Hence the code below.
+        val activity = activityTestRule.activity
+        val activityMonitor = ActivityMonitor(activity.javaClass.name, null, true)
+        activity.startActivity(intent)
+
+        InstrumentationRegistry.getInstrumentation().run {
+            addMonitor(activityMonitor)
+            waitForMonitorWithTimeout(activityMonitor, ACTIVITY_LAUNCH_TIMEOUT)
+        }
+    }
+
+    private val appContext: Context
+        get() = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+
+    companion object {
+        private const val INTENT_LAUNCH_ARGS_KEY = "launchArgs"
+        private const val ACTIVITY_LAUNCH_TIMEOUT = 10000L
+    }
+}

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

@@ -1,18 +1,13 @@
 package com.wix.detox;
 
-import android.app.Activity;
-import android.app.Instrumentation;
 import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.wix.detox.config.DetoxConfig;
-import com.wix.detox.espresso.UiControllerSpy;
 
 import androidx.annotation.NonNull;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
+import com.wix.detox.config.DetoxConfig;
+
 /**
  * <p>Static class.</p>
  *
@@ -67,12 +62,7 @@ import androidx.test.rule.ActivityTestRule;
  * <p>If not set, then Detox tests are no ops. So it's safe to mix it with other tests.</p>
  */
 public final class Detox {
-    private static final String INTENT_LAUNCH_ARGS_KEY = "launchArgs";
-    private static final long ACTIVITY_LAUNCH_TIMEOUT = 10000L;
-
-    private static final LaunchArgs sLaunchArgs = new LaunchArgs();
-    private static final LaunchIntentsFactory sIntentsFactory = new LaunchIntentsFactory();
-    private static ActivityTestRule sActivityTestRule;
+    private static ActivityLaunchHelper sActivityLaunchHelper;
 
     private Detox() {
     }
@@ -132,72 +122,20 @@ public final class Detox {
         DetoxConfig.CONFIG = detoxConfig;
         DetoxConfig.CONFIG.apply();
 
-        sActivityTestRule = activityTestRule;
-
-        UiControllerSpy.attachThroughProxy();
-
-        Intent intent = extractInitialIntent();
-        sActivityTestRule.launchActivity(intent);
-
-        try {
-            DetoxMain.run(context);
-        } catch (Exception e) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException("Detox got interrupted prematurely", e);
-        }
+        sActivityLaunchHelper = new ActivityLaunchHelper(activityTestRule);
+        DetoxMain.run(context, sActivityLaunchHelper);
     }
 
     public static void launchMainActivity() {
-        final Activity activity = sActivityTestRule.getActivity();
-        launchActivitySync(sIntentsFactory.activityLaunchIntent(activity));
+        sActivityLaunchHelper.launchMainActivity();
     }
 
     public static void startActivityFromUrl(String url) {
-        launchActivitySync(sIntentsFactory.intentWithUrl(url, false));
+        sActivityLaunchHelper.startActivityFromUrl(url);
     }
 
     public static void startActivityFromNotification(String dataFilePath) {
-        Bundle notificationData = new NotificationDataParser(dataFilePath).toBundle();
-        Intent intent = sIntentsFactory.intentWithNotificationData(getAppContext(), notificationData, false);
-        launchActivitySync(intent);
-    }
-
-    private static Intent extractInitialIntent() {
-        Intent intent;
-
-        if (sLaunchArgs.hasUrlOverride()) {
-            intent = sIntentsFactory.intentWithUrl(sLaunchArgs.getUrlOverride(), true);
-        } else if (sLaunchArgs.hasNotificationPath()) {
-            Bundle notificationData = new NotificationDataParser(sLaunchArgs.getNotificationPath()).toBundle();
-            intent = sIntentsFactory.intentWithNotificationData(getAppContext(), notificationData, true);
-        } else {
-            intent = sIntentsFactory.cleanIntent();
-        }
-        intent.putExtra(INTENT_LAUNCH_ARGS_KEY, sLaunchArgs.asIntentBundle());
-        return intent;
-    }
-
-    private static void launchActivitySync(Intent intent) {
-        // Ideally, we would just call sActivityTestRule.launchActivity(intent) and get it over with.
-        // BUT!!! as it turns out, Espresso has an issue where doing this for an activity running in the background
-        // would have Espresso set up an ActivityMonitor which will spend its time waiting for the activity to load, *without
-        // ever being released*. It will finally fail after a 45 seconds timeout.
-        // Without going into full details, it seems that activity test rules were not meant to be used this way. However,
-        // the all-new ActivityScenario implementation introduced in androidx could probably support this (e.g. by using
-        // dedicated methods such as moveToState(), which give better control over the lifecycle).
-        // In any case, this is the core reason for this issue: https://github.com/wix/Detox/issues/1125
-        // What it forces us to do, then, is this -
-        // 1. Launch the activity by "ourselves" from the OS (i.e. using context.startActivity()).
-        // 2. Set up an activity monitor by ourselves -- such that it would block until the activity is ready.
-        // ^ Hence the code below.
-
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        final Activity activity = sActivityTestRule.getActivity();
-        final Instrumentation.ActivityMonitor activityMonitor = new Instrumentation.ActivityMonitor(activity.getClass().getName(), null, true);
-
-        activity.startActivity(intent);
-        instrumentation.addMonitor(activityMonitor);
-        instrumentation.waitForMonitorWithTimeout(activityMonitor, ACTIVITY_LAUNCH_TIMEOUT);
+        sActivityLaunchHelper.startActivityFromNotification(dataFilePath);
     }
 
     private static Context getAppContext() {

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

@@ -3,35 +3,62 @@ package com.wix.detox
 import android.content.Context
 import android.util.Log
 import com.wix.detox.adapters.server.*
-import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+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) {
+    fun run(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
         val detoxServerInfo = DetoxServerInfo()
-        Log.i(LOG_TAG, "Detox server connection details: $detoxServerInfo")
-
         val testEngineFacade = TestEngineFacade()
         val actionsDispatcher = DetoxActionsDispatcher()
-        val externalAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, IS_READY_ACTION, TERMINATION_ACTION)
-        initActionHandlers(actionsDispatcher, externalAdapter, testEngineFacade, rnHostHolder)
-        actionsDispatcher.dispatchAction(INIT_ACTION, "", 0)
+        val serverAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, TERMINATION_ACTION)
+
+        initCrashHandler(serverAdapter)
+        initANRListener(serverAdapter)
+        initEspresso()
+        initReactNative()
+
+        setupActionHandlers(actionsDispatcher, serverAdapter, testEngineFacade, rnHostHolder)
+        serverAdapter.connect()
+
+        launchActivityOnCue(rnHostHolder, activityLaunchHelper)
         actionsDispatcher.join()
     }
 
-    private fun doInit(externalAdapter: DetoxServerAdapter, rnHostHolder: Context) {
-        externalAdapter.connect()
+    /**
+     * 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() {
+        handshakeLock.await()
+    }
 
-        initCrashHandler(externalAdapter)
-        initANRListener(externalAdapter)
-        initReactNativeIfNeeded(rnHostHolder)
+    private fun onLoginSuccess() {
+        handshakeLock.countDown()
     }
 
     private fun doTeardown(serverAdapter: DetoxServerAdapter, actionsDispatcher: DetoxActionsDispatcher, testEngineFacade: TestEngineFacade) {
@@ -41,35 +68,28 @@ object DetoxMain {
         actionsDispatcher.teardown()
     }
 
-    private fun initActionHandlers(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) {
-            val rnReloadHandler = ReactNativeReloadActionHandler(rnHostHolder, serverAdapter, testEngineFacade)
+            val readyHandler = SynchronizedActionHandler( ReadyActionHandler(serverAdapter, testEngineFacade) )
+            val rnReloadHandler = SynchronizedActionHandler( ReactNativeReloadActionHandler(rnHostHolder, serverAdapter, testEngineFacade) )
 
-            associateActionHandler(INIT_ACTION, object : DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) =
-                    synchronized(this@DetoxMain) {
-                        this@DetoxMain.doInit(serverAdapter, rnHostHolder)
-                    }
-            })
-            associateActionHandler(IS_READY_ACTION, ReadyActionHandler(serverAdapter, testEngineFacade))
-
-            associateActionHandler("loginSuccess", ScarceActionHandler())
-            associateActionHandler("reactNativeReload", object: DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) =
-                    synchronized(this@DetoxMain) {
-                        rnReloadHandler.handle(params, messageId)
-                    }
-            })
+            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)
@@ -80,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)
         }
     }
 
@@ -98,7 +113,17 @@ object DetoxMain {
         DetoxANRHandler(outboundServerAdapter).attach()
     }
 
-    private fun initReactNativeIfNeeded(rnHostHolder: Context) {
+    private fun initEspresso() {
+        UiControllerSpy.attachThroughProxy()
+    }
+
+    private fun initReactNative() {
+        ReactNativeExtension.initIfNeeded()
+    }
+
+    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/LaunchIntentsFactory.kt

@@ -6,7 +6,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 
-internal class LaunchIntentsFactory {
+class LaunchIntentsFactory {
 
     /**
      * Constructs an intent tightly associated with a specific activity.

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

@@ -5,7 +5,7 @@ import com.wix.detox.common.JsonConverter
 import com.wix.detox.common.TextFileReader
 import org.json.JSONObject
 
-internal class NotificationDataParser(private val notificationPath: String) {
+class NotificationDataParser(private val notificationPath: String) {
     fun toBundle(): Bundle {
         val rawData = readNotificationFromFile()
         val json = JSONObject(rawData)

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

@@ -152,7 +152,3 @@ class InstrumentsEventsActionsHandler(
         outboundServerAdapter.sendMessage("eventDone", emptyMap<String, Any>(), messageId)
     }
 }
-
-class ScarceActionHandler: DetoxActionHandler {
-    override fun handle(params: String, messageId: Long) {}
-}

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/adapters/server/DetoxServerInfo.kt

@@ -1,7 +1,9 @@
 package com.wix.detox.adapters.server
 
+import android.util.Log
 import androidx.test.platform.app.InstrumentationRegistry
 import com.wix.detox.LaunchArgs
+import com.wix.detox.common.DetoxLog
 
 private const val DEFAULT_URL = "ws://localhost:8099"
 
@@ -9,7 +11,7 @@ class DetoxServerInfo internal constructor(launchArgs: LaunchArgs = LaunchArgs()
     val serverUrl: String = launchArgs.detoxServerUrl ?: DEFAULT_URL
     val sessionId: String = launchArgs.detoxSessionId ?: InstrumentationRegistry.getInstrumentation().targetContext.applicationInfo.packageName
 
-    override fun toString(): String {
-        return "url=$serverUrl, sessionId=$sessionId"
+    init {
+        Log.i(DetoxLog.LOG_TAG, "Detox server connection details: url=$serverUrl, sessionId=$sessionId")
     }
 }

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

@@ -0,0 +1,44 @@
+package com.wix.detox.reactnative
+
+import android.util.Log
+import com.facebook.react.bridge.ReactMarker
+import com.facebook.react.bridge.ReactMarkerConstants
+import com.facebook.react.bridge.ReactMarkerConstants.*
+
+object ReactMarkersLogger : ReactMarker.MarkerListener {
+
+    fun attach() {
+        ReactMarker.addListener(this)
+    }
+
+    override fun logMarker(marker: ReactMarkerConstants, p1: String?, p2: Int) {
+        when {
+            marker == DOWNLOAD_START ||
+            marker == DOWNLOAD_END ||
+            marker == BUILD_REACT_INSTANCE_MANAGER_START ||
+            marker == BUILD_REACT_INSTANCE_MANAGER_END ||
+            marker == REACT_BRIDGE_LOADING_START ||
+            marker == REACT_BRIDGE_LOADING_END ||
+            marker == REACT_BRIDGELESS_LOADING_START ||
+            marker == REACT_BRIDGELESS_LOADING_END ||
+            marker == CREATE_MODULE_START ||
+            marker == CREATE_MODULE_END ||
+            marker == NATIVE_MODULE_SETUP_START ||
+            marker == NATIVE_MODULE_SETUP_END ||
+            marker == PRE_RUN_JS_BUNDLE_START ||
+            marker == RUN_JS_BUNDLE_START ||
+            marker == RUN_JS_BUNDLE_END ||
+            marker == CONTENT_APPEARED ||
+            marker == CREATE_CATALYST_INSTANCE_START ||
+            marker == CREATE_CATALYST_INSTANCE_END ||
+            marker == DESTROY_CATALYST_INSTANCE_START ||
+            marker == DESTROY_CATALYST_INSTANCE_END ||
+            marker == CREATE_REACT_CONTEXT_START ||
+            marker == CREATE_REACT_CONTEXT_END ||
+            marker == PROCESS_PACKAGES_START ||
+            marker == PROCESS_PACKAGES_END ||
+                false ->
+                Log.d("Detox.RNMarker", "$marker ($p1)")
+        }
+    }
+}

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

@@ -14,6 +14,31 @@ private const val LOG_TAG = "DetoxRNExt"
 object ReactNativeExtension {
     private var rnIdlingResources: ReactNativeIdlingResources? = null
 
+    fun initIfNeeded() {
+        if (!ReactNativeInfo.isReactNativeApp()) {
+            return
+        }
+
+        ReactMarkersLogger.attach()
+    }
+
+    /**
+     * Wait for React-Native to finish loading (i.e. make RN context available).
+     *
+     * @param applicationContext The app context, implicitly assumed to be a [ReactApplication] instance.
+     */
+    fun waitForRNBootstrap(applicationContext: Context) {
+        if (!ReactNativeInfo.isReactNativeApp()) {
+            return
+        }
+
+        (applicationContext as ReactApplication).let {
+            val reactContext = awaitNewReactNativeContext(it, null)
+
+            enableOrDisableSynchronization(reactContext)
+        }
+    }
+
     /**
      * Reloads the React Native context and thus all javascript code.
      *
@@ -40,26 +65,6 @@ object ReactNativeExtension {
             val reactContext = awaitNewReactNativeContext(it, previousReactContext)
 
             enableOrDisableSynchronization(reactContext, networkSyncEnabled)
-            hackRN50OrHigherWaitForReady()
-        }
-    }
-
-    /**
-     * Wait for React-Native to finish loading (i.e. make RN context available).
-     *
-     * @param applicationContext The app context, implicitly assumed to be a [ReactApplication] instance.
-     */
-    @JvmStatic
-    fun waitForRNBootstrap(applicationContext: Context) {
-        if (!ReactNativeInfo.isReactNativeApp()) {
-            return
-        }
-
-        (applicationContext as ReactApplication).let {
-            val reactContext = awaitNewReactNativeContext(it, null)
-
-            enableOrDisableSynchronization(reactContext)
-            hackRN50OrHigherWaitForReady()
         }
     }
 
@@ -145,18 +150,6 @@ object ReactNativeExtension {
         }
     }
 
-    private fun hackRN50OrHigherWaitForReady() {
-        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/main/java/com/wix/detox/espresso/UiControllerSpy.kt

@@ -11,11 +11,8 @@ class UiControllerSpy: MethodsSpy("uiController") {
     fun eventInjectionsIterator(): Iterator<CallInfo?> = historyOf("injectMotionEvent").iterator()
 
     companion object {
-        @JvmStatic
         val instance = UiControllerSpy()
 
-        @JvmStatic
-        @JvmOverloads
         fun attachThroughProxy(spy: UiControllerSpy = instance) {
             val eventsInjectorReflected = EventsInjectorReflected(getUiController())
 

package/android/detox/src/testFull/java/com/wix/detox/ActivityLaunchHelperTest.kt

@@ -0,0 +1,111 @@
+package com.wix.detox
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import org.mockito.kotlin.*
+import androidx.test.rule.ActivityTestRule
+import org.junit.runner.RunWith
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyBoolean
+import org.mockito.ArgumentMatchers.anyString
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class ActivityLaunchHelperTest {
+
+    private val initialURL = "detox://unit-test"
+    private val bundleExtraLaunchArgs = "launchArgs"
+    private val notificationPath = "path/to/notification.data"
+
+    private lateinit var intent: Intent
+    private lateinit var launchArgsAsBundle: Bundle
+    private lateinit var notificationDataAsBundle: Bundle
+    private lateinit var testRule: ActivityTestRule<Activity>
+    private lateinit var launchArgs: LaunchArgs
+    private lateinit var intentsFactory: LaunchIntentsFactory
+    private lateinit var notificationDataParser: NotificationDataParser
+
+    private fun uut() = ActivityLaunchHelper(testRule, launchArgs, intentsFactory, { notificationDataParser })
+
+    @Before
+    fun setup() {
+        intent = Intent()
+        launchArgsAsBundle = mock()
+        notificationDataAsBundle = mock()
+
+        testRule = mock()
+        launchArgs = mock() {
+            on { asIntentBundle() }.thenReturn(launchArgsAsBundle)
+        }
+        intentsFactory = mock()
+        notificationDataParser = mock() {
+            on { toBundle() }.thenReturn(notificationDataAsBundle)
+        }
+    }
+
+    @Test
+    fun `default-activity -- should launch using test rule, with a clean intent`() {
+        givenCleanLaunch()
+        uut().launchActivityUnderTest()
+        verify(testRule).launchActivity(eq(intent))
+    }
+
+    @Test
+    fun `default-activity -- should apply launch args to intent`() {
+        givenCleanLaunch()
+        uut().launchActivityUnderTest()
+        assertIntentHasLaunchArgs()
+    }
+
+    @Test
+    fun `default activity, with a url -- should launch based on the url`() {
+        givenLaunchWithInitialURL()
+        uut().launchActivityUnderTest()
+        verify(testRule).launchActivity(eq(intent))
+        verify(intentsFactory).intentWithUrl(initialURL, true)
+    }
+
+    @Test
+    fun `default activity, with a url -- should apply launch args to intent`() {
+        givenLaunchWithInitialURL()
+        uut().launchActivityUnderTest()
+        assertIntentHasLaunchArgs()
+    }
+
+    @Test
+    fun `default activity, with notification data -- should launch with the data as bundle`() {
+        givenLaunchWithNotificationData()
+        uut().launchActivityUnderTest()
+        verify(testRule).launchActivity(eq(intent))
+        verify(intentsFactory).intentWithNotificationData(any(), eq(notificationDataAsBundle), eq(true))
+    }
+
+    @Test
+    fun `default activity, with notification data -- should apply launch args to intent`() {
+        givenLaunchWithNotificationData()
+        uut().launchActivityUnderTest()
+        assertIntentHasLaunchArgs()
+    }
+
+    private fun givenCleanLaunch() {
+        whenever(intentsFactory.cleanIntent()).thenReturn(intent)
+    }
+    private fun givenLaunchWithInitialURL() {
+        whenever(launchArgs.hasUrlOverride()).thenReturn(true)
+        whenever(launchArgs.urlOverride).thenReturn(initialURL)
+        whenever(intentsFactory.intentWithUrl(anyString(), anyBoolean())).thenReturn(intent)
+    }
+    private fun givenLaunchWithNotificationData() {
+        whenever(launchArgs.hasNotificationPath()).thenReturn(true)
+        whenever(launchArgs.notificationPath).thenReturn(notificationPath)
+        whenever(intentsFactory.intentWithNotificationData(any(), any(), anyBoolean()))
+            .thenReturn(intent)
+    }
+    private fun assertIntentHasLaunchArgs() {
+        assertThat(intent.hasExtra(bundleExtraLaunchArgs)).isTrue
+        assertThat(intent.getBundleExtra(bundleExtraLaunchArgs)).isEqualTo(launchArgsAsBundle)
+    }
+}

package/android/detox/src/testFull/java/com/wix/detox/espresso/matcher/RegexMatcherTest.kt

@@ -3,10 +3,7 @@ package com.wix.detox.espresso.matcher
 import org.junit.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
 class RegexMatcherTest {
     @Test
     fun `should work with string matching regex`() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.14.3",
+  "version": "20.15.0-prerelease.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -109,5 +109,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "a7bbc444bab6fbce3d561cd110c40ba1b2b84a6b"
+  "gitHead": "d8d24e996503ce2618991d4ec6b9ae546335ad49"
 }

package/src/android/espressoapi/Detox.js

@@ -58,17 +58,6 @@ class Detox {
     };
   }
 
-  static extractInitialIntent() {
-    return {
-      target: {
-        type: "Class",
-        value: "com.wix.detox.Detox"
-      },
-      method: "extractInitialIntent",
-      args: []
-    };
-  }
-
   static getAppContext() {
     return {
       target: {

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

@@ -1 +0,0 @@
-3b1d7b9d4af2ad509d1e2986540f5208

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

@@ -1 +0,0 @@
-4e8792170dfbac074d9e5fc88548c9e85b05dd67

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

@@ -1 +0,0 @@
-57e41d5affbdcb771d08c680235f5ed17534420bfee9c6489c0baf2c4550d857

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

@@ -1 +0,0 @@
-fb2650ae7ae4e56953fcfc7579bdf99bebedeed3cc575413bf56b6251362853fe5c16f17a490d031742b16e4735f009513d93a89636f8c069f06bc34f5a2b205

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

@@ -1 +0,0 @@
-16eebdb32005b5bc0474d0426e92a7ef

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

@@ -1 +0,0 @@
-858e7440d43d7dd6155435c778dc20cddde0eac9

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

@@ -1 +0,0 @@
-be627415e355baea1337b7efd541614ba258290227b23f11b943c774fffeafa8

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

@@ -1 +0,0 @@
-e489a68066a5e07dbaed4b780e81453755e5ef9f31cb0fe1125cbf156e3ccef0a34cc00abdb84f4788a864ac9c1a4b8c1d8bef1d30ce2eaec8903758c211873c

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

@@ -1 +0,0 @@
-070f7c4048400fe1d6b1599414f5c7f1

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

@@ -1 +0,0 @@
-52ebf8f7cd97ab4d28216ce8504635be1f74b57c

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

@@ -1 +0,0 @@
-42299d1835b5db9fe3b7523d2d656a8834fff583ae82521ff69b9e050814ce3a

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

@@ -1 +0,0 @@
-aeecbc2448822395dc7d9674c0a30f5cffd9cacd8361bd55a1a4f0bb8cafe82cb812fbe1da890395cfcc65439dcb4666e119a356a054c582cb7dfe225fb9d858

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

@@ -1 +0,0 @@
-a69ee7399f34d05477dad353196d10ce

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

@@ -1 +0,0 @@
-fdd3056e3977c32501d0aba7e0b71fa9cc706384

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

@@ -1 +0,0 @@
-6ff96bda411d85d30d6075a8485e8a463c807e4673d4b038ef331bb67b31a577

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

@@ -1 +0,0 @@
-ea6781750ec935a59476e178814f6d5b0eb3f5a3559e6f19a69b86c321a21641dd49f103adcd6843b68c27f530bdbb24eb838e35e933e931c30a2e567a8c9996