diff --git a/detox/android/detox/build.gradle b/detox/android/detox/build.gradle index ee55ed99aa..bdc6bf09dc 100644 --- a/detox/android/detox/build.gradle +++ b/detox/android/detox/build.gradle @@ -79,13 +79,12 @@ dependencies { }) compile 'org.apache.commons:commons-lang3:3.4' - compile 'com.fasterxml.jackson.core:jackson-core:2.2.3' - compile 'com.fasterxml.jackson.core:jackson-databind:2.2.3' compile 'com.android.support.test:runner:1.0' compile 'com.android.support.test:rules:1.0' compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' + testCompile 'org.json:json:20140107' testCompile 'junit:junit:4.12' testCompile 'org.assertj:assertj-core:3.5.2' testCompile 'org.apache.commons:commons-io:1.3.2' diff --git a/detox/android/detox/src/main/java/com/wix/invoke/MethodInvocation.java b/detox/android/detox/src/main/java/com/wix/invoke/MethodInvocation.java index d2ac06a916..0e431e6128 100644 --- a/detox/android/detox/src/main/java/com/wix/invoke/MethodInvocation.java +++ b/detox/android/detox/src/main/java/com/wix/invoke/MethodInvocation.java @@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.InvocationTargetException; +import org.json.JSONException; /** @@ -15,23 +16,13 @@ */ public class MethodInvocation { - public static Object invoke(Object map) throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { - return invoke(map, null); - } - - public static Object invoke(Object map, Class extendWith) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException { - JsonParser parser = getParserWithExtendedParsableTargetTypes(extendWith); - Invocation invocation = parser.parse(map, Invocation.class); - return invoke(invocation); - } - - public static Object invoke(String invocationJson) throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { + public static Object invoke(String invocationJson) throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, JSONException { return invoke(invocationJson, null); } - public static Object invoke(String invocationJson, Class extendWith) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException { - JsonParser parser = getParserWithExtendedParsableTargetTypes(extendWith); - Invocation invocation = parser.parse(invocationJson, Invocation.class); + public static Object invoke(String invocationJson, Class extendWith) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, JSONException { + JsonParser parser = new JsonParser(); + Invocation invocation = new Invocation(parser.parse(invocationJson)); return invoke(invocation); } @@ -46,10 +37,4 @@ public static Object invoke(Invocation invocation) throws ClassNotFoundException throw e; } } - - public static JsonParser getParserWithExtendedParsableTargetTypes(Class extendWith) { - JsonParser parser = new JsonParser(); - parser.addMixInAnnotations(Target.class, extendWith); - return parser; - } } diff --git a/detox/android/detox/src/main/java/com/wix/invoke/parser/JsonParser.java b/detox/android/detox/src/main/java/com/wix/invoke/parser/JsonParser.java index 47e006f8dd..b1b32b79a4 100644 --- a/detox/android/detox/src/main/java/com/wix/invoke/parser/JsonParser.java +++ b/detox/android/detox/src/main/java/com/wix/invoke/parser/JsonParser.java @@ -1,36 +1,21 @@ package com.wix.invoke.parser; -import com.fasterxml.jackson.databind.ObjectMapper; - -import java.io.IOException; +import org.json.JSONObject; +import org.json.JSONException; /** * Created by rotemm on 13/10/2016. */ public class JsonParser { - ObjectMapper objectMapper; public JsonParser() { - objectMapper = new ObjectMapper(); - } - - public void addMixInAnnotations(Class target, Class mixinSource) { - objectMapper.addMixInAnnotations(target, mixinSource); - } - - public T parse(Object object, Class valueType) { - - try { - return objectMapper.convertValue(object, valueType); - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } } - public T parse(String jsonData, Class valueType) { + public JSONObject parse(String jsonData) { try { - return objectMapper.readValue(jsonData, valueType); - } catch (IOException e) { + JSONObject obj = new JSONObject(jsonData); + return obj; + } catch (JSONException e) { throw new RuntimeException(e); } } diff --git a/detox/android/detox/src/main/java/com/wix/invoke/types/ClassTarget.java b/detox/android/detox/src/main/java/com/wix/invoke/types/ClassTarget.java index 7604dae53b..a7b12d02ef 100644 --- a/detox/android/detox/src/main/java/com/wix/invoke/types/ClassTarget.java +++ b/detox/android/detox/src/main/java/com/wix/invoke/types/ClassTarget.java @@ -1,9 +1,7 @@ package com.wix.invoke.types; import android.util.Log; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +; import org.apache.commons.lang3.reflect.MethodUtils; @@ -15,9 +13,7 @@ */ public class ClassTarget extends Target { - - @JsonCreator - public ClassTarget(@JsonProperty("value") Object value) { + public ClassTarget(Object value) { super(value); } diff --git a/detox/android/detox/src/main/java/com/wix/invoke/types/Invocation.java b/detox/android/detox/src/main/java/com/wix/invoke/types/Invocation.java index fa3342a7c6..46aaa44521 100644 --- a/detox/android/detox/src/main/java/com/wix/invoke/types/Invocation.java +++ b/detox/android/detox/src/main/java/com/wix/invoke/types/Invocation.java @@ -1,16 +1,17 @@ package com.wix.invoke.types; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.wix.invoke.MethodInvocation; import com.wix.invoke.parser.JsonParser; import java.util.Arrays; import java.util.HashMap; +import org.json.JSONObject; +import org.json.JSONArray; +import org.json.JSONException; /** * Created by rotemm on 10/10/2016. */ -@JsonIgnoreProperties(ignoreUnknown = true) public class Invocation { private Target target; private String method; @@ -26,6 +27,17 @@ public Invocation(Target target, String method, Object... args) { this.args = args; } + public Invocation(JSONObject json) throws JSONException { + this.target = Target.getTarget(json.getJSONObject("target")); + this.method = json.getString("method"); + JSONArray args = json.getJSONArray("args"); + try { + this.setArgs(args); + } catch (JSONException e) { + throw new RuntimeException("Unable to convert args"); + } + } + public String getMethod() { return method; } @@ -46,6 +58,43 @@ public Object[] getArgs() { return args; } + public void setArgs(JSONArray args) throws JSONException { + Object[] outputArgs = new Object[args.length()]; + for (int i = 0; i < args.length(); i++) { + Object argument = null; + if (args.get(i).getClass() == "".getClass()) { + argument = args.get(i); + } else { + JSONObject jsonArgument = args.optJSONObject(i); + if (jsonArgument != null && jsonArgument.optString("type") != null) { + String type = jsonArgument.optString("type"); + if (type.equals("Integer")) { + argument = jsonArgument.optInt("value"); + } else if (type.equals("integer")) { + argument = jsonArgument.optInt("value"); + } else if (type.equals("Float")) { + argument = Float.valueOf(jsonArgument.optString("value")); + } else if (type.equals("Double")) { + argument = jsonArgument.optDouble("value"); + } else if (type.equals("String")) { + argument = jsonArgument.optString("value"); + } else if (type.equals("Boolean")) { + argument = jsonArgument.optBoolean("value"); + } else if (type.equals("boolean")) { + argument = jsonArgument.optBoolean("value"); + } else if (type.equals("Invocation")) { + argument = new Invocation(jsonArgument.optJSONObject("value")); + } else { + throw new RuntimeException("Unhandled arg type" + type); + } + } + } + outputArgs[i] = argument; + } + + this.args = outputArgs; + } + public void setArgs(Object[] args) { for (int i = 0; i < args.length; i++) { Object argument = args[i]; @@ -67,8 +116,8 @@ public void setArgs(Object[] args) { } else if (type.equals("boolean")) { argument = ((Boolean) value).booleanValue(); } else if (type.equals("Invocation")) { - JsonParser parser = MethodInvocation.getParserWithExtendedParsableTargetTypes(null); - argument = parser.parse(value, Invocation.class); + JsonParser parser = new JsonParser(); + argument = parser.parse((String)value); } else { throw new RuntimeException("Unhandled arg type" + type); } diff --git a/detox/android/detox/src/main/java/com/wix/invoke/types/InvocationTarget.java b/detox/android/detox/src/main/java/com/wix/invoke/types/InvocationTarget.java index e31f491187..e1f556ae9f 100644 --- a/detox/android/detox/src/main/java/com/wix/invoke/types/InvocationTarget.java +++ b/detox/android/detox/src/main/java/com/wix/invoke/types/InvocationTarget.java @@ -1,8 +1,5 @@ package com.wix.invoke.types; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.commons.lang3.reflect.MethodUtils; import java.lang.reflect.InvocationTargetException; @@ -12,8 +9,7 @@ */ public class InvocationTarget extends Target { - @JsonCreator - public InvocationTarget(@JsonProperty("value") Invocation value) { + public InvocationTarget(Invocation value) { super(value); } diff --git a/detox/android/detox/src/main/java/com/wix/invoke/types/ObjectInstanceTarget.java b/detox/android/detox/src/main/java/com/wix/invoke/types/ObjectInstanceTarget.java index dc7e76b417..55ee85d21f 100644 --- a/detox/android/detox/src/main/java/com/wix/invoke/types/ObjectInstanceTarget.java +++ b/detox/android/detox/src/main/java/com/wix/invoke/types/ObjectInstanceTarget.java @@ -1,7 +1,5 @@ package com.wix.invoke.types; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.reflect.MethodUtils; @@ -13,8 +11,7 @@ public class ObjectInstanceTarget extends Target { - @JsonCreator - public ObjectInstanceTarget(@JsonProperty("value") Object value) { + public ObjectInstanceTarget(Object value) { super(value); } diff --git a/detox/android/detox/src/main/java/com/wix/invoke/types/Target.java b/detox/android/detox/src/main/java/com/wix/invoke/types/Target.java index ad18a89c67..42101f71fc 100644 --- a/detox/android/detox/src/main/java/com/wix/invoke/types/Target.java +++ b/detox/android/detox/src/main/java/com/wix/invoke/types/Target.java @@ -1,27 +1,35 @@ package com.wix.invoke.types; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - import java.lang.reflect.InvocationTargetException; +import org.json.JSONObject; +import org.json.JSONException; /** * Created by rotemm on 10/10/2016. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") -@JsonSubTypes({ - @JsonSubTypes.Type(value = ClassTarget.class, name = "Class"), - @JsonSubTypes.Type(value = InvocationTarget.class, name = "Invocation"), - @JsonSubTypes.Type(value = ObjectInstanceTarget.class, name = "Espresso"), -}) -@JsonIgnoreProperties(ignoreUnknown = true) public abstract class Target { Object value; + public static Target getTarget(JSONObject target) throws JSONException { + String type = target.getString("type"); + + if (type.equals("Invocation")) { + JSONObject objectValue = target.getJSONObject("value"); + return new InvocationTarget(new Invocation(objectValue)); + } + + if (type.equals("Espresso")) { + String stringValue = target.getString("value"); + return new ObjectInstanceTarget(stringValue); + } + + // Default to Class + String value = target.getString("value"); + return new ClassTarget(value); + } + public Target(Object value) { this.value = value; } diff --git a/detox/android/detox/src/test/java/com/wix/invoke/JsonParserTest.java b/detox/android/detox/src/test/java/com/wix/invoke/JsonParserTest.java index b660551c7d..7aab9c3069 100644 --- a/detox/android/detox/src/test/java/com/wix/invoke/JsonParserTest.java +++ b/detox/android/detox/src/test/java/com/wix/invoke/JsonParserTest.java @@ -7,6 +7,8 @@ import org.junit.Test; import static org.assertj.core.api.Java6Assertions.assertThat; +import org.json.JSONObject; +import org.json.JSONException; /** * Created by rotemm on 13/10/2016. @@ -60,6 +62,12 @@ public void fromJsonTargetInvocationEspressoDetox() { public Invocation parse(String filePath) { String jsonData = TestUtils.jsonFileToString(filePath); - return new JsonParser().parse(jsonData, Invocation.class); + JSONObject json = new JsonParser().parse(jsonData); + try { + return new Invocation(json); + } catch (JSONException e) { + System.err.println("Could not parse json, got error: " + e.getMessage()); + return new Invocation(); + } } } \ No newline at end of file diff --git a/scripts/ci.android.sh b/scripts/ci.android.sh index 995c197b75..a2368c8834 100755 --- a/scripts/ci.android.sh +++ b/scripts/ci.android.sh @@ -2,6 +2,9 @@ $(dirname "$0")/ci.sh +pushd detox/android +./gradlew test +popd #echo no | "$ANDROID_HOME"/tools/bin/avdmanager create avd --force --name Nexus_5X_API_26 --abi armeabi-v7a --device "Nexus 5X" -k system-images;android-26;default;armeabi-v7a #pushd detox/test #npm run build:android