calabash-android 0.3.8 → 0.4.0.pre1

data/lib/calabash-android/canned_steps.md

@@ -66,6 +66,9 @@ Finds a input field by index and blanks its value.
     Then /^I clear "([^\"]*)"$/ do |name|
 Finds a input field with matching content description and blanks its value.
 
+    Then /^I clear input field with id "([^\"]*)"$/ do |view_id|
+Finds the input field with id `view_id` and clears the text from it.
+
     Then /^I select "([^\"]*)" from "([^\"]*)"$/ do |item_text, spinner_content_description|
 Finds the Spinner by 'spinner_content_description' and selects the item with the matching 'item_text'
 

data/lib/calabash-android/operations.rb

@@ -53,6 +53,10 @@ module Operations
     default_device.wake_up()
   end
 
+  def clear_app_data
+    default_device.clear_app_data
+  end
+
   def start_test_server_in_background
     default_device.start_test_server_in_background()
   end
@@ -92,14 +96,16 @@ module Operations
   end
 
   def query(uiquery, *args)
-    raise "Currently queries are only supported for webviews" unless uiquery.start_with? "webView"
-
-    uiquery.slice!(0, "webView".length)
-    if uiquery =~ /(css|xpath):\s*(.*)/
-      r = performAction("query", $1, $2)
-      JSON.parse(r["message"])
+    if uiquery.start_with? "webView"
+      uiquery.slice!(0, "webView".length)
+      if uiquery =~ /(css|xpath):\s*(.*)/
+        r = performAction("query", $1, $2)
+        JSON.parse(r["message"])
+      else
+       raise "Invalid query #{uiquery}"
+      end
     else
-     raise "Invalid query #{uiquery}"
+      JSON.parse(http("/query", {"query" => uiquery}))
     end
   end
 
@@ -298,6 +304,11 @@ module Operations
       end
     end
 
+    def clear_app_data
+      cmd = "#{adb_command} shell am instrument sh.calaba.android.test/sh.calaba.instrumentationbackend.ClearAppData"
+      raise "Could not clear data" unless system(cmd)
+    end
+
     def start_test_server_in_background
       raise "Will not start test server because of previous failures." if Cucumber.wants_to_quit
 
@@ -371,7 +382,19 @@ module Operations
   end
 
   def touch(uiquery,options={})
-    ni
+    if uiquery.instance_of? String
+      elements = query(uiquery, options)
+      raise "No elements found" if elements.empty?
+      element = elements.first
+    else
+      element = uiquery
+    end
+
+    performAction("touch_coordinate", element["frame"]["x"], element["frame"]["y"])
+  end
+
+  def http(options, data=nil)
+    default_device.http(options, data)
   end
 
   def html(q)
@@ -481,11 +504,6 @@ module Operations
     ni
   end
 
-  def http(options, data=nil)
-    ni
-  end
-
-
   def url_for( verb )
     ni
   end

data/lib/calabash-android/steps/enter_text_steps.rb

@@ -18,6 +18,10 @@ Then /^I clear input field number (\d+)$/ do |number|
   performAction('clear_numbered_field',number)
 end
 
+Then /^I clear input field with id "([^\"]*)"$/ do |view_id|
+  performAction('clear_id_field', view_id)
+end
+
 Then /^I enter text "([^\"]*)" into field with id "([^\"]*)"$/ do |text, view_id|
   performAction('enter_text_into_id_field', text, view_id)
 end

data/lib/calabash-android/steps/rotation_steps.rb

@@ -5,4 +5,3 @@ end
 Then /^I rotate the device to portrait$/ do
   rotate_phone(0)
 end
-

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.8"
+    VERSION = "0.4.0.pre1"
   end
 end

data/test-server/AndroidManifest.xml

@@ -18,6 +18,7 @@
     </application>
     <uses-sdk android:minSdkVersion="4" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
+    <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />

data/test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/PublicViewFetcher.java

