acouchi 0.0.6 → 0.0.7

data/examples/AcouchiSample/Rakefile

@@ -12,3 +12,14 @@ end
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format pretty"
 end
+
+desc "open up an acouchi console"
+task :console do
+  configuration = Acouchi::Configuration.from_json(File.read("acouchi_configuration.json"))
+  test_runner = Acouchi::TestRunner.new(configuration)
+  test_runner.start
+  page = Acouchi::Solo.new
+  require "pry"
+  binding.pry
+  test_runner.stop
+end

data/examples/AcouchiSample/features/step_definitions/steps.rb

@@ -33,3 +33,11 @@ end
 Then /^I see all views$/ do
   p page.views
 end
+
+Then /^I see text views$/ do
+  p page.text_views
+end
+
+Then /^I see all content$/ do
+  p page.all_content
+end

data/examples/AcouchiSample/features/write_text.feature

@@ -20,3 +20,9 @@ Feature: Write Text
 
   Scenario: Views
     Then I see all views
+
+  Scenario: List Text Views
+    Then I see text views
+
+  Scenario: All Content
+    Then I see all content

data/examples/AcouchiSample/res/layout/listviewrow.xml

@@ -0,0 +1,7 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/listviewrow"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:padding="10dp"
+  android:textSize="16sp" >
+</TextView>

data/examples/AcouchiSample/res/layout/main.xml

@@ -27,4 +27,10 @@
     android:layout_height="wrap_content"
     android:text="click this text"
     />
+
+<ListView android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:id="@+id/listView">
+</ListView>
+
 </LinearLayout>

data/examples/AcouchiSample/src/com/acouchi/sample/StartupActivity.java

@@ -6,9 +6,16 @@ import android.widget.TextView;
 import android.view.View.OnClickListener;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import java.util.Arrays;
+import java.util.ArrayList;
 
 public class StartupActivity extends Activity
 {
+  private ListView listView;
+  private ArrayAdapter<String> listAdapter;
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState)
@@ -24,7 +31,6 @@ public class StartupActivity extends Activity
           }
         });
 
-
         ImageView imageView = (ImageView)findViewById(R.id.clickThisImageView);
         imageView.setOnClickListener(new OnClickListener(){
           public void onClick(View v) {
@@ -32,5 +38,16 @@ public class StartupActivity extends Activity
             clickThis.setText("You click an ImageView");
           }
         });
+
+        listView = (ListView) findViewById( R.id.listView );
+        String[] planets = new String[] {
+                                          "1", "2", "3", "4", "5", "6", "7", "8",
+                                          "9", "10", "11", "12", "13", "14", "15",
+                                          "16", "17", "18", "19", "20", "21", "22"
+                                        };
+        ArrayList<String> planetList = new ArrayList<String>();
+        planetList.addAll(Arrays.asList(planets));
+        listAdapter = new ArrayAdapter<String>(this, R.layout.listviewrow, planetList);
+        listView.setAdapter(listAdapter);
     }
 }

data/lib/acouchi/rspec/matchers.rb

@@ -8,3 +8,16 @@ RSpec::Matchers.define :have_content do |expected|
     "expected \"#{actual.content.join("\n")}\" to include \"#{expected}\""
   end
 end
+
+RSpec::Matchers.define :have_text do |expected|
+  match do |actual|
+    actual.has_text? expected
+  end
+  failure_message_for_should do |actual|
+    <<-FAIL
+    expected "#{actual.content.join("\n")}" to include "#{expected}"
+    all content on page:
+    #{actual.all_content.join("\n")}
+    FAIL
+  end
+end

data/lib/acouchi/solo.rb

@@ -41,10 +41,24 @@ module Acouchi
       buttons.any? { |b| b["text"] == text }
     end
 
+    def text_views
+      call_method("getTextViews")
+    end
+
     def content
       call_method("getCurrentContent")
     end
 
+    def all_content
+      all_content = []
+      until scroll_up == false; end
+      begin
+        all_content << text_views.map {|t| t["text"]}
+      end while scroll_down
+      all_content << text_views.map {|t| t["text"]}
+      all_content.flatten.uniq
+    end
+
     def click_text text, options={}
       options = {
         :match => 1,
@@ -65,6 +79,10 @@ module Acouchi
       call_method("clickOnViewById", [id])
     end
 
+    def click_image index
+      call_method("clickOnImage", [index])
+    end
+
     def scroll_up
       call_method("scrollUp")
     end
@@ -89,8 +107,13 @@ module Acouchi
       call_method("scrollToSide", [RIGHT])
     end
 
+    def go_back
+      call_method("goBack")
+    end
+
     private
       def call_method name, arguments = []
+        arguments = arguments.map {|a| a.to_s}
         options = { :body => {:parameters => arguments.to_json} }
         response = HTTParty.post("http://127.0.0.1:7103/execute_method/#{name}", options)
         json = JSON.parse(response.body, :max_nesting => 100)

data/lib/acouchi/version.rb

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

data/src/com/acouchi/JsonTextView.java

@@ -0,0 +1,15 @@
+package com.acouchi;
+
+import android.view.View;
+import android.widget.TextView;
+
+public class JsonTextView extends JsonView
+{
+  private String text;
+
+  public JsonTextView(TextView textView)
+  {
+    super(textView);
+    text = textView.getText().toString();
+  }
+}

data/src/com/acouchi/JsonView.java

@@ -6,10 +6,12 @@ public class JsonView
 {
   private int id;
   private String className;
+  private Boolean shown;
 
   public JsonView(View view)
   {
     id = view.getId();
     className = view.getClass().toString();
+    shown = view.isShown();
   }
 }

data/src/com/acouchi/MethodExecutor.java

@@ -9,6 +9,7 @@ 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;
@@ -41,10 +42,10 @@ public class MethodExecutor
       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]));
@@ -64,18 +65,27 @@ public class MethodExecutor
     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);
   }
 
@@ -114,4 +124,12 @@ public class MethodExecutor
       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;
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acouchi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -86,6 +86,7 @@ files:
 - examples/AcouchiSample/res/drawable-ldpi/ic_launcher.png
 - examples/AcouchiSample/res/drawable-mdpi/ic_launcher.png
 - examples/AcouchiSample/res/drawable-xhdpi/ic_launcher.png
+- examples/AcouchiSample/res/layout/listviewrow.xml
 - examples/AcouchiSample/res/layout/main.xml
 - examples/AcouchiSample/res/values/strings.xml
 - examples/AcouchiSample/src/com/acouchi/sample/StartupActivity.java
@@ -108,6 +109,7 @@ files:
 - src/com/acouchi/Acouchi.java
 - src/com/acouchi/JsonButton.java
 - src/com/acouchi/JsonResult.java
+- src/com/acouchi/JsonTextView.java
 - src/com/acouchi/JsonView.java
 - src/com/acouchi/MethodExecutor.java
 - src/com/acouchi/NanoHTTPD.java