detox 20.1.0-next-is-hittable-check.0 → 20.1.1

package/.eslintrc.js

@@ -17,7 +17,7 @@ module.exports = {
     node: true
   },
   globals: {
-    'callCli': true,
+    // TODO: remove use of fail() across the project because Jest Circus doesn't support it
     'fail': true
   },
   rules: {
@@ -54,12 +54,7 @@ module.exports = {
       }
     ],
     'no-prototype-builtins': 'off',
-    'no-unused-vars': [
-      'error',
-      {
-        'argsIgnorePattern': '^_'
-      }
-    ],
+    'no-unused-vars': 'off',
     'node/no-unpublished-require': 'warn',
     'object-curly-spacing': [
       'error',

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

@@ -0,0 +1 @@
+3533d80394c8bfe48da303ca68dd1f89

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

@@ -0,0 +1 @@
+4113dbb267c11ac42088bc269e86cde5bc6db556

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

@@ -0,0 +1 @@
+13c9c7d4904c88e394d57285cad46a9ceeb93e89341c6cc8b2367fcf89f05a1c

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

@@ -0,0 +1 @@
+1bba8a54331fb99a135bb5fa6230c06ac1eeee49a1c82457ab4a93d556dabecb82562fc4ed28890a2482aa23bb2abd29c5f1c7a67053161a2d45c6258493021d

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

@@ -0,0 +1 @@
+4457ab21cced7cb4abc14a3a1bfd382e

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

@@ -0,0 +1 @@
+06d2b66f9a4f83667da69bc232a41d9a9be65dae

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

@@ -0,0 +1 @@
+8c600ab5f63651b72eb24f709a3cd1c4a854b7aeb698edf3df4ee4ba8b62faef

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

@@ -0,0 +1 @@
+475b2e2805f4056469824ab7c0ba5ac1f149eea95d4a19f19e49d448151644db5d813d627f230a95d26f23e727c8c54205ab8da7e6c8e99f8284d6e4b11c8642

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

@@ -0,0 +1 @@
+c7eb63b23e9fec3154e5402cc0f65283

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

@@ -0,0 +1 @@
+16bed62cec4774262c71a7daad13efcdac3c7942

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

@@ -0,0 +1 @@
+c12164b0a26a6db45c65d984af4c2a880e2bf5d516ceb582361576eff713e378

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

@@ -0,0 +1 @@
+d50db96253552903c6acf2328ff2baa9788aac5846622bc01c4c9e6026738991f6eea1ea2723afe21ffdec692a3caeadb39b6ac5cfb31bf40c7d184e058701bb

package/Detox-android/com/wix/detox/{20.1.0-next-is-hittable-check.0/detox-20.1.0-next-is-hittable-check.0.pom → 20.1.1/detox-20.1.1.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.1.0-next-is-hittable-check.0</version>
+  <version>20.1.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.1.1/detox-20.1.1.pom.md5

@@ -0,0 +1 @@
+206c05d36b87423370c11d774d657d2c

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

@@ -0,0 +1 @@
+7d21c64abcb385dc4abad4710aa28a07bc0a0139

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

@@ -0,0 +1 @@
+621bb24a95f5b035a6a3aa83f7a8539f65b8bef7dad040decef5baf855989303

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

@@ -0,0 +1 @@
+8501704d10d93054cc9707fac37e85433003e6922dbc35e44011bf43660c402871c2fd830c6ad699e7ac455dbf780650ab34726c8548b9e495dcfbadb6b470a2

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.1.0-next-is-hittable-check.0</latest>
-    <release>20.1.0-next-is-hittable-check.0</release>
+    <latest>20.1.1</latest>
+    <release>20.1.1</release>
     <versions>
-      <version>20.1.0-next-is-hittable-check.0</version>
+      <version>20.1.1</version>
     </versions>
-    <lastUpdated>20221027091848</lastUpdated>
+    <lastUpdated>20221228155305</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-6abc81d3b72724caa7b05b479ec9cda4
+34496b51530e21c8da62be3f7ae4ea68

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

@@ -1 +1 @@
-e5c15d3ad5f2372b8c9131eb4f9c431c34b534d6
+c9ac4db5ef1c06124081c598f688aad051cf8ac1

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

@@ -1 +1 @@
-2bef8053b1c66b74321c2f2cc0c6f74bf2d3af4205804b5bab79e8417fc6d186
+800f040e828f15c49d2189d6c80f99c3433ceabb063f87413b60eaeb17e5a48d

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

@@ -1 +1 @@
-347e4a189b393cf31f1b553b141f05e398c686487df11b8ba665395f05065aca3f9c87068c2b9c0dc078c3e09ca0dd7163144de81ae4031c199011a55cec03a1
+696664270a4a6893fdb1193f79851a049a08294a5f16c0696ecc40999543eff16367c6bd1aebad62305820ecf447056a620fc65f45aa4aca6f33914cb78680b4

package/android/build.gradle

@@ -37,7 +37,6 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
-        jcenter()
         maven {
             url "$projectDir/../../node_modules/react-native/android"
         }

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

@@ -5,16 +5,16 @@ import android.util.Log
 import androidx.test.espresso.Espresso
 import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
 import com.wix.detox.espresso.UiAutomatorHelper
-import com.wix.detox.espresso.registry.IRStatusInquirer
+import com.wix.detox.espresso.registry.BusyResourcesInquirer
 import com.wix.detox.reactnative.ReactNativeExtension
 
 class TestEngineFacade {
-    fun awaitIdle(): Unit? = Espresso.onIdle() {
+    fun awaitIdle(): Unit? = Espresso.onIdle {
         Log.i(LOG_TAG, "Wait is over: App is now idle!")
         null
     }
     fun syncIdle() = UiAutomatorHelper.espressoSync() // TODO Check whether this can be replaced with #awaitIdle()
-    fun getBusyIdlingResources() = IRStatusInquirer.INSTANCE.getAllBusyResources()
+    fun getAllBusyResources() = BusyResourcesInquirer.INSTANCE.getAllBusyResources()
 
     // TODO Refactor RN related stuff away
     fun reloadReactNative(appContext: Context) = ReactNativeExtension.reloadReactNative(appContext)

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

@@ -1,96 +1,28 @@
 package com.wix.detox.adapters.server
 
-import androidx.test.espresso.IdlingResource
 import com.wix.detox.TestEngineFacade
-import com.wix.detox.reactnative.idlingresources.DescriptiveIdlingResource
+import com.wix.detox.inquiry.DetoxBusyResource
 
 class QueryStatusActionHandler(
     private val outboundServerAdapter: OutboundServerAdapter,
     private val testEngineFacade: TestEngineFacade
-)
-    : DetoxActionHandler {
+) : DetoxActionHandler {
 
     override fun handle(params: String, messageId: Long) {
-        val data = mutableMapOf<String, Any?>()
-        data["status"] = formatStatus(testEngineFacade.getBusyIdlingResources())
-
+        val busyResources = testEngineFacade.getAllBusyResources()
+        val data = mapOf<String, Any?>(
+            "status" to formatStatus(busyResources)
+        )
         outboundServerAdapter.sendMessage("currentStatusResult", data, messageId)
     }
 
-    private fun formatStatus(busyResources: List<IdlingResource>): Map<String, Any> {
+    private fun formatStatus(busyResources: List<DetoxBusyResource>): Map<String, Any> =
         if (busyResources.isEmpty()) {
-            return mapOf("app_status" to "idle")
-        }
-
-        val status = mutableMapOf<String, Any>()
-        status["app_status"] = "busy"
-        status["busy_resources"] = busyResources.map{ formatResource(it) }
-
-        return status
-    }
-
-    private fun formatResource(resource: IdlingResource): Map<String, Any> {
-        if (resource is DescriptiveIdlingResource) {
-            return resource.getDescription().json()
-        }
-
-        if (resource.javaClass.name.contains("LooperIdlingResource")) {
-            return formatLooperResourceFromName(resource.name)
-        }
-
-        return mapOf<String, Any>(
-            "name" to "unknown",
-            "description" to mapOf<String, Any>(
-                "identifier" to resource.name
+            mapOf("app_status" to "idle")
+        } else {
+            mapOf(
+                "app_status" to "busy",
+                "busy_resources" to busyResources.map { it.getDescription().json() }
             )
-        )
-    }
-
-    private fun formatLooperResourceFromName(resourceName: String): Map<String, Any> {
-        return when {
-            isJSCodeExecution(resourceName) -> {
-                formatLooperResource(
-                    "\"${resourceName}\" (JS Thread)",
-                    "JavaScript code"
-                )
-            }
-            isNativeCodeExecution(resourceName) -> {
-                formatLooperResource(
-                    "\"${resourceName}\" (Native Modules Thread)",
-                    "native module calls"
-                )
-            }
-            else -> {
-                formatLooperResource(
-                    "\"${resourceName}\""
-                )
-            }
         }
-    }
-
-    /**
-     * @see URL https://reactnative.dev/docs/profiling
-     */
-    private fun isJSCodeExecution(looperName: String): Boolean {
-        return looperName.contains("mqt_js")
-    }
-
-    private fun formatLooperResource(thread: String, executionType: String? = null): Map<String, Any> {
-        return mapOf<String, Any>(
-            "name" to "looper",
-            "description" to
-                    mutableMapOf<String, Any>(
-                        "thread" to thread
-                    ).apply {
-                        if (executionType != null) put("execution_type", executionType)
-                    }
-        )
-    }
-
-    /**
-     * @see URL https://reactnative.dev/docs/profiling
-     */
-    private fun isNativeCodeExecution(looperName: String): Boolean {
-        return looperName.contains("mqt_native")
-    }
 }

package/android/detox/src/full/java/com/wix/detox/espresso/common/UiControllerImplReflected.kt

@@ -0,0 +1,16 @@
+package com.wix.detox.espresso.common
+
+import com.wix.detox.espresso.action.common.utils.getUiController
+import org.joor.Reflect
+
+private const val FIELD_ASYNC_IDLE = "asyncIdle"
+private const val FIELD_COMPAT_IDLE = "compatIdle"
+private const val METHOD_IS_IDLE_NOW = "isIdleNow"
+
+class UiControllerImplReflected {
+    fun isAsyncIdleNow(): Boolean =
+        Reflect.on(getUiController()).field(FIELD_ASYNC_IDLE).call(METHOD_IS_IDLE_NOW).get()
+
+    fun isCompatIdleNow(): Boolean =
+        Reflect.on(getUiController()).field(FIELD_COMPAT_IDLE).call(METHOD_IS_IDLE_NOW).get()
+}

package/android/detox/src/full/java/com/wix/detox/espresso/idlingresources/DescriptiveIdlingResource.kt

@@ -0,0 +1,8 @@
+package com.wix.detox.espresso.idlingresources
+
+import androidx.test.espresso.IdlingResource
+
+interface DescriptiveIdlingResource: IdlingResource {
+    fun getDebugName(): String
+    fun getBusyHint(): Map<String, Any>?
+}

package/android/detox/src/full/java/com/wix/detox/espresso/registry/BusyResourcesInquirer.kt

@@ -0,0 +1,48 @@
+package com.wix.detox.espresso.registry
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.base.IdlingResourceRegistry
+import com.wix.detox.common.UIThread
+import com.wix.detox.espresso.common.UiControllerImplReflected
+import com.wix.detox.inquiry.DetoxBusyResource
+import com.wix.detox.inquiry.DetoxBusyResource.BusyAsyncTasks
+import com.wix.detox.inquiry.DetoxBusyResource.BusyIdlingResource
+import org.joor.Reflect
+import java.util.concurrent.Callable
+
+// TODO Better to split inquiry to two separate classes running under the single `UIThread.postFirstSync()` we have here.
+class BusyResourcesInquirer(
+    private val registry: IdlingResourceRegistry,
+    private val uiControllerImplReflected: UiControllerImplReflected
+) {
+    fun getAllBusyResources(): List<DetoxBusyResource> {
+        return UIThread.postFirstSync(Callable<List<DetoxBusyResource>> {
+            mutableListOf<DetoxBusyResource>().apply {
+                addAll(getBusyIdlingResources())
+                addAll(getAsyncTasksResource()?.let { listOf(it) } ?: emptyList())
+            }
+        })
+    }
+
+    private fun getBusyIdlingResources(): List<BusyIdlingResource> =
+        registry.resources
+            .filter { !it.isIdleNow }
+            .map { BusyIdlingResource(it) }
+
+    private fun getAsyncTasksResource(): BusyAsyncTasks? {
+        // Mind the implicit optimization:
+        // Don't inspect both resources if not necessary (async-tasks is not idle).
+        if (uiControllerImplReflected.isAsyncIdleNow() &&
+            uiControllerImplReflected.isCompatIdleNow()) {
+            return null
+        }
+        return BusyAsyncTasks
+    }
+
+    companion object {
+        val INSTANCE = BusyResourcesInquirer(getRegistryDefault(), UiControllerImplReflected())
+    }
+}
+
+private fun getRegistryDefault() =
+    Reflect.on(Espresso::class.java).get<IdlingResourceRegistry>("baseRegistry")

package/android/detox/src/full/java/com/wix/detox/inquiry/DetoxBusyResource.kt

@@ -0,0 +1,92 @@
+package com.wix.detox.inquiry
+
+import androidx.test.espresso.IdlingResource
+import com.wix.detox.espresso.idlingresources.DescriptiveIdlingResource
+
+sealed class DetoxBusyResource {
+    abstract fun getDescription(): DetoxBusyResourceDescription
+
+    class BusyIdlingResource(val resource: IdlingResource): DetoxBusyResource() {
+        override fun getDescription() =
+            when {
+                (resource is DescriptiveIdlingResource) ->
+                    getIRDescription(resource)
+
+                (resource.javaClass.name.contains("LooperIdlingResource")) ->
+                    getLooperResourceDescriptionByName(resource.name)
+
+                else ->
+                    getUnspecifiedResourceDescription(resource)
+            }
+
+        private fun getIRDescription(resource: DescriptiveIdlingResource) =
+            DetoxBusyResourceDescription.Builder()
+                .name(resource.getDebugName())
+                .apply {
+                    resource.getBusyHint()?.let {
+                        it.forEach { hint -> addDescription(hint.key, hint.value) }
+                    }
+                }
+                .build()
+
+        private fun getLooperResourceDescriptionByName(resourceName: String) =
+            when {
+                isJSCodeExecution(resourceName) -> {
+                    getLooperResourceDesc(
+                        thread = "\"${resourceName}\" (JS Thread)",
+                        executionType = "JavaScript code"
+                    )
+                }
+                isNativeCodeExecution(resourceName) -> {
+                    getLooperResourceDesc(
+                        thread = "\"${resourceName}\" (Native Modules Thread)",
+                        executionType = "native module calls"
+                    )
+                }
+                else -> {
+                    getLooperResourceDesc(
+                        thread = "\"${resourceName}\""
+                    )
+                }
+            }
+
+        private fun getUnspecifiedResourceDescription(resource: IdlingResource) =
+            DetoxBusyResourceDescription.Builder()
+                .name("unknown")
+                .addDescription("identifier", resource.name)
+                .build()
+
+        /**
+         * @see URL https://reactnative.dev/docs/profiling
+         */
+        private fun isJSCodeExecution(looperName: String): Boolean {
+            return looperName.contains("mqt_js")
+        }
+
+        private fun getLooperResourceDesc(thread: String, executionType: String? = null) =
+            DetoxBusyResourceDescription.Builder()
+                .name("looper")
+                .addDescription("thread", thread)
+                .apply {
+                    executionType?.let { addDescription("execution_type", executionType) }
+                }
+                .build()
+
+        /**
+         * @see URL https://reactnative.dev/docs/profiling
+         */
+        private fun isNativeCodeExecution(looperName: String): Boolean {
+            return looperName.contains("mqt_native")
+        }
+
+    }
+
+    object BusyAsyncTasks: DetoxBusyResource() {
+        override fun getDescription() =
+            DetoxBusyResourceDescription.Builder()
+                .name("bg")
+                .addDescription("reason", "native async-tasks")
+                .build()
+
+    }
+}

package/android/detox/src/full/java/com/wix/detox/{reactnative/idlingresources/IdlingResourceDescription.kt → inquiry/DetoxBusyResourceDescription.kt}

@@ -1,17 +1,17 @@
-package com.wix.detox.reactnative.idlingresources
+package com.wix.detox.inquiry
 
-class IdlingResourceDescription private constructor(
+class DetoxBusyResourceDescription private constructor(
     private val name: String,
     private val description: Map<String, Any>) {
 
-    fun json() =
+    fun json(): Map<String, Any> =
         mutableMapOf<String, Any>("name" to name)
           .apply {
             if (description.isNotEmpty()) put("description", description)
-          }.toMap()
+          }
 
     override fun equals(other: Any?) =
-      (other is IdlingResourceDescription && other.json() == this.json())
+      (other is DetoxBusyResourceDescription && other.json() == this.json())
 
     override fun hashCode(): Int =
       (31 * name.hashCode() + description.hashCode())
@@ -21,6 +21,6 @@ class IdlingResourceDescription private constructor(
         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)
+            fun build() = DetoxBusyResourceDescription(name, description)
       }
 }

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

@@ -3,13 +3,17 @@ package com.wix.detox.reactnative.idlingresources;
 import android.util.Log;
 import android.view.Choreographer;
 
+import com.wix.detox.espresso.idlingresources.DescriptiveIdlingResource;
 import com.wix.detox.reactnative.ReactNativeInfo;
 
-import org.jetbrains.annotations.NotNull;
 import org.joor.Reflect;
 import org.joor.ReflectException;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Created by simonracz on 25/08/2017.
@@ -51,6 +55,10 @@ public class AnimatedModuleIdlingResource implements DescriptiveIdlingResource,
 
     private final static String METHOD_HAS_ACTIVE_ANIMATIONS = "hasActiveAnimations";
 
+    private final static Map<String, Object> busyHint = new HashMap<String, Object>() {{
+        put("reason", "Animations running on screen");
+    }};
+
     private ResourceCallback callback = null;
     private Object reactContext = null;
 
@@ -63,13 +71,16 @@ public class AnimatedModuleIdlingResource implements DescriptiveIdlingResource,
         return AnimatedModuleIdlingResource.class.getName();
     }
 
-    @NotNull
+    @NonNull
+    @Override
+    public String getDebugName() {
+        return "ui";
+    }
+
+    @Nullable
     @Override
-    public IdlingResourceDescription getDescription() {
-        return new IdlingResourceDescription.Builder()
-                .name("ui")
-                .addDescription("reason", "Animations running on screen")
-                .build();
+    public Map<String, Object> getBusyHint() {
+        return busyHint;
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import android.util.Log
 import androidx.test.espresso.IdlingResource
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactContext
+import com.wix.detox.espresso.idlingresources.DescriptiveIdlingResource
 import com.wix.detox.reactnative.helpers.RNHelpers
 import org.joor.Reflect
 import java.util.concurrent.Executor
@@ -50,10 +51,8 @@ open class AsyncStorageIdlingResource
     }
 
     override fun getName(): String = javaClass.name
-
-    override fun getDescription(): IdlingResourceDescription {
-        return IdlingResourceDescription.Builder().name("io").build()
-    }
+    override fun getDebugName() = "io"
+    override fun getBusyHint(): Map<String, Any>? = null
 
     override fun isIdleNow(): Boolean =
         checkIdle().also { idle ->

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

@@ -5,12 +5,12 @@ import android.util.Log;
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
 import com.facebook.react.bridge.ReactContext;
 
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * Created by simonracz on 01/06/2017.
  */
@@ -42,10 +42,16 @@ public class BridgeIdlingResource extends DetoxBaseIdlingResource implements Not
         return BridgeIdlingResource.class.getName();
     }
 
-    @NotNull
+    @NonNull
+    @Override
+    public String getDebugName() {
+        return "bridge";
+    }
+
+    @Nullable
     @Override
-    public IdlingResourceDescription getDescription() {
-        return new IdlingResourceDescription.Builder().name("bridge").build();
+    public Map<String, Object> getBusyHint() {
+        return null;
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package com.wix.detox.reactnative.idlingresources;
 
+import com.wix.detox.espresso.idlingresources.DescriptiveIdlingResource;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class DetoxBaseIdlingResource implements DescriptiveIdlingResource {

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

@@ -5,16 +5,17 @@ import android.view.Choreographer;
 
 import com.facebook.react.bridge.ReactContext;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import okhttp3.Call;
 import okhttp3.Dispatcher;
 
@@ -67,13 +68,18 @@ public class NetworkIdlingResource extends DetoxBaseIdlingResource implements Ch
         return NetworkIdlingResource.class.getName();
     }
 
-    @NotNull
+    @NonNull
+    @Override
+    public String getDebugName() {
+        return "network";
+    }
+
+    @Nullable
     @Override
-    public synchronized IdlingResourceDescription getDescription() {
-        return new IdlingResourceDescription.Builder()
-                .name("network")
-                .addDescription("urls", new ArrayList<>(busyResources))
-                .build();
+    public synchronized Map<String, Object> getBusyHint() {
+        return new HashMap<String, Object>() {{
+            put("urls", new ArrayList<>(busyResources));
+        }};
     }
 
     @Override