src/com/acouchi/MethodExecutor.java in acouchi-0.0.6 vs src/com/acouchi/MethodExecutor.java in acouchi-0.0.7

@@ -7,10 +7,11 @@
 import com.google.gson.Gson;
 
 import com.acouchi.JsonResult;
 import com.acouchi.JsonView;
 import com.acouchi.JsonButton;
+import com.acouchi.JsonTextView;
 
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Button;
 
@@ -39,14 +40,14 @@
 
     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]));
+      result = solo.scrollUpList(Integer.parseInt(parameters[0]));
 
     if (methodName.equals("scrollDownList"))
-      solo.scrollDownList(Integer.parseInt(parameters[0]));
+      result = solo.scrollDownList(Integer.parseInt(parameters[0]));
 
     if (methodName.equals("sendKey"))
       solo.sendKey(Integer.parseInt(parameters[0]));
 
     if (methodName.equals("clearEditText"))
@@ -62,22 +63,31 @@
       result = getCurrentContent();
 
     if (methodName.equals("getViews"))
       result = getCurrentViews();
 
+    if (methodName.equals("getTextViews"))
+      result = getCurrentTextViews();
+
     if (methodName.equals("clickOnViewById"))
       clickOnViewById(Integer.parseInt(parameters[0]));
 
+    if (methodName.equals("clickOnImage"))
+      solo.clickOnImage(Integer.parseInt(parameters[0]));
+
     if (methodName.equals("scrollUp"))
-      solo.scrollUp();
+      result = solo.scrollUp();
 
     if (methodName.equals("scrollDown"))
-      solo.scrollDown();
+      result = solo.scrollDown();
 
     if (methodName.equals("scrollToSide"))
       solo.scrollToSide(Integer.parseInt(parameters[0]));
 
+    if (methodName.equals("goBack"))
+      solo.goBack();
+
     return methodResultAsJson(result);
   }
 
   public void clickOnViewById(int id)
   {
@@ -111,7 +121,15 @@
   {
     ArrayList<JsonView> jsonViews = new ArrayList<JsonView>();
     for (View view: solo.getViews())
       jsonViews.add(new JsonView(view));
     return jsonViews;
+  }
+
+  private ArrayList<JsonTextView> getCurrentTextViews()
+  {
+    ArrayList<JsonTextView> jsonTextViews = new ArrayList<JsonTextView>();
+    for (TextView textView: solo.getCurrentTextViews(null))
+      jsonTextViews.add(new JsonTextView(textView));
+    return jsonTextViews;
   }
 }