detox 21.0.0-rc.5 → 21.0.0-rc.7

package/android/detox/src/full/java/com/wix/detox/espresso/performer/ViewActionPerformer.kt

@@ -0,0 +1,24 @@
+package com.wix.detox.espresso.performer
+
+import com.wix.detox.espresso.MultipleViewsAction
+
+import android.view.View
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.NoMatchingViewException
+import androidx.test.espresso.ViewAction
+import org.hamcrest.Matcher
+
+interface ViewActionPerformer {
+    fun performOn(matcher: Matcher<View>): Any?
+
+    companion object {
+        @JvmStatic
+        fun forAction(action: ViewAction): ViewActionPerformer {
+            return if (action is MultipleViewsAction) {
+                MultipleViewsActionPerformer(action)
+            } else {
+                SingleViewActionPerformer(action)
+            }
+        }
+    }
+}

package/android/detox/src/full/java/com/wix/detox/espresso/web/WebElement.java

@@ -62,12 +62,12 @@ public class WebElement {
         return getWebViewInteraction().withElement(get()).perform(DriverAtoms.getText()).get();
     }
 
-    public Evaluation runScript(String script) {
-        return getWebViewInteraction().withElement(get()).perform(new SimpleAtom(script)).get();
+    public Object runScript(String script) {
+        return getWebViewInteraction().withElement(get()).perform(new SimpleAtom(script)).get().getValue();
     }
 
-    public Evaluation runScriptWithArgs(String script, final ArrayList<Object> args) {
-        return getWebViewInteraction().withElement(get()).perform(Atoms.scriptWithArgs(script, args)).get();
+    public Object runScriptWithArgs(String script, final ArrayList<Object> args) {
+        return getWebViewInteraction().withElement(get()).perform(Atoms.scriptWithArgs(script, args)).get().getValue();
     }
 
     public String getCurrentUrl() {

package/android/detox/src/full/java/com/wix/invoke/types/Invocation.java

@@ -68,9 +68,9 @@ public class Invocation {
                 argument = args.get(i);
             } else if(args.get(i).getClass() == JSONArray.class) {
                 JSONArray jsonArray = (JSONArray) args.get(i);
-                List<String> list = new ArrayList<>();
+                List<Object> list = new ArrayList<>();
                 for (int j = 0; j < jsonArray.length(); j++) {
-                    list.add(jsonArray.getString(j));
+                    list.add(jsonArray.get(j));
                 }
                 argument = list;
             } else {
@@ -92,9 +92,9 @@ public class Invocation {
                     } else if (type.equals("boolean")) {
                         argument = jsonArgument.optBoolean("value");
                     } else if (type.equals("Invocation")) {
-                        argument = new Invocation(jsonArgument.optJSONObject("value"));                        
+                        argument = new Invocation(jsonArgument.optJSONObject("value"));
                     } else {
-                        throw new RuntimeException("Unhandled arg type" + type);
+                        throw new RuntimeException("Unhandled arg type " + type);
                     }
                 }
             }
@@ -105,6 +105,8 @@ public class Invocation {
     }
 
     public void setArgs(Object[] args) {
+        JsonParser parser = new JsonParser();
+
         for (int i = 0; i < args.length; i++) {
             Object argument = args[i];
             if (argument instanceof HashMap && !((HashMap) argument).isEmpty()) {
@@ -125,10 +127,9 @@ public class Invocation {
                 } else if (type.equals("boolean")) {
                     argument = ((Boolean) value).booleanValue();
                 } else if (type.equals("Invocation")) {
-                    JsonParser parser = new JsonParser();
                     argument = parser.parse((String)value);
                 } else {
-                    throw new RuntimeException("Unhandled arg type" + type);
+                    throw new RuntimeException("Unhandled arg type " + type);
                 }
 
                 args[i] = argument;

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

@@ -0,0 +1,4 @@
+package com.wix.detox.espresso
+
+// Marker interface for actions that should be applied to all matching elements without ambiguity.
+interface MultipleViewsAction

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

@@ -1,4 +1,3 @@
-
 package com.wix.detox.espresso
 
 import androidx.test.espresso.UiController

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

@@ -2,6 +2,7 @@ package com.wix.detox.espresso
 
 import androidx.test.espresso.ViewAction
 
-interface ViewActionWithResult<R: Any?>: ViewAction {
+// Interface for actions that return a result.
+interface ViewActionWithResult<R: Any?> : ViewAction {
     fun getResult(): R
 }

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

@@ -9,8 +9,37 @@ import androidx.test.espresso.action.MotionEvents
 private val PRECISION = floatArrayOf(16f, 16f)
 
 class MotionEvents {
-    fun obtainMoveEvent(downEvent: MotionEvent, eventTime: Long, x: Float, y: Float): MotionEvent
-            = MotionEvents.obtainMovement(downEvent.downTime, eventTime, floatArrayOf(x, y))!!
+    fun obtainMoveEvent(downEvent: MotionEvent, eventTime: Long, x: Float, y: Float): MotionEvent {
+        val pointerProperties = MotionEvent.PointerProperties().apply {
+            clear()
+            id = 0
+            toolType = MotionEvent.TOOL_TYPE_UNKNOWN
+        }
+        val pointerCoords = MotionEvent.PointerCoords().apply {
+            clear()
+            this.x = x
+            this.y = y
+            this.pressure = 0f
+            this.size = 1f
+        }
+
+        return MotionEvent.obtain(
+              downEvent.downTime,
+              eventTime,
+              MotionEvent.ACTION_MOVE,
+              1, // pointerCounts
+              arrayOf(pointerProperties),
+              arrayOf(pointerCoords),
+              0, // metaState
+              downEvent.buttonState,
+              downEvent.xPrecision,
+              downEvent.yPrecision,
+              0, // deviceId
+              0, // edgeFlags
+              downEvent.source,
+              0
+        )
+    }
 
     fun obtainDownEvent(x: Float, y: Float, precision: FloatArray = PRECISION)
         = obtainDownEvent(x, y, precision, null)
@@ -46,8 +75,35 @@ class MotionEvents {
                 0)
     }
 
-    fun obtainUpEvent(downEvent: MotionEvent, eventTime: Long, x: Float, y: Float): MotionEvent
-            = MotionEvent.obtain(downEvent.downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0)!!
+    fun obtainUpEvent(downEvent: MotionEvent, eventTime: Long, x: Float, y: Float): MotionEvent {
+        val pointerProperties = MotionEvent.PointerProperties().apply {
+          id = 0
+          toolType = MotionEvent.TOOL_TYPE_UNKNOWN
+        }
+        val pointerCoords = MotionEvent.PointerCoords().apply {
+          clear()
+          this.x = x
+          this.y = y
+          this.pressure = 0f
+          this.size = 1f
+        }
+        return MotionEvent.obtain(
+              downEvent.downTime,
+              eventTime,
+              MotionEvent.ACTION_UP,
+              1, // pointerCounts
+              arrayOf(pointerProperties),
+              arrayOf(pointerCoords),
+              0, // metaState
+              downEvent.buttonState,
+              downEvent.xPrecision,
+              downEvent.yPrecision,
+              0, // deviceId
+              0, // edgeFlags
+              downEvent.source,
+              0
+        )
+    }
 
     fun sendDownAsync(uiController: UiController, x: Float, y: Float, precision: FloatArray = PRECISION): MotionEvent {
         val downEvent = obtainDownEvent(x, y, precision, null)

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

@@ -37,7 +37,7 @@ class GetAttributesActionTest {
 
     private fun perform(v: View = view): JSONObject {
         uut.perform(null, v)
-        return JSONObject(uut.getResult())
+        return uut.getResult()!!
     }
 
     @Test
@@ -135,10 +135,10 @@ class GetAttributesActionTest {
         }
 
         val resultJson = perform()
-        assertThat(resultJson.opt("alpha")).isEqualTo(0.42)
+        assertThat(resultJson.opt("alpha")).isEqualTo(0.42f)
         assertThat(resultJson.opt("width")).isEqualTo(123)
         assertThat(resultJson.opt("height")).isEqualTo(456)
-        assertThat(resultJson.opt("elevation")).isEqualTo(0.314)
+        assertThat(resultJson.opt("elevation")).isEqualTo(0.314f)
     }
 
     @Test
@@ -208,7 +208,8 @@ class GetAttributesActionTest {
         }
 
         val resultJson = perform(slider)
-        assertThat(resultJson.opt("value")).isEqualTo(0.42)
+        android.util.Log.i("TESTS", "should return material-Slider state through value attribute: "+ resultJson)
+        assertThat(resultJson.opt("value")).isEqualTo(0.42f)
     }
 
     @Test
@@ -221,7 +222,7 @@ class GetAttributesActionTest {
 
         val resultJson = perform(textView)
         assertThat(resultJson.opt("text")).isEqualTo("mock-text")
-        assertThat(resultJson.opt("textSize")).isEqualTo(24)
+        assertThat(resultJson.opt("textSize")).isEqualTo(24f)
         assertThat(resultJson.opt("length")).isEqualTo(111)
     }
 

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

@@ -0,0 +1,33 @@
+package com.wix.detox.espresso.common
+
+import android.view.View
+import com.google.android.material.slider.Slider
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class MaterialSliderHelperTest {
+    @Test
+    fun `should return value if view is a slider`() {
+        val slider: Slider = mock {
+            on { value } doReturn 0.2f
+        }
+
+        val uut = MaterialSliderHelper(slider)
+
+        assertThat(uut.getValueIfSlider()).isEqualTo(0.2f)
+    }
+
+    @Test
+    fun `should return null if view is not a slider`() {
+        val view: View = mock()
+
+        val uut = MaterialSliderHelper(view)
+
+        assertThat(uut.getValueIfSlider()).isNull()
+    }
+}

package/android/detox/src/testFull/java/com/wix/detox/espresso/common/{SliderHelperTest.kt → ReactSliderHelperTest.kt}

@@ -15,14 +15,14 @@ import org.robolectric.RobolectricTestRunner
  * to avoid having to install the community slider under node_modules just for this.
  */
 @RunWith(RobolectricTestRunner::class)
-class SliderHelperTest {
+class ReactSliderHelperTest {
     lateinit var slider: ReactSlider
-    lateinit var uut: SliderHelper
+    lateinit var uut: ReactSliderHelper
 
     @Before
     fun setup() {
         slider = mock()
-        uut = SliderHelper.create(slider)
+        uut = ReactSliderHelper.create(slider)
     }
 
     private fun givenNativeProgressTraits(current: Int, max: Int) {

package/android/detox/src/testFull/java/com/wix/detox/espresso/performer/ViewActionPerformerSpec.kt

@@ -0,0 +1,37 @@
+package com.wix.detox.espresso.performer
+
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import androidx.test.espresso.ViewAction
+import com.wix.detox.espresso.MultipleViewsAction
+import org.hamcrest.Matcher
+import org.mockito.Mockito.*
+import org.mockito.kotlin.mock
+
+object ViewActionPerformerSpec : Spek({
+
+    describe("ViewActionPerformer") {
+        context("forAction") {
+            context("given a regular ViewAction") {
+                val action = mock(ViewAction::class.java)
+
+                it("should return a SingleViewActionPerformer") {
+                    val performer = ViewActionPerformer.forAction(action)
+                    assert(performer is SingleViewActionPerformer)
+                }
+            }
+
+            context("given a MultipleViewsAction") {
+                val multipleViewsAction: ViewAction = mock(
+                    ViewAction::class.java,
+                    withSettings().extraInterfaces(MultipleViewsAction::class.java)
+                )
+
+                it("should return a MultipleViewsActionPerformer") {
+                    val performer = ViewActionPerformer.forAction(multipleViewsAction)
+                    assert(performer is MultipleViewsActionPerformer)
+                }
+            }
+        }
+    }
+})

package/android/detox/src/testFull/java/com/wix/invoke/JsonParserTest.java

@@ -7,6 +7,7 @@ import com.wix.invoke.types.ClassTarget;
 import com.wix.invoke.types.Invocation;
 import com.wix.invoke.types.InvocationTarget;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
@@ -21,20 +22,20 @@ public class JsonParserTest {
     @Test
     public void targetClassStaticMethodNoParams() {
         Invocation invocation = new Invocation(new ClassTarget("java.lang.System"), "lineSeparator");
-        assertThat(parse("targetClassStaticMethodNoParams.json")).isEqualToComparingFieldByFieldRecursively(invocation);
+        assertThat(parse("targetClassStaticMethodNoParams.json")).usingRecursiveComparison().isEqualTo(invocation);
     }
 
     @Test
     public void parseTargetClassStaticMethodOneParam() {
         Invocation invocation = new Invocation(new ClassTarget("java.lang.String"), "valueOf", 1.0f);
-        assertThat(parse("targetClassStaticMethodOneParam.json")).isEqualToComparingFieldByFieldRecursively(invocation);
+        assertThat(parse("targetClassStaticMethodOneParam.json")).usingRecursiveComparison().isEqualTo(invocation);
     }
 
     @Test
     public void targetInvocationMethodOfClassStaticMethodOneParam() {
         Invocation innerInvocation = new Invocation(new ClassTarget("java.lang.String"), "valueOf", 1.0f);
         Invocation outerInvocation = new Invocation(new InvocationTarget(innerInvocation), "length");
-        assertThat(parse("targetInvocationMethodOfClassStaticMethodOneParam.json")).isEqualToComparingFieldByFieldRecursively(outerInvocation);
+        assertThat(parse("targetInvocationMethodOfClassStaticMethodOneParam.json")).usingRecursiveComparison().isEqualTo(outerInvocation);
     }
 
     @Test
@@ -46,7 +47,7 @@ public class JsonParserTest {
         Invocation perform = new Invocation(new InvocationTarget(onView), "perform", click);
 
 
-        assertThat(parse("targetInvocationEspresso.json")).isEqualToComparingFieldByFieldRecursively(perform);
+        assertThat(parse("targetInvocationEspresso.json")).usingRecursiveComparison().isEqualTo(perform);
     }
 
 
@@ -59,7 +60,7 @@ public class JsonParserTest {
         Invocation click = new Invocation(new ClassTarget("android.support.test.espresso.action.ViewActions"), "click");
         Invocation perform = new Invocation(new ClassTarget("com.wix.detox.espresso.EspressoDetox"), "perform", onView, click);
 
-        assertThat(parse("targetInvocationEspressoDetox.json")).isEqualToComparingFieldByFieldRecursively(perform);
+        assertThat(parse("targetInvocationEspressoDetox.json")).usingRecursiveComparison().isEqualTo(perform);
     }
 
     @Test
@@ -73,12 +74,27 @@ public class JsonParserTest {
         assertThat(parse("targetInvocationEspressoWebDetox.json")).usingRecursiveComparison().isEqualTo(tap);
     }
 
+    @Test
+    public void fromJsonTargetInvocationEspressoWebDetoxScript() throws JSONException {
+        Invocation getWebView = new Invocation(new ClassTarget("com.wix.detox.espresso.web.EspressoWebDetox"), "getWebView");
+        Invocation matcher = new Invocation(new ClassTarget("com.wix.detox.espresso.web.DetoxWebAtomMatcher"), "matcherForId", "textInput");
+        Invocation element = new Invocation(new InvocationTarget(getWebView), "element", matcher, 0);
+
+        String script = "function(el,arg1){}";
+        ArrayList<Object> scriptArguments = new ArrayList<>();
+        JSONArray arg1 = new JSONArray("[{ \"b\": true, \"n\": 1, \"s\": \"1\" }]");
+        scriptArguments.add(arg1);
+
+        Invocation runScriptWithArgs = new Invocation(new InvocationTarget(element), "runScriptWithArgs", script, scriptArguments);
+        assertThat(parse("targetInvocationEspressoWebDetoxScript.json")).usingRecursiveComparison().isEqualTo(runScriptWithArgs);
+    }
+
     @Test
     public void fromJsonTargetInvocationWithListParams() {
         ArrayList<String> params = new ArrayList<>();
         params.add(".*10.0.2.2.*");
         Invocation test = new Invocation(new ClassTarget("com.wix.detox.espresso.EspressoDetox"), "setURLBlacklist", params);
-        assertThat(parse("fromJsonTargetInvocationWithListParams.json")).isEqualToComparingFieldByFieldRecursively(test);
+        assertThat(parse("fromJsonTargetInvocationWithListParams.json")).usingRecursiveComparison().isEqualTo(test);
     }
 
     public Invocation parseString(String jsonString) {
@@ -95,4 +111,4 @@ public class JsonParserTest {
         String jsonString = TestUtils.jsonFileToString(filePath);
         return parseString(jsonString);
     }
-}
+}

package/android/detox/src/testFull/resources/targetInvocationEspressoWebDetoxScript.json

@@ -0,0 +1,47 @@
+{
+  "target":{
+    "type":"Invocation",
+    "value":{
+      "target":{
+        "type":"Invocation",
+        "value":{
+          "target":{
+            "type":"Class",
+            "value":"com.wix.detox.espresso.web.EspressoWebDetox"
+          },
+          "method":"getWebView",
+          "args":[
+
+          ]
+        }
+      },
+      "method":"element",
+      "args":[
+        {
+          "type":"Invocation",
+          "value":{
+            "target":{
+              "type":"Class",
+              "value":"com.wix.detox.espresso.web.DetoxWebAtomMatcher"
+            },
+            "method":"matcherForId",
+            "args":[
+              "textInput"
+            ]
+          }
+        },
+        {
+          "type":"Integer",
+          "value":0
+        }
+      ]
+    }
+  },
+  "method": "runScriptWithArgs",
+  "args": [
+    "function(el,arg1){}",
+    [
+      [{ "b": true, "n": 1, "s": "1" }]
+    ]
+  ]
+}

package/android/rninfo.gradle

@@ -1,6 +1,6 @@
 import groovy.json.JsonSlurper
 
-def rnVersion = getRNVersion()
+def rnVersion = getRNVersion(project.rootDir)
 def rnMajorVer = getMajorVersion(rnVersion)
 println "[$project] RNInfo: detected React Native version: $rnVersion (major=$rnMajorVer)"
 
@@ -12,9 +12,9 @@ project.ext.rnInfo = [
     isRN71OrHigher: rnMajorVer >= 71,
 ]
 
-private static def getRNVersion() {
+private static def getRNVersion(workingDir) {
     def jsonSlurper = new JsonSlurper()
-    Map<String, Object> packageJSON  = jsonSlurper.parse(new File('../node_modules/react-native/package.json'))
+    Map<String, Object> packageJSON  = jsonSlurper.parse(new File("$workingDir/../node_modules/react-native/package.json"))
     String rnVersion = packageJSON.get('version')
     return rnVersion
 }