detox 19.12.2 → 19.12.3

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

@@ -0,0 +1 @@
+6be640bbb26a68100ac9dc523a8968e2

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

@@ -0,0 +1 @@
+c41568eb3c834b8637495b4e5e0cb1a009c5c885

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

@@ -0,0 +1 @@
+a8679c6f6491725d8848c0544990477011148e16f58ea0df9b1e92980e59ff30

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

@@ -0,0 +1 @@
+67cb77995d9b1b38c0a56151c55265bbbc9b04efe546f6f8ce6e16af83e21c61a6825f4fc66e98880448b74f454223116dbe3856cd69ed30e19170afc73841f4

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

@@ -0,0 +1 @@
+7a6072a3ec1ebe22a490ec3fc828132e

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

@@ -0,0 +1 @@
+b7fc93850b4c5927a53b349ce098367de13fa60e

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

@@ -0,0 +1 @@
+29ef40f0881caa19b79937690b21fcc90ba182de06618854b527f81718629ca5

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

@@ -0,0 +1 @@
+6fb34a891f06385672ac7395f8e2b8b7142437e279e4486b9c6ac96663b229343c3133d0e214de2e85c4b66d7687087a06683fc311efece0d6b5072c2997d856

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

@@ -0,0 +1 @@
+2c7931e2f81f1c416737d98c54c5ec03

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

@@ -0,0 +1 @@
+ff7ab3b06537dedb033cdef008d5754ccd657085

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

@@ -0,0 +1 @@
+841142d217e137188dda87896be9a2fbc02516b9d289477f57afca3a2576dc63

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

@@ -0,0 +1 @@
+82a2c3f1ac41a8d5da57c7435f05ae23fedf75425b30125873d8f96aaba53b6c3a77ce1faff0973df8a31db16864ed8ec00480f3272489ca49d8e88e2ec7d46a

package/Detox-android/com/wix/detox/{19.12.2/detox-19.12.2.pom → 19.12.3/detox-19.12.3.pom}

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

@@ -0,0 +1 @@
+4457baf485c76fa55b2a381be247b377

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

@@ -0,0 +1 @@
+11f0a9cbc34082223f45c47b0e07add7f3a43ed2

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

@@ -0,0 +1 @@
+dee5704c35164889242458000b7044f2f900c1d98e89e6aa90d3387af883b740

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

@@ -0,0 +1 @@
+4db7b2382132ff6f4456dd2a4e22d22af57205212234003e37c4539d624f6d1dd73bb11a5f792f57eb3575a983347668c629f87804b3fd2fb3b23432df3b93ed

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>19.12.2</latest>
-    <release>19.12.2</release>
+    <latest>19.12.3</latest>
+    <release>19.12.3</release>
     <versions>
-      <version>19.12.2</version>
+      <version>19.12.3</version>
     </versions>
-    <lastUpdated>20220928134821</lastUpdated>
+    <lastUpdated>20220929163901</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-19efa387d90dcb455f8185d17f32beb1
+99f562827b42a1dfca170dd13a9d2b9d

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

@@ -1 +1 @@
-d27ba2fcef2991b4ea2325d89be7129deab3893e
+297506da369f3558785d225ec4265a457d9b75a7

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

@@ -1 +1 @@
-116c359028d06b12b1dc0dfe7900f526a40ca8911d34b78ebae55bc29c8b34fb
+12a12e3cc2f93e0a2cb3dd463224174f56d7cae8e2a7b726da43710216adfc59

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

@@ -1 +1 @@
-4a7e060d05787a0c67420b3ca6f706c328386d65498422a716869fa12ceafe6a290a7b6819af791eedcd1671cd2bef6ce70f0bf555c07ca60311272b3bf806f0
+395c54bd07efdf7b403c5f8e19a0fb2ee698fa4bf51945095c061e53797903d8fddd6f93c1e69f37e5c77b84736e769d9f64cb82705e7a57a79e791c37bc1c2f

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