@@ -0,0 +1,11 @@
+package com.jayway.android.robotium.solo;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+
+public class PublicViewFetcher extends ViewFetcher {
+
+    public PublicViewFetcher(Instrumentation instrumentation, Activity activity) {
+        super(new ActivityUtils(instrumentation, activity, new Sleeper()));
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/ClearAppData.java

@@ -0,0 +1,48 @@
+package sh.calaba.instrumentationbackend;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.test.InstrumentationTestRunner;
+import sh.calaba.instrumentationbackend.actions.HttpServer;
+
+import java.io.File;
+import java.lang.reflect.Method;
+
+public class ClearAppData extends InstrumentationTestRunner {
+	@Override
+    public void onCreate(Bundle arguments) {
+        if (externalCacheDir() != null) {
+            delete(externalCacheDir().getParentFile());
+        }
+        if (cacheDir() != null) {
+            delete(cacheDir().getParentFile());
+        }
+	}
+	
+    //If provided a file will delete it. 
+    //If provided a directory will recursively delete files but preserve directories
+    private void delete(File file_or_directory) {
+        if (file_or_directory == null) {
+            return;
+        }
+
+        if (file_or_directory.isDirectory()) {
+            if (file_or_directory.listFiles() != null) {
+                for(File f : file_or_directory.listFiles()) {
+                    delete(f);
+                }
+            }
+        } else {
+            file_or_directory.delete();
+        }
+    }
+
+    private File externalCacheDir() {
+        return getTargetContext().getExternalCacheDir();
+    }
+
+    private File cacheDir() {
+        return getTargetContext().getCacheDir();
+    }
+
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java

@@ -2,6 +2,7 @@ package sh.calaba.instrumentationbackend;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
+import com.jayway.android.robotium.solo.PublicViewFetcher;
 import sh.calaba.instrumentationbackend.actions.Actions;
 import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.app.Activity;
@@ -21,6 +22,7 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     
     public static Instrumentation instrumentation;
     public static SoloEnhanced solo;
+    public static PublicViewFetcher viewFetcher;
     public static Actions actions;
 
     public InstrumentationBackend() {
@@ -32,6 +34,7 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
         super.setUp();
         
         solo = new SoloEnhanced(getInstrumentation(), this.getActivity());
+        viewFetcher = new PublicViewFetcher(getInstrumentation(), this.getActivity());
         actions = new Actions(getInstrumentation(), this);
         instrumentation = getInstrumentation();
     }

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java

@@ -1,6 +1,7 @@
 package sh.calaba.instrumentationbackend.actions;
 
 import java.io.*;
+import java.util.Map;
 import java.util.Properties;
 import java.util.List;
 import java.util.concurrent.locks.Condition;
@@ -16,9 +17,12 @@ import android.view.View;
 import sh.calaba.instrumentationbackend.Command;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.query.QueryResult;
+import sh.calaba.instrumentationbackend.query.Query;
 import sh.calaba.org.codehaus.jackson.map.DeserializationConfig.Feature;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 import android.util.Log;
+import sh.calaba.org.codehaus.jackson.type.TypeReference;
 
 public class HttpServer extends NanoHTTPD {
 	private static final String TAG = "InstrumentationBackend";
@@ -67,6 +71,17 @@ public class HttpServer extends NanoHTTPD {
         if (uri.endsWith("/ping")) {
             return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, "pong");
 
+        } else if (uri.endsWith("/query")) {
+            try {
+                String commandString = params.getProperty("json");
+                ObjectMapper mapper = new ObjectMapper();
+                Map<String, String> command = mapper.readValue(commandString, new TypeReference<Map<String, String>>() {});
+                QueryResult result = new Query(command.get("query")).execute();
+                return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, result.asJson());
+            } catch (IOException e) {
+                e.printStackTrace();
+                return new Response(HTTP_INTERNALERROR, MIME_PLAINTEXT, "Could not parse arguments as JSON");
+            }
         } else if (uri.endsWith("/kill")) {
             lock.lock();
             try {

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/SetActivityOrientation.java

@@ -0,0 +1,43 @@
+package sh.calaba.instrumentationbackend.actions.activity;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class SetActivityOrientation implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        if (args.length == 0) {
+            throw new IllegalArgumentException("No orientation provided. Use 'landscape' or 'portrait'");
+        }
+        String orientation = args[0].toLowerCase();
+
+        if (orientation != "landscape" && orientation != "portrait") {
+            throw new IllegalArgumentException("Invalid orientation '" + orientation + "'. Use 'landscape' or 'portrait'");
+        }
+
+        if (orientation == "landscape") {
+            InstrumentationBackend.solo.setActivityOrientation(0);
+        } else {
+            InstrumentationBackend.solo.setActivityOrientation(1);
+        }
+        // Wait 100ms for orientation change to happen.
+        sleep(100);
+
+        return Result.successResult();
+    }
+
+    private void sleep(long time) {
+        try {
+            Thread.sleep(time);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String key() {
+        return "set_activity_orientation";
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/SetOrientation.java

@@ -0,0 +1,39 @@
+package sh.calaba.instrumentationbackend.actions.map;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class SetOrientation implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        String orientation = "";
+        if (args != null && args.length >= 1) {
+            orientation = args[0].toLowerCase();
+        }
+
+        int changed = -1;
+
+        if( "landscape".contentEquals(orientation) ) {
+            changed = 0;
+        } else if( "portrait".contentEquals(orientation) ) {
+            changed = 1;
+        }
+
+        if (changed != -1) {
+            InstrumentationBackend.solo.setActivityOrientation(changed);
+            // Wait 100ms for orientation to happen.
+            try { Thread.sleep(100); } catch (Exception e) {}
+            // setActivityOrientation returns void so assume success.
+            return Result.successResult();
+        }
+
+        return new Result(false, "Requested invalid orientation: '" + orientation + "' Expected 'landscape' or 'portrait'.");
+    }
+
+    @Override
+    public String key() {
+        return "set_orientation";
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/TouchCoordinates.java

@@ -0,0 +1,28 @@
+package sh.calaba.instrumentationbackend.actions.gestures;
+
+
+import android.view.Display;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+public class TouchCoordinates implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        Display display = InstrumentationBackend.solo.getCurrentActivity().getWindowManager().getDefaultDisplay();
+        
+        float x = Float.parseFloat(args[0]);
+        float y = Float.parseFloat(args[1]);
+
+        InstrumentationBackend.solo.clickOnScreen(x, y);
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "touch_coordinate";
+    }
+
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/Query.java

@@ -0,0 +1,90 @@
+package sh.calaba.instrumentationbackend.query;
+
+import android.content.res.Resources;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.TextView;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static sh.calaba.instrumentationbackend.InstrumentationBackend.*;
+
+public class Query {
+
+    private String queryString;
+
+    public Query(String queryString) {
+        System.out.println("CREATED QUERY: " + queryString);
+        this.queryString = queryString;
+    }
+
+
+    public QueryResult execute() {
+        List<Map<?,?>> result = new ArrayList<Map<?, ?>>();
+        for (View v : allVisibleViews()) {
+
+            if (!v.isShown() ) {
+                continue;
+            }
+
+            if (queryString != null) {
+                if (!queryString.isEmpty()) {
+                    if (!queryString.equalsIgnoreCase(v.getClass().getSimpleName())) {
+                        continue;
+                    }
+                }
+            }
+
+            System.out.println(v.getClass().getSimpleName().toString());
+            Map view = new HashMap();
+            view.put("class", v.getClass().getSimpleName());
+            view.put("description", v.toString());
+            view.put("contentDescription", v.getContentDescription());
+            view.put("enabled", v.isEnabled());
+            String id = null;
+            try {
+                id = InstrumentationBackend.solo.getCurrentActivity().getResources().getResourceEntryName(v.getId());
+            } catch (Resources.NotFoundException e) {
+                System.out.println("Resource not found for " + v.getId() + ". Moving on.");
+            }
+            view.put("id", id);
+
+            Map frame = new HashMap();
+            int[] location = new int[2];
+            v.getLocationOnScreen(location);
+
+            frame.put("x", location[0]);
+            frame.put("y", location[1]);
+            frame.put("width", v.getWidth());
+            frame.put("height", v.getHeight());
+
+            view.put("frame", frame);
+
+            if (v instanceof Button) {
+                Button b = (Button)v;
+                view.put("text", b.getText().toString());
+            }
+            if (v instanceof CheckBox) {
+                CheckBox c = (CheckBox)v;
+                view.put("checked", c.isChecked());
+            }
+            if (v instanceof TextView) {
+                TextView t = (TextView)v;
+                view.put("text", t.getText().toString());
+            }
+
+            result.add(view);
+        }
+        return new QueryResult(result);
+    }
+
+
+    public List<View> allVisibleViews() {
+        return viewFetcher.getAllViews(false);
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/QueryResult.java

@@ -0,0 +1,27 @@
+package sh.calaba.instrumentationbackend.query;
+
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+
+import java.io.IOException;
+import java.util.List;
+
+public class QueryResult {
+
+    private List result;
+
+    public QueryResult(List result) {
+
+        this.result = result;
+    }
+
+
+    public String asJson() {
+        ObjectMapper mapper = new ObjectMapper();
+
+        try {
+            return mapper.writeValueAsString(result);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert result to json", e);
+        }
+    }
+}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.8
-  prerelease: 
+  version: 0.4.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -169,8 +169,10 @@ files:
 - test-server/instrumentation-backend/res/layout/main.xml
 - test-server/instrumentation-backend/res/values/strings.xml
 - test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/MapViewUtils.java
+- test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/PublicViewFetcher.java
 - test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/SoloEnhanced.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/CalabashInstrumentationTestRunner.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/ClearAppData.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/Command.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/Result.java
@@ -181,6 +183,8 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NanoHTTPD.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NullAction.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/SetActivityOrientation.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/SetOrientation.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressButtonNumber.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressButtonText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressImageButtonDescription.java
@@ -194,6 +198,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/ClickOnScreen.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Drag.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Swipe.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/TouchCoordinates.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/helpers/InspectCurrentDialog.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/helpers/ListActions.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/l10n/L10nHelper.java
@@ -274,6 +279,8 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/SetPropertyByCssSelector.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/SetText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/Touch.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/Query.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/QueryResult.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/Base64Variant.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/Base64Variants.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/FormatSchema.java
@@ -698,9 +705,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24