detox 21.0.0-breaking.new-global-lifecycle.0 → 21.0.1-rc.0

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

@@ -1,43 +1,23 @@
+
 package com.wix.detox.reactnative.idlingresources.timers
 
-import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactContext
-import com.wix.detox.common.RNDropSupportTodo
-import com.wix.detox.reactnative.helpers.RNHelpers
-import org.joor.Reflect
+import com.facebook.react.modules.core.TimingModule
 
 private const val BUSY_WINDOW_THRESHOLD = 1500L
 
-private class RN62TimingModuleReflected(private val timingModule: NativeModule) {
-    fun hasActiveTimers(): Boolean = Reflect.on(timingModule).call("hasActiveTimersInRange", BUSY_WINDOW_THRESHOLD).get()
-}
-
 /**
  * Delegates the interrogation to the native module itself, added
  * [here](https://github.com/facebook/react-native/pull/27539) in the context
  * of RN v0.62 (followed by a previous refactor and rename of the class).
  */
-@RNDropSupportTodo(62, """
-    When min RN version supported by Detox is 0.62.x (or higher), can (and
-    should) remove any usage of reflection here.
-    That includes the unit test's stub being used for that reason in particular.
-    """)
-class DelegatedIdleInterrogationStrategy(timingModule: NativeModule): IdleInterrogationStrategy {
-    private val timingModuleReflected = RN62TimingModuleReflected(timingModule)
-
-    override fun isIdleNow(): Boolean = !timingModuleReflected.hasActiveTimers()
+class DelegatedIdleInterrogationStrategy(private val timingModule: TimingModule): IdleInterrogationStrategy {
+    override fun isIdleNow(): Boolean = !timingModule.hasActiveTimersInRange(BUSY_WINDOW_THRESHOLD)
 
     companion object {
-        fun createIfSupported(reactContext: ReactContext): DelegatedIdleInterrogationStrategy? {
-            val module = RNHelpers.getNativeModule(reactContext, "com.facebook.react.modules.core.TimingModule")
-                    ?: return null
-
-            return try {
-                module.javaClass.getDeclaredMethod("hasActiveTimersInRange", Long::class.java)
-                DelegatedIdleInterrogationStrategy(module)
-            } catch (ex: Exception) {
-                null
-            }
+        fun create(reactContext: ReactContext): DelegatedIdleInterrogationStrategy {
+            val timingModule = reactContext.getNativeModule(TimingModule::class.java)!!
+            return DelegatedIdleInterrogationStrategy(timingModule)
         }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.wix.detox.reactnative.idlingresources.timers
 
-import android.util.Log
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.common.UIThread
 import java.util.concurrent.Callable
@@ -13,14 +12,5 @@ fun getInterrogationStrategy(reactContext: ReactContext): IdleInterrogationStrat
     // Getting a native-module (inside) also initializes it if needed. That has to run on a
     // looper thread, and the easiest to make sure that happens is to use the main thread.
     UIThread.runSync(Callable {
-        DelegatedIdleInterrogationStrategy.createIfSupported(reactContext)?.let {
-            return@Callable it
-        }
-
-        DefaultIdleInterrogationStrategy.createIfSupported(reactContext)?.let {
-            return@Callable it
-        }
-
-        Log.e(TimersIdlingResource.LOG_TAG, "Failed to determine proper implementation-strategy for timers idling resource")
-        null
+        return@Callable DelegatedIdleInterrogationStrategy.create(reactContext)
     })

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

@@ -2,9 +2,7 @@ package com.wix.detox.reactnative.idlingresources.timers
 
 import android.view.Choreographer
 import androidx.test.espresso.IdlingResource
-
 import com.wix.detox.reactnative.idlingresources.DetoxBaseIdlingResource
-import com.wix.detox.reactnative.idlingresources.IdlingResourceDescription
 
 class TimersIdlingResource @JvmOverloads constructor(
         private val interrogationStrategy: IdleInterrogationStrategy,
@@ -14,10 +12,8 @@ class TimersIdlingResource @JvmOverloads constructor(
     private var callback: IdlingResource.ResourceCallback? = null
 
     override fun getName(): String = this.javaClass.name
-
-    override fun getDescription(): IdlingResourceDescription {
-        return IdlingResourceDescription.Builder().name("timers").build();
-    }
+    override fun getDebugName(): String = "timers"
+    override fun getBusyHint(): Map<String, Any>? = null
 
     override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
         this.callback = callback

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

@@ -2,6 +2,7 @@ package com.wix.detox.reactnative.idlingresources.uimodule
 
 import android.util.Log
 import android.view.View
+import com.facebook.react.uimanager.IllegalViewOperationException
 import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
 import com.wix.detox.reactnative.ReactNativeInfo
 import java.lang.ref.WeakReference
@@ -19,9 +20,7 @@ class RN66Workaround {
     fun isScarceUISwitchCommandStuckInQueue(uiManagerModuleReflected: UIManagerModuleReflected): Boolean {
         var isStuckSwitchOperation = false
 
-        val rnVersion = ReactNativeInfo.rnVersion()
-
-        if (rnVersion.minor >= 66 && uiManagerModuleReflected.getUIOpsCount() >= 1) {
+        if (isRelevantRNVersion() && uiManagerModuleReflected.getUIOpsCount() >= 1) {
             val nextUIOperation = uiManagerModuleReflected.getNextUIOpReflected()
             val view = getUIOpView(uiManagerModuleReflected, nextUIOperation)
             val isReactSwitch = isReactSwitch(view)
@@ -46,10 +45,20 @@ class RN66Workaround {
         return isStuckSwitchOperation
     }
 
+    private fun isRelevantRNVersion(): Boolean {
+        val rnVersion = ReactNativeInfo.rnVersion()
+        return rnVersion.minor == 66 || (rnVersion.minor == 67 && rnVersion.patch < 4)
+    }
+
     private fun getUIOpView(uiManagerModuleReflected: UIManagerModuleReflected, uiOperation: DispatchCommandOperationReflected?): View? {
         val nativeViewHierarchyManager = uiManagerModuleReflected.nativeViewHierarchyManager() ?: return null
         val tag = uiOperation?.tag ?: return null
-        return nativeViewHierarchyManager.getViewClass(tag)
+        return try {
+            nativeViewHierarchyManager.getViewClass(tag)
+        } catch(e: IllegalViewOperationException) {
+            Log.e(LOG_TAG, "failed to get view from tag ", e.cause)
+            null
+        }
     }
 
     private fun isReactSwitch(view: View?) = try {

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

@@ -9,12 +9,12 @@ import org.joor.Reflect
 private const val CLASS_UI_MANAGER_MODULE = "com.facebook.react.uimanager.UIManagerModule"
 private const val METHOD_GET_NATIVE_MODULE = "getNativeModule"
 private const val METHOD_GET_UI_IMPLEMENTATION = "getUIImplementation"
+private const val METHOD_IS_EMPTY = "isEmpty"
 private const val FIELD_UI_OPERATION_QUEUE = "mOperationsQueue"
 private const val FIELD_DISPATCH_RUNNABLES = "mDispatchUIRunnables"
 private const val FIELD_DISPATCH_RUNNABLES_LOCK = "mDispatchRunnablesLock"
 private const val FIELD_NON_BATCHED_OPS = "mNonBatchedOperations"
 private const val FIELD_NON_BATCHED_OPS_LOCK = "mNonBatchedOperationsLock"
-private const val METHOD_IS_EMPTY = "isEmpty"
 
 class UIManagerModuleReflected(private val reactContext: ReactContext) {
 

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

@@ -6,7 +6,6 @@ import androidx.test.espresso.IdlingResource.ResourceCallback
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.reactnative.helpers.RNHelpers
 import com.wix.detox.reactnative.idlingresources.DetoxBaseIdlingResource
-import com.wix.detox.reactnative.idlingresources.IdlingResourceDescription
 import org.joor.ReflectException
 
 /**
@@ -21,11 +20,10 @@ class UIModuleIdlingResource(private val reactContext: ReactContext)
     private var callback: ResourceCallback? = null
 
     override fun getName(): String = UIModuleIdlingResource::class.java.name
-    override fun getDescription() =
-            IdlingResourceDescription.Builder()
-                .name("ui")
-                .addDescription("reason", "UI rendering activity")
-                .build()
+    override fun getDebugName(): String = " ui"
+    override fun getBusyHint(): Map<String, Any> {
+        return mapOf("reason" to "UI rendering activity")
+    }
 
     override fun checkIdle(): Boolean {
         try {

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

@@ -0,0 +1,37 @@
+package com.wix.detox.reactnative.ui
+
+import android.view.View
+import android.widget.TextView
+import com.wix.detox.common.traverseViewHierarchy
+import com.wix.detox.reactnative.utils.isReactNativeObject
+
+fun View.getAccessibilityLabel(
+    isReactNativeObjectFn: (Any) -> Boolean = { isReactNativeObject(it) }
+): CharSequence? =
+    if (isReactNativeObjectFn(this)) {
+        val subLabels = collectAccessibilityLabelsFromHierarchy(this)
+        if (subLabels.isEmpty()) null else subLabels.joinToString(" ")
+    } else {
+        getRawAccessibilityLabel(this)
+    }
+
+private fun collectAccessibilityLabelsFromHierarchy(
+    rootView: View,
+    subLabels: MutableList<CharSequence> = mutableListOf(),
+): List<CharSequence> {
+    traverseViewHierarchy(rootView) { view ->
+        getRawAccessibilityLabel(view)?.let { rawLabel ->
+            subLabels.add(rawLabel)
+            false
+        } ?: true
+
+    }
+    return subLabels
+}
+
+private fun getRawAccessibilityLabel(view: View): CharSequence? =
+    if (view.contentDescription != null) {
+        view.contentDescription
+    } else if (view is TextView) {
+        view.text
+    } else null

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

@@ -0,0 +1,6 @@
+package com.wix.detox.reactnative.utils
+
+private const val REACT_NATIVE_PACKAGE = "com.facebook.react"
+
+fun isReactNativeObject(obj: Any): Boolean =
+    obj.javaClass.canonicalName?.startsWith(REACT_NATIVE_PACKAGE) == true

package/android/detox/src/main/java/com/wix/detox/common/DetoxErrors.java

@@ -5,7 +5,6 @@ public interface DetoxErrors {
         public DetoxRuntimeException(Throwable cause) {
             super(cause);
         }
-
         public DetoxRuntimeException(String message) {
             super(message);
         }
@@ -31,5 +30,9 @@ public interface DetoxErrors {
         public DetoxIllegalArgumentException(String message) {
             super(message);
         }
+
+        public DetoxIllegalArgumentException(Throwable cause) {
+            super(cause);
+        }
     }
 }

package/android/detox/src/main/java/com/wix/detox/common/TextFileReader.kt

@@ -3,5 +3,5 @@ package com.wix.detox.common
 import java.io.File
 
 internal class TextFileReader(private val fileName: String) {
-    fun read() = File(fileName).inputStream().readBytes().toString(Charsets.UTF_8)
+    fun read() = File(fileName).readText(Charsets.UTF_8)
 }

package/android/detox/src/main/java/com/wix/detox/espresso/UiControllerSpy.kt

@@ -1,10 +1,11 @@
+
 package com.wix.detox.espresso
 
 import androidx.test.espresso.UiController
 import com.wix.detox.common.proxy.CallInfo
 import com.wix.detox.common.proxy.SpyingInvocationHandler
 import com.wix.detox.common.proxy.MethodsSpy
-import com.wix.detox.espresso.common.utils.getUiController
+import com.wix.detox.espresso.action.common.utils.getUiController
 import org.joor.Reflect
 
 class UiControllerSpy: MethodsSpy("uiController") {

package/android/detox/src/main/java/com/wix/detox/espresso/action/common/ReflectUtils.kt

@@ -0,0 +1,10 @@
+package com.wix.detox.espresso.action.common
+
+object ReflectUtils {
+    fun isAssignableFrom(source: Any, className: String) =
+        try {
+            Class.forName(className).isAssignableFrom(source.javaClass)
+        } catch (ex: ClassNotFoundException) {
+            false
+        }
+}

package/android/detox/src/main/java/com/wix/detox/espresso/action/common/utils/UiControllerUtils.kt

@@ -1,6 +1,6 @@
 @file:JvmName("UiControllerUtils")
 
-package com.wix.detox.espresso.common.utils
+package com.wix.detox.espresso.action.common.utils
 
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.UiController

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

@@ -1,8 +1,20 @@
 package com.wix.detox
 
+import android.view.View
+import android.view.ViewGroup
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.kotlin.whenever
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.TimeUnit
 
 object UTHelpers {
     fun yieldToOtherThreads(executor: ExecutorService) = executor.awaitTermination(100L, TimeUnit.MILLISECONDS)
+
+    fun mockViewHierarchy(parent: ViewGroup, vararg children: View) {
+        whenever(parent.childCount).thenReturn(children.size)
+
+        children.forEachIndexed { index, view ->
+            whenever(parent.getChildAt(eq(index))).thenReturn(view)
+        }
+    }
 }

package/android/detox/src/testFull/java/com/wix/detox/adapters/server/QueryStatusActionHandlerSpec.kt

@@ -1,9 +1,8 @@
 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.reactnative.idlingresources.IdlingResourceDescription
+import com.wix.detox.inquiry.DetoxBusyResource
+import com.wix.detox.inquiry.DetoxBusyResourceDescription
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
@@ -31,103 +30,45 @@ object QueryStatusActionHandlerSpec : Spek({
             }
         }
 
-        fun queryStatusHandler() = QueryStatusActionHandler(outboundServerAdapter, testEngineFacade)
+        fun uut() = QueryStatusActionHandler(outboundServerAdapter, testEngineFacade)
 
-        it("should return idle app status") {
-            queryStatusHandler().handle(params, messageId)
-            val expectedData =  mapOf("status" to mapOf("app_status" to "idle"))
-            verify(outboundServerAdapter).sendMessage(eq("currentStatusResult"), eq(expectedData), eq(messageId))
-        }
-
-        fun createMockedDescriptiveResource(description: IdlingResourceDescription):
-                DescriptiveIdlingResource {
-            val resource: DescriptiveIdlingResource = mock()
-            whenever(resource.getDescription()).thenReturn(description)
-            return resource
-        }
-
-        it("should return busy app status with descriptive resource") {
-            val fakeDescription = IdlingResourceDescription.Builder()
-                .name("foo")
-                .addDescription("bar", "baz")
-                .addDescription("qux", "quux")
-                .build()
-
-            val busyResources: List<IdlingResource> = listOf(
-                createMockedDescriptiveResource(fakeDescription)
-            )
-            whenever(testEngineFacade.getBusyIdlingResources()).thenReturn(busyResources)
+        describe("given an idle app") {
+            it("should send an idle status indication") {
+                val expectedData =  mapOf("status" to mapOf("app_status" to "idle"))
 
-            queryStatusHandler().handle(params, messageId)
-
-            val expectedBusyResourceDescription = listOf(
-                mapOf("name" to "foo", "description" to mapOf("bar" to "baz", "qux" to "quux"))
-            )
-            val expectedData =  mapOf("status" to mapOf("app_status" to "busy", "busy_resources" to expectedBusyResourceDescription))
-            verify(outboundServerAdapter).sendMessage(eq("currentStatusResult"), eq(expectedData), eq(messageId))
-        }
-
-        abstract class LooperIdlingResource: IdlingResource {}
-
-        fun createMockedLooperIdlingResource(resourceName: String): LooperIdlingResource {
-            val resource: LooperIdlingResource = mock()
-            whenever(resource.name).thenReturn(resourceName)
-            return resource
+                uut().handle(params, messageId)
+                verify(outboundServerAdapter).sendMessage(eq("currentStatusResult"), eq(expectedData), eq(messageId))
+            }
         }
 
-        it("should return busy app status with looper resources") {
-            val busyResources: List<IdlingResource> = listOf(
-                createMockedLooperIdlingResource("mqt_js"),
-                createMockedLooperIdlingResource("mqt_native"),
-                createMockedLooperIdlingResource("unmapped")
-            )
-            whenever(testEngineFacade.getBusyIdlingResources()).thenReturn(busyResources)
-
-            queryStatusHandler().handle(params, messageId)
+        describe("given a busy app") {
+            fun aBusyResourceDescription(description: Map<String, Any>): DetoxBusyResourceDescription =
+                mock {
+                    on { json() }.thenReturn(description)
+                }
+
+            fun aBusyResource(identifier: String): DetoxBusyResource {
+                val mockedDescription = aBusyResourceDescription(mapOf("mock" to identifier))
+                return mock {
+                    on { getDescription() }.thenReturn(mockedDescription)
+                }
+            }
 
-            val expectedBusyResourceDescription = listOf(
-                mapOf(
-                    "name" to "looper",
-                    "description" to mapOf(
-                        "thread" to "\"mqt_js\" (JS Thread)",
-                        "execution_type" to "JavaScript code"
-                    )
-                ),
-                mapOf(
-                    "name" to "looper",
-                    "description" to mapOf(
-                        "thread" to "\"mqt_native\" (Native Modules Thread)",
-                        "execution_type" to "native module calls"
+            it("should send a descriptive busy-status indication") {
+                val busyResource = aBusyResource("some-resource")
+                val busyResource2 = aBusyResource("yet-another-resource")
+                val expectedData =  mapOf<String, Any>("status" to mapOf(
+                    "app_status" to "busy",
+                    "busy_resources" to listOf(
+                        mapOf("mock" to "some-resource"),
+                        mapOf("mock" to "yet-another-resource"),
                     )
-                ),
-                mapOf(
-                    "name" to "looper",
-                    "description" to mapOf("thread" to "\"unmapped\"")
-                )
-            )
-            val expectedData =  mapOf("status" to mapOf("app_status" to "busy", "busy_resources" to expectedBusyResourceDescription))
-            verify(outboundServerAdapter).sendMessage(eq("currentStatusResult"), eq(expectedData), eq(messageId))
-        }
+                ))
+                whenever(testEngineFacade.getAllBusyResources()).thenReturn(listOf(busyResource, busyResource2))
 
-        fun createMockedIdlingResource(name: String): IdlingResource {
-            val resource: IdlingResource = mock()
-            whenever(resource.name).thenReturn(name)
-            return resource
-        }
-
-        it("should return busy app status with unknown resource") {
-            val busyResources: List<IdlingResource> = listOf(
-                createMockedIdlingResource( "quux")
-            )
-            whenever(testEngineFacade.getBusyIdlingResources()).thenReturn(busyResources)
-
-            queryStatusHandler().handle(params, messageId)
-
-            val expectedBusyResourceDescription = listOf(
-                mapOf("name" to "unknown", "description" to mapOf("identifier" to "quux"))
-            )
-            val expectedData =  mapOf("status" to mapOf("app_status" to "busy", "busy_resources" to expectedBusyResourceDescription))
-            verify(outboundServerAdapter).sendMessage(eq("currentStatusResult"), eq(expectedData), eq(messageId))
+                uut().handle(params, messageId)
+                verify(outboundServerAdapter).sendMessage(eq("currentStatusResult"), eq(expectedData), eq(messageId))
+            }
         }
-    }
+   }
 })

package/android/detox/src/testFull/java/com/wix/detox/common/UIExtensionsTest.kt

@@ -0,0 +1,107 @@
+package com.wix.detox.common
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import com.wix.detox.UTHelpers.mockViewHierarchy
+import com.wix.detox.reactnative.ui.getAccessibilityLabel
+import org.assertj.core.api.Assertions
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class UIExtensionsTest {
+    private val alwaysReactNativeObjFn: (Any) -> Boolean = { true }
+    private val neverReactNativeObjFn: (Any) -> Boolean = { false }
+
+    private fun withContentDescription(value: String, v: View) { whenever(v.contentDescription).doReturn(value) }
+    private fun withText(value: String, v: TextView) { whenever(v.text).doReturn(value) }
+
+    @Test
+    fun `should return accessibility label according to content-description`() {
+        val view: View = mock()
+
+        val contentDescription = "content-description-mock"
+        withContentDescription(contentDescription, view)
+
+        val label = view.getAccessibilityLabel()
+        Assertions.assertThat(label).isEqualTo(contentDescription)
+    }
+
+    @Test
+    fun `should return accessibility label according to children's content-description, recursively`() {
+        val contentDescription1st = "cd.1"
+        val contentDescription2nd = "cd.2"
+        val expectedLabel = "$contentDescription1st $contentDescription2nd"
+
+
+        val parent: ViewGroup = mock()
+        val sibling1: ViewGroup = mock()
+        val sibling2: ViewGroup = mock<ViewGroup>().also {
+            withContentDescription(contentDescription2nd, it)
+        }
+        val grandchild: View = mock<View>().also {
+            withContentDescription(contentDescription1st, it)
+        }
+
+        mockViewHierarchy(parent, sibling1, sibling2)
+        mockViewHierarchy(sibling1, grandchild)
+
+        val label = parent.getAccessibilityLabel(alwaysReactNativeObjFn)
+        Assertions.assertThat(label).isEqualTo(expectedLabel)
+    }
+
+    @Test
+    fun `should return accessibility label according to children's text, on top of label`() {
+        val text = "some mocked text"
+
+        val parent: ViewGroup = mock()
+        val grandchild: TextView = mock<TextView>().also {
+            withText(text, it)
+        }
+        mockViewHierarchy(parent, grandchild)
+
+        val label = parent.getAccessibilityLabel(alwaysReactNativeObjFn)
+        Assertions.assertThat(label).isEqualTo(text)
+    }
+
+    @Test
+    fun `should not return accessibility label if content description not set in view nor its descendants`() {
+        val parent: ViewGroup = mock()
+        val child: View = mock()
+
+        mockViewHierarchy(parent, child)
+
+        val label = parent.getAccessibilityLabel(alwaysReactNativeObjFn)
+        Assertions.assertThat(label).isNull()
+    }
+
+    @Test
+    fun `should not return accessibility label based on children for non-RN views`() {
+        val childContentDescription = "content-description-mock"
+
+        val parent: ViewGroup = mock()
+        val child: View = mock<View>().also {
+            withContentDescription(childContentDescription, it)
+        }
+        mockViewHierarchy(parent, child)
+
+        val label = parent.getAccessibilityLabel(neverReactNativeObjFn)
+        Assertions.assertThat(label).isNull()
+    }
+
+    @Test
+    fun `should return accessibility label for non-RN views`() {
+        val view: View = mock()
+
+        val contentDescription = "content-description-mock"
+        withContentDescription(contentDescription, view)
+
+        val label = view.getAccessibilityLabel(neverReactNativeObjFn)
+        Assertions.assertThat(label).isEqualTo(contentDescription)
+    }
+}

package/android/detox/src/testFull/java/com/wix/detox/espresso/action/DetoxMultiTapSpec.kt

@@ -11,6 +11,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.mockito.kotlin.*
 import org.spekframework.spek2.Spek
 import org.spekframework.spek2.style.specification.describe
+import java.lang.NullPointerException
 import kotlin.test.assertFailsWith
 
 object DetoxMultiTapSpec: Spek({
@@ -136,17 +137,17 @@ object DetoxMultiTapSpec: Spek({
         }
 
         it("should throw if no UI-controller provided") {
-            assertFailsWith(KotlinNullPointerException::class) {
+            assertFailsWith(NullPointerException::class) {
                 uut(1).sendTap(null, coordinates, precision, -1, -1)
             }
         }
 
         it("should throw if no coordinates / precision are provided") {
-            assertFailsWith(KotlinNullPointerException::class) {
+            assertFailsWith(NullPointerException::class) {
                 uut(1).sendTap(uiController, null, precision, -1, -1)
             }
 
-            assertFailsWith(KotlinNullPointerException::class) {
+            assertFailsWith(NullPointerException::class) {
                 uut(1).sendTap(uiController, coordinates, null, -1, -1)
             }
         }