acouchi 0.0.5 → 0.0.6

data/lib/acouchi/solo.rb

@@ -4,20 +4,19 @@ require "json"
 module Acouchi
   class Solo
     MENU = 82
+    LEFT = 21
+    RIGHT = 22
 
     def send_key key
-      call_method("sendKey", [{:type => "int", :value => key}])
+      call_method("sendKey", [key])
     end
 
     def enter_text index, text
-      call_method("enterText", [
-        {:type => "int",              :value => index},
-        {:type => "java.lang.String", :value => text}
-      ])
+      call_method("enterText", [index, text])
     end
 
     def clear_edit_text index
-      call_method("clearEditText", [{:type => "int", :value => index}])
+      call_method("clearEditText", [index])
     end
 
     def has_text? text, options={}
@@ -26,12 +25,11 @@ module Acouchi
         :minimum_matches => 0,
         :must_be_visible => true
       }.merge(options)
-
       call_method("searchText", [
-        {:type => "java.lang.String", :value => text},
-        {:type => "int", :value => options[:minimum_matches]},
-        {:type => "boolean", :value => options[:scroll]},
-        {:type => "boolean", :value => options[:must_be_visible]}
+        text,
+        options[:minimum_matches],
+        options[:scroll],
+        options[:must_be_visible]
       ])
     end
 
@@ -52,11 +50,10 @@ module Acouchi
         :match => 1,
         :auto_scroll => true
       }.merge(options)
-
       call_method("clickOnText", [
-        {:type => "java.lang.String", :value => text},
-        {:type => "int", :value => options[:match]},
-        {:type => "boolean", :value => options[:auto_scroll]}
+        text,
+        options[:match],
+        options[:auto_scroll]
       ])
     end
 
@@ -65,9 +62,7 @@ module Acouchi
     end
 
     def click_view id
-      call_method("clickOnViewById", [
-        {:type => "int", :value => id},
-      ])
+      call_method("clickOnViewById", [id])
     end
 
     def scroll_up
@@ -79,15 +74,19 @@ module Acouchi
     end
 
     def scroll_up_list index=0
-      call_method("scrollUpList", [
-        {:type => "int", :value => index}
-      ])
+      call_method("scrollUpList", [index])
     end
 
     def scroll_down_list index=0
-      call_method("scrollDownList", [
-        {:type => "int", :value => index}
-      ])
+      call_method("scrollDownList", [index])
+    end
+
+    def scroll_to_left
+      call_method("scrollToSide", [LEFT])
+    end
+
+    def scroll_to_right
+      call_method("scrollToSide", [RIGHT])
     end
 
     private

data/lib/acouchi/version.rb

@@ -1,3 +1,3 @@
 module Acouchi
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/src/com/acouchi/Acouchi.java

@@ -1,4 +1,5 @@
 package com.acouchi;
+
 import com.jayway.android.robotium.solo.Solo;
 
 import java.util.Properties;
@@ -9,24 +10,11 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import android.app.Instrumentation;
-import android.app.Activity;
-import android.widget.TextView;
-import android.view.View;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONException;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collection;
+import com.google.gson.Gson;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
-import com.google.gson.Gson;
-import android.widget.Button;
 
 public class Acouchi extends NanoHTTPD
 {
@@ -71,205 +59,18 @@ public class Acouchi extends NanoHTTPD
     }
     else if (uri.startsWith("/execute_method"))
     {
-      String methodName = uri.replace("/execute_method/", "");
       try {
-        return ExecuteMethod(methodName, params.getProperty("parameters"));
+        String methodName = uri.replace("/execute_method/", "");
+        String[] parameters = new Gson().fromJson(params.getProperty("parameters"), String[].class);
+        String jsonResult = new MethodExecutor(solo, methodName, parameters).Execute();
+        return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, jsonResult);
       } catch (Throwable throwable) {
         return showException(throwable);
       }
     }
-
     return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, "Acouchi");
   }
 