@@ -1,20 +1,26 @@
 package com.wix.detox.reactnative.idlingresources
 
 class IdlingResourceDescription private constructor(
-  private val name: String,
-  private val description: Map<String, Any>) {
-    fun json(): Map<String, Any> = mutableMapOf<String, Any>("name" to name)
-      .apply { if (description.isNotEmpty()) put("description", description) }
+    private val name: String,
+    private val description: Map<String, Any>) {
 
-    override fun equals(other: Any?): Boolean = other is IdlingResourceDescription &&
-        other.json() == this.json()
+    fun json() =
+        mutableMapOf<String, Any>("name" to name)
+          .apply {
+            if (description.isNotEmpty()) put("description", description)
+          }.toMap()
 
-    data class Builder(
-      var name: String = "unknown",
-      var description: MutableMap<String, Any> = mutableMapOf()) {
+    override fun equals(other: Any?) =
+      (other is IdlingResourceDescription && other.json() == this.json())
+
+    override fun hashCode(): Int =
+      (31 * name.hashCode() + description.hashCode())
 
-        fun name(name: String) = apply { this.name = name }
-        fun addDescription(key: String, value: Any) = apply { this.description[key] = value }
-        fun build() = IdlingResourceDescription(name, description)
-    }
+    data class Builder(
+        var name: String = "unknown",
+        var description: MutableMap<String, Any> = mutableMapOf()) {
+            fun name(value: String) = apply { name = value }
+            fun addDescription(key: String, value: Any) = apply { description[key] = value }
+            fun build() = IdlingResourceDescription(name, description)
+      }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResource.java

@@ -69,42 +69,13 @@ public class NetworkIdlingResource extends DetoxBaseIdlingResource implements Ch
 
     @NotNull
     @Override
-    public IdlingResourceDescription getDescription() {
+    public synchronized IdlingResourceDescription getDescription() {
         return new IdlingResourceDescription.Builder()
                 .name("network")
                 .addDescription("urls", new ArrayList<>(busyResources))
                 .build();
     }
 
-    @Override
-    protected boolean checkIdle() {
-        boolean idle = true;
-        busyResources.clear();
-        List<Call> calls = dispatcher.runningCalls();
-        for (Call call : calls) {
-            idle = false;
-            String url = call.request().url().toString();
-            for (Pattern pattern : blacklist) {
-                if (pattern.matcher(url).matches()) {
-                    idle = true;
-                    break;
-                }
-            }
-            if (!idle) {
-                busyResources.add(call.request().url().toString());
-            }
-        }
-        if (!idle) {
-            Choreographer.getInstance().postFrameCallback(this);
-            Log.i(LOG_TAG, "Network is busy");
-        } else {
-            if (callback != null) {
-                callback.onTransitionToIdle();
-            }
-        }
-        return idle;
-    }
-
     @Override
     public void registerIdleTransitionCallback(ResourceCallback callback) {
         this.callback = callback;
@@ -116,10 +87,42 @@ public class NetworkIdlingResource extends DetoxBaseIdlingResource implements Ch
         isIdleNow();
     }
 
+    @Override
+    protected synchronized boolean checkIdle() {
+        busyResources.clear();
+
+        List<Call> calls = dispatcher.runningCalls();
+        for (Call call: calls) {
+            final String url = call.request().url().toString();
+
+            if (!isUrlBlacklisted(url)) {
+                busyResources.add(url);
+            }
+        }
+
+        if (!busyResources.isEmpty()) {
+            Log.i(LOG_TAG, "Network is busy, with " + busyResources.size() + " in-flight calls");
+            Choreographer.getInstance().postFrameCallback(this);
+            return false;
+        }
+
+        notifyIdle();
+        return true;
+    }
+
     @Override
     protected void notifyIdle() {
         if (callback != null) {
             callback.onTransitionToIdle();
         }
     }
+
+    private boolean isUrlBlacklisted(String url) {
+        for (Pattern pattern: blacklist) {
+            if (pattern.matcher(url).matches()) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResourcesTest.kt

@@ -0,0 +1,61 @@
+package com.wix.detox.reactnative.idlingresources
+
+import com.wix.detox.UTHelpers.yieldToOtherThreads
+import org.assertj.core.api.Assertions.assertThat
+
+import okhttp3.Dispatcher
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import java.util.concurrent.Executors
+
+@RunWith(RobolectricTestRunner::class)
+class NetworkIdlingResourcesTest {
+    lateinit var dispatcher: Dispatcher
+    lateinit var uut: NetworkIdlingResource
+
+    @Before
+    fun setup() {
+        dispatcher = Dispatcher()
+        uut = NetworkIdlingResource(dispatcher)
+    }
+
+    // Note: Ideally, we should test that the list of busy resources is protected,
+    // rather than testing thread-safety as a whole.
+    @Test
+    fun `should return the description in a thread-safe way`() {
+        val localExecutor = Executors.newSingleThreadExecutor()
+        var description: IdlingResourceDescription? = null
+
+        synchronized(uut) {
+            localExecutor.submit {
+                description = uut.getDescription()
+            }
+
+            yieldToOtherThreads(localExecutor)
+            assertThat(description).isNull()
+        }
+        yieldToOtherThreads(localExecutor)
+        assertThat(description).isNotNull()
+    }
+
+    // Note: Ideally, we should test that the list of busy resources is protected,
+    // rather than testing thread-safety as a whole.
+    @Test
+    fun `should check for idle in a thread-safe way`() {
+        val localExecutor = Executors.newSingleThreadExecutor()
+        var idle = false
+
+        synchronized(uut) {
+            localExecutor.submit {
+                idle = uut.isIdleNow
+            }
+
+            yieldToOtherThreads(localExecutor)
+            assertThat(idle).isFalse
+        }
+        yieldToOtherThreads(localExecutor)
+        assertThat(idle).isTrue
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "19.12.2",
+  "version": "19.12.3",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -177,5 +177,5 @@
       }
     }
   },
-  "gitHead": "6f4bf5c666865e71a7a83937482f065661ec467e"
+  "gitHead": "23bf330e395a488a6d7334db29a0fe289ce302f6"
 }

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

@@ -1 +0,0 @@
-0cb8fdd5ed1ab73354fe86d5930f61de

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

@@ -1 +0,0 @@
-0ed1af9ededffc5d54fdd1a8054109e21216f35c

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

@@ -1 +0,0 @@
-0d6a20ace6f9dd16b2d0d529294fec49be91e4152ed51e584f6abec5263e2b6d

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

@@ -1 +0,0 @@
-b35ebf75afc6f2920b039dd97077396f441804419993cfcc89d1e7562a0db8fd8fe5fd8ca9301ace3c86d40383e4cb107cbb3de2b4ba1a63eff69e002978bfa2

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

@@ -1 +0,0 @@
-6283c6c8d9518224cdfe63c320a1d4b4

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

@@ -1 +0,0 @@
-9bf84803ea961f48c9fdb9ba84ee58e73cdb92d5

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

@@ -1 +0,0 @@
-e1a04bed2c690093f9c9a48489ff6cd960e467fa5381a7a4f03e48c1235a966e

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

@@ -1 +0,0 @@
-fea293ce8eb983f617e9a97324126a8975dd4d670cc67ef85bd6bcfe410afe0d6103b120181076dc4998631f494a4391a0d60fa5f220de34edad36008593676d

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

@@ -1 +0,0 @@
-8089fbd8f7caa919cdbedfc086a2c66d

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

@@ -1 +0,0 @@
-e8bfe347b39f22bb020b39bb622c76c5c3f0015d

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

@@ -1 +0,0 @@
-494862f977fb6769223ef896d51577e87c26a08e37afb6904a228fff4fb5021f

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

@@ -1 +0,0 @@
-a4cf7f4166dbc0230d682218ff3efbd59551ec57da51bb94aafe12a2e33443440401a63a697af13a55dabab6a66dbe4d1c0d4778c0ffcbcaca6e2062ffacfe97

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

@@ -1 +0,0 @@
-55dcfffe204d0994e193c4250359236f

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

@@ -1 +0,0 @@
-d3e83bdf179e7ea0b65059bfd19f8acaf46f1ca5

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

@@ -1 +0,0 @@
-5c4157413276e6bc253fa185147b3ad2c07aef9fccd4d93c780cc5f8805dea0e

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

@@ -1 +0,0 @@
-7b0886cc17b871ec35cc1f48d2ed9ccadbd2c25ed00308a7bc8bc56ba23e29649e4a4296bf637609ae2afe83200f2908124fe8734c4465d864853d2e526f7320