-  private NanoHTTPD.Response ExecuteMethod(String methodName, String json) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, JSONException, ClassNotFoundException
-  {
-    if (methodName.equals("getCurrentContent"))
-      return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, getCurrentContentAsJson());
-
-    JSONArray jsonArray = new JSONArray(json);
-
-    if (methodName.equals("clickOnText")) {
-      String text = jsonArray.getJSONObject(0).getString("value");
-      int match = jsonArray.getJSONObject(1).getInt("value");
-      boolean scroll = jsonArray.getJSONObject(2).getBoolean("value");
-      try {
-        solo.clickOnText(text, match, scroll);
-      } catch (Exception exception) {
-        return showException(exception);
-      }
-      return displayMethodResultAsJson(methodName, null);
-    } else if (methodName.equals("scrollUpList")) {
-      int index = jsonArray.getJSONObject(0).getInt("value");
-      try {
-        solo.scrollUpList(index);
-      } catch (Exception exception) {
-        return showException(exception);
-      }
-      return displayMethodResultAsJson(methodName, null);
-    } else if (methodName.equals("scrollDownList")) {
-      int index = jsonArray.getJSONObject(0).getInt("value");
-      try {
-        solo.scrollDownList(index);
-      } catch (Exception exception) {
-        return showException(exception);
-      }
-      return displayMethodResultAsJson(methodName, null);
-    } else {
-      Class[] parameterTypes = new Class[jsonArray.length()];
-      Object[] parameters = new Object[jsonArray.length()];
-
-      for (int i = 0; i < jsonArray.length(); i++) {
-        JSONObject jsonObject = jsonArray.getJSONObject(i);
-
-        parameterTypes[i] = getClassType(jsonObject.getString("type"));
-        parameters[i] = getConvertedValue(jsonObject.getString("type"), jsonObject.getString("value"));
-      }
-      Object result = executeMethodOnSomeClass(methodName, parameterTypes, parameters);
-      return displayMethodResultAsJson(methodName, result);
-    }
-  }
-
-  private class MethodExecutor
-  {
-    private Solo solo;
-    private Object[] parameters;
-
-    public MethodExecutor(Solo solo, Object[] parameters)
-    {
-      this.solo = solo;
-      this.parameters = parameters;
-    }
-  }
-
-  private Object executeMethodOnSomeClass(String methodName, Class[] parameterTypes, Object[] parameters) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException
-  {
-    try {
-      Method method = solo.getClass().getMethod(methodName, parameterTypes);
-      return method.invoke(solo, parameters);
-    } catch (Exception exception) {
-    }
-
-    Method method = this.getClass().getMethod(methodName, parameterTypes);
-    return method.invoke(this, parameters);
-  }
-
-  private NanoHTTPD.Response displayMethodResultAsJson(String methodName, Object result)
-  {
-    try {
-      JSONObject object = new JSONObject();
-
-      if (methodName.equals("getCurrentButtons"))
-        return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, getButtonsAsJson((ArrayList<Button>)result));
-
-      if (methodName.equals("getViews"))
-        return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, getViewsAsJson((ArrayList<View>)result));
-
-      if (methodName.equals("getView"))
-        return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, getViewAsJson((View)result));
-
-      if (result != null)
-        object.put("result", result);
-
-      return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, object.toString());
-    } catch (JSONException e) {
-      return showException(e);
-    }
-  }
-
-  public void clickOnViewById(int id)
-  {
-    solo.clickOnView(solo.getView(id));
-  }
-
-  private String getViewsAsJson(ArrayList<View> views)
-  {
-    ArrayList<JsonView> jsonViews = new ArrayList<JsonView>();
-    for(int index = 0; index < views.size(); index++)
-      jsonViews.add(new JsonView(views.get(index)));
-    JsonResult result = new JsonResult(jsonViews);
-    return new Gson().toJson(result);
-  }
-
-  private String getViewAsJson(View view)
-  {
-    JsonResult result = new JsonResult(new JsonView(view));
-    return new Gson().toJson(result);
-  }
-
-  private class JsonView
-  {
-    private int id;
-    private String className;
-
-    public JsonView(View view)
-    {
-      id = view.getId();
-      className = view.getClass().toString();
-    }
-  }
-
-  private String getButtonsAsJson(ArrayList<Button> buttons)
-  {
-    ArrayList<JsonButton> jsonButtons = new ArrayList<JsonButton>();
-    for(int index = 0; index < buttons.size(); index++)
-      jsonButtons.add(new JsonButton(buttons.get(index)));
-    JsonResult result = new JsonResult(jsonButtons);
-    return new Gson().toJson(result);
-  }
-
-  private String getCurrentContentAsJson()
-  {
-    ArrayList<TextView> currentTextViews = solo.getCurrentTextViews(null);
-    ArrayList<String> content = new ArrayList<String>();
-    for (TextView textView: currentTextViews)
-      content.add(textView.getText().toString());
-    JsonResult result = new JsonResult(content);
-    return new Gson().toJson(result);
-  }
-
-  private class JsonResult
-  {
-    private Object result;
-
-    public JsonResult(Object result)
-    {
-      this.result = result;
-    }
-  }
-
-  private class JsonButton
-  {
-    private String text;
-
-    public JsonButton(Button button)
-    {
-      text = button.getText().toString();
-    }
-  }
-
-  private Class getClassType(String name) throws java.lang.ClassNotFoundException
-  {
-    if (name.equals("int")) return int.class;
-    if (name.equals("long")) return long.class;
-    if (name.equals("double")) return double.class;
-    if (name.equals("boolean")) return boolean.class;
-    return Class.forName(name);
-  }
-
-  private Object getConvertedValue(String name, String value)
-  {
-    if (name.equals("int")) return Integer.parseInt(value);
-    if (name.equals("long")) return Long.parseLong(value);
-    if (name.equals("double")) return Double.parseDouble(value);
-    if (name.equals("boolean")) return Boolean.parseBoolean(value);
-    if (name.equals("java.lang.Integer")) return Integer.parseInt(value);
-    if (name.equals("java.lang.Long")) return Long.parseLong(value);
-    if (name.equals("java.lang.Double")) return Double.parseDouble(value);
-    if (name.equals("java.lang.Boolean")) return Boolean.parseBoolean(value);
-    return value;
-  }
-
   private NanoHTTPD.Response showException(Throwable throwable)
   {
     final Writer result = new StringWriter();

data/src/com/acouchi/JsonButton.java

@@ -0,0 +1,13 @@
+package com.acouchi;
+
+import android.widget.Button;
+
+public class JsonButton
+{
+  private String text;
+
+  public JsonButton(Button button)
+  {
+    text = button.getText().toString();
+  }
+}

data/src/com/acouchi/JsonResult.java

@@ -0,0 +1,11 @@
+package com.acouchi;
+
+public class JsonResult
+{
+  private Object result;
+
+  public JsonResult(Object result)
+  {
+    this.result = result;
+  }
+}

data/src/com/acouchi/JsonView.java

@@ -0,0 +1,15 @@
+package com.acouchi;
+
+import android.view.View;
+
+public class JsonView
+{
+  private int id;
+  private String className;
+
+  public JsonView(View view)
+  {
+    id = view.getId();
+    className = view.getClass().toString();
+  }
+}

data/src/com/acouchi/MethodExecutor.java

@@ -0,0 +1,117 @@
+package com.acouchi;
+
+import com.jayway.android.robotium.solo.Solo;
+
+import java.util.ArrayList;
+
+import com.google.gson.Gson;
+
+import com.acouchi.JsonResult;
+import com.acouchi.JsonView;
+import com.acouchi.JsonButton;
+
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Button;
+
+public class MethodExecutor
+{
+  private Solo solo;
+  private String methodName;
+  private String[] parameters;
+
+  public MethodExecutor(Solo solo, String methodName, String[] parameters)
+  {
+    this.solo = solo;
+    this.methodName = methodName;
+    this.parameters = parameters;
+  }
+
+  public String Execute()
+  {
+    Object result = null;
+
+    if (methodName.equals("getCurrentContent"))
+      result = getCurrentContent();
+
+    if (methodName.equals("enterText"))
+      solo.enterText(Integer.parseInt(parameters[0]), parameters[1]);
+
+    if (methodName.equals("clickOnText"))
+      solo.clickOnText(parameters[0], Integer.parseInt(parameters[1]), Boolean.parseBoolean(parameters[2]));
+
+    if (methodName.equals("scrollUpList"))
+      solo.scrollUpList(Integer.parseInt(parameters[0]));
+
+    if (methodName.equals("scrollDownList"))
+      solo.scrollDownList(Integer.parseInt(parameters[0]));
+
+    if (methodName.equals("sendKey"))
+      solo.sendKey(Integer.parseInt(parameters[0]));
+
+    if (methodName.equals("clearEditText"))
+      solo.clearEditText(Integer.parseInt(parameters[0]));
+
+    if (methodName.equals("searchText"))
+      result = solo.searchText(parameters[0], Integer.parseInt(parameters[1]), Boolean.parseBoolean(parameters[2]), Boolean.parseBoolean(parameters[3]));
+
+    if (methodName.equals("getCurrentButtons"))
+      result = getCurrentButtons();
+
+    if (methodName.equals("getCurrentContent"))
+      result = getCurrentContent();
+
+    if (methodName.equals("getViews"))
+      result = getCurrentViews();
+
+    if (methodName.equals("clickOnViewById"))
+      clickOnViewById(Integer.parseInt(parameters[0]));
+
+    if (methodName.equals("scrollUp"))
+      solo.scrollUp();
+
+    if (methodName.equals("scrollDown"))
+      solo.scrollDown();
+
+    if (methodName.equals("scrollToSide"))
+      solo.scrollToSide(Integer.parseInt(parameters[0]));
+
+    return methodResultAsJson(result);
+  }
+
+  public void clickOnViewById(int id)
+  {
+    solo.clickOnView(solo.getView(id));
+  }
+
+  private ArrayList<JsonButton> getCurrentButtons()
+  {
+    ArrayList<JsonButton> jsonButtons = new ArrayList<JsonButton>();
+    for(Button button: solo.getCurrentButtons())
+      jsonButtons.add(new JsonButton(button));
+    return jsonButtons;
+  }
+
+  private String methodResultAsJson(Object result)
+  {
+    JsonResult jsonResult = new JsonResult(result);
+    return new Gson().toJson(jsonResult);
+  }
+
+  private ArrayList<String> getCurrentContent()
+  {
+    ArrayList<TextView> currentTextViews = solo.getCurrentTextViews(null);
+    ArrayList<String> content = new ArrayList<String>();
+    for (TextView textView: currentTextViews)
+      content.add(textView.getText().toString());
+    return content;
+  }
+
+  private ArrayList<JsonView> getCurrentViews()
+  {
+    ArrayList<JsonView> jsonViews = new ArrayList<JsonView>();
+    for (View view: solo.getViews())
+      jsonViews.add(new JsonView(view));
+    return jsonViews;
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acouchi
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -106,6 +106,10 @@ files:
 - lib/acouchi/which.rb
 - not-yet-implemented.md
 - src/com/acouchi/Acouchi.java
+- src/com/acouchi/JsonButton.java
+- src/com/acouchi/JsonResult.java
+- src/com/acouchi/JsonView.java
+- src/com/acouchi/MethodExecutor.java
 - src/com/acouchi/NanoHTTPD.java
 - src/com/acouchi/TestCase.java
 homepage: https://github.com/AndrewVos/acouchi