calabash-android 0.4.7.pre9 → 0.4.7.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56fb3f7f459dfeb08a1e0c6dce1c30b34036348
-  data.tar.gz: 98f38bd3c9b31367831e9eb164554313507e1059
+  metadata.gz: f9bf0084a84ca0e23fb28a5dbc4309a4395cee8a
+  data.tar.gz: 62401164c05b9f8680516df03dccf9496266347c
 SHA512:
-  metadata.gz: 7175bb6bb904ad0448d3eeb2035af00a27b4b4d79b782d8f293260d0c888e4e0e98a58ad4a633e62882123d5e7339fa6a82da4ccdfc802f2dab3613dce813d5a
-  data.tar.gz: 801089f346a1a29a90a5606e948980c8d573c8e0bc4379cbf005c39855ccf9dc999972bcc076e1c1201c7124fa8b4312bf14d88cb27a2401ec3376a799e28cfb
+  metadata.gz: f98938832bd593c95650fd10bb04961be5cd1f0e2183a1a351a6d97e86e297f408fbdc7f285b453e6f307e2d6de3e319339f4f92897459221a272e13adaaceb0
+  data.tar.gz: ef73bc3c23d04b37452a010390c8c3274d6ba55c9ea2c5de7a51f021f930ef532c9e7d481a5d73b1111447b3ecf61cc40a4201c43d7ef4ecedac0b533e6ae0c4

data/bin/calabash-android-console.rb

@@ -1,10 +1,6 @@
 def calabash_console(app_path = nil)
   test_server_path = test_server_path(app_path)
 
-  unless ENV["TEST_SERVER_PORT"]
-    ENV["TEST_SERVER_PORT"] = "34777"
-  end
-
   ENV["IRBRC"] = File.join(File.dirname(__FILE__), '..', 'irbrc')
 
   unless ENV["MAIN_ACTIVITY"]

data/bin/calabash-android-run.rb

@@ -16,15 +16,9 @@ def calabash_run(app_path = nil)
     build_test_server_if_needed(app_path)
 
     test_server_path = test_server_path(app_path)
-    if ENV["TEST_SERVER_PORT"]
-      test_server_port = ENV["TEST_SERVER_PORT"]
-    else
-      test_server_port = "34777"
-    end
     env = "MAIN_ACTIVITY=#{main_activity(app_path)} "\
           "APP_PATH=\"#{app_path}\" "\
-          "TEST_APP_PATH=\"#{test_server_path}\" "\
-          "TEST_SERVER_PORT=#{test_server_port}"
+          "TEST_APP_PATH=\"#{test_server_path}\""
   else
     env = ""
   end

data/lib/calabash-android/helpers.rb

@@ -28,9 +28,9 @@ end
 def manifest(app)
   out_path = manifest_path(app)
   manifest_file = File.join(out_path, 'AndroidManifest.xml')
-  unless File.exist?(manifest_file)
+  unless File.size?(manifest_file)
     manifest_extractor = File.join(File.expand_path(File.dirname(__FILE__)),'lib', 'apktool-cli-1.5.3-SNAPSHOT.jar')
-    output = `java -jar "#{manifest_extractor}" d -s "#{app}" #{out_path} 2>&1`
+    output = `java -jar "#{manifest_extractor}" d -s --frame-path "#{framework_path(app)}" -f "#{app}" #{out_path} 2>&1`
     raise "Unable to extract manifest: #{output}" unless File.size?(manifest_file)
     # Tidy up a bit. It would be nice if apktool could just dump the manifest alone.
     FileUtils.rm_rf(%w{res assets classes.dex}.map {|f| File.join(out_path, f) })
@@ -51,6 +51,10 @@ def manifest_path(apk_file_path)
   "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.res"
 end
 
+def framework_path(apk_file_path)
+  "test_servers/apktool-#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}"
+end
+
 
 def build_test_server_if_needed(app_path)
   unless File.exist?(test_server_path(app_path))

data/lib/calabash-android/operations.rb

@@ -117,6 +117,18 @@ module Operations
     default_device.set_gps_coordinates(latitude, longitude)
   end
 
+  def get_preferences(name)
+    default_device.get_preferences(name)
+  end
+
+  def set_preferences(name, hash)
+    default_device.set_preferences(name, hash)
+  end
+
+  def clear_preferences(name)
+    default_device.clear_preferences(name)
+  end
+
   def query(uiquery, *args)
     converted_args = []
     args.each do |arg|
@@ -178,8 +190,8 @@ module Operations
     def initialize(cucumber_world, serial, server_port, app_path, test_server_path, test_server_port = 7102)
 
       @cucumber_world = cucumber_world
-      @serial = serial
-      @server_port = server_port
+      @serial = serial || default_serial
+      @server_port = server_port || default_server_port
       @app_path = app_path
       @test_server_path = test_server_path
       @test_server_port = test_server_port
@@ -224,7 +236,7 @@ module Operations
       unless succeeded
         ::Cucumber.wants_to_quit = true
         raise "#{pn} did not get updated. Aborting!"
-      end    
+      end
     end
 
     def uninstall_app(package_name)
@@ -400,10 +412,6 @@ module Operations
       end
     end
 
-    def serial
-      @serial || default_serial
-    end
-
     def default_serial
       devices = connected_devices
       log "connected_devices: #{devices}"
@@ -412,11 +420,36 @@ module Operations
       devices.first
     end
 
+    def default_server_port
+      require 'yaml'
+      File.open(File.expand_path(server_port_configuration), File::RDWR|File::CREAT) do |f|
+        f.flock(File::LOCK_EX)
+        state = YAML::load(f) || {}
+        ports = state['server_ports'] ||= {}
+        return ports[serial] if ports.has_key?(serial)
+
+        port = 34777
+        port += 1 while ports.has_value?(port)
+        ports[serial] = port
+
+        f.rewind
+        f.write(YAML::dump(state))
+        f.truncate(f.pos)
+
+        log "Persistently allocated port #{port} to #{serial}"
+        return port
+      end
+    end
+
+    def server_port_configuration
+      File.expand_path(ENV['CALABASH_SERVER_PORTS'] || "~/.calabash.yaml")
+    end
+
     def connected_devices
       lines = `#{adb} devices`.split("\n")
       lines.shift
       lines.collect { |l| l.split("\t").first}
-    end  
+    end
 
     def wake_up
       wake_up_cmd = "#{adb_command} shell am start -a android.intent.action.MAIN -n #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.WakeUp"
@@ -551,9 +584,116 @@ module Operations
     def set_gps_coordinates(latitude, longitude)
       perform_action('set_gps_coordinates', latitude, longitude)
     end
-  end
 
+    def get_preferences(name)
+
+      log "Get preferences: #{name}, app running? #{app_running?}"
+      preferences = {}
+
+      if app_running?
+        json = perform_action('get_preferences', name);
+      else
+
+        logcat_id = get_logcat_id()
+        cmd = "#{adb_command} shell am instrument -e logcat #{logcat_id} -e name \"#{name}\" #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.GetPreferences"
+
+        raise "Could not get preferences" unless system(cmd)
+
+        logcat_cmd = get_logcat_cmd(logcat_id)
+        logcat_output = `#{logcat_cmd}`
+
+        json = get_json_from_logcat(logcat_output)
+
+        raise "Could not get preferences" unless json != nil and json["success"]
+      end
+
+      # at this point we have valid json, coming from an action
+      # or instrumentation, but we don't care, just parse
+      if json["bonusInformation"].length > 0
+          json["bonusInformation"].each do |item|
+          json_item = JSON.parse(item)
+          preferences[json_item["key"]] = json_item["value"]
+        end
+      end
+
+      preferences
+    end
+
+    def set_preferences(name, hash)
 
+      log "Set preferences: #{name}, #{hash}, app running? #{app_running?}"
+
+      if app_running?
+        perform_action('set_preferences', name, hash);
+      else
+
+        params = hash.map {|k,v| "-e \"#{k}\" \"#{v}\""}.join(" ")
+
+        logcat_id = get_logcat_id()
+        cmd = "#{adb_command} shell am instrument -e logcat #{logcat_id} -e name \"#{name}\" #{params} #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.SetPreferences"
+
+        raise "Could not set preferences" unless system(cmd)
+
+        logcat_cmd = get_logcat_cmd(logcat_id)
+        logcat_output = `#{logcat_cmd}`
+
+        json = get_json_from_logcat(logcat_output)
+
+        raise "Could not set preferences" unless json != nil and json["success"]
+      end
+    end
+
+    def clear_preferences(name)
+
+      log "Clear preferences: #{name}, app running? #{app_running?}"
+
+      if app_running?
+        perform_action('clear_preferences', name);
+      else
+
+        logcat_id = get_logcat_id()
+        cmd = "#{adb_command} shell am instrument -e logcat #{logcat_id} -e name \"#{name}\" #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.ClearPreferences"
+        raise "Could not clear preferences" unless system(cmd)
+
+        logcat_cmd = get_logcat_cmd(logcat_id)
+        logcat_output = `#{logcat_cmd}`
+
+        json = get_json_from_logcat(logcat_output)
+
+        raise "Could not clear preferences" unless json != nil and json["success"]
+      end
+    end
+
+    def get_json_from_logcat(logcat_output)
+
+      logcat_output.split(/\r?\n/).each do |line|
+        begin
+          json = JSON.parse(line)
+          return json
+        rescue
+          # nothing to do here, just discarding logcat rubbish
+        end
+      end
+
+      return nil
+    end
+
+    def get_logcat_id()
+      # we need a unique logcat tag so we can later
+      # query the logcat output and filter out everything
+      # but what we are interested in
+
+      random = (0..10000).to_a.sample
+      "#{Time.now.strftime("%s")}_#{random}"
+    end
+
+    def get_logcat_cmd(tag)
+      # returns raw logcat output for our tag
+      # filtering out everthing else
+
+      "#{adb_command} logcat -d -v raw #{tag}:* *:S"
+    end
+  end
 
   def label(uiquery)
     ni

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.7.pre9"
+    VERSION = "0.4.7.pre10"
   end
 end

data/test-server/AndroidManifest.xml

@@ -19,6 +19,9 @@
     <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" />
+    <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearPreferences" />
+    <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.SetPreferences" />
+    <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.GetPreferences" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />

data/test-server/instrumentation-backend/.classpath

@@ -4,8 +4,8 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="lib" path="libs/robotium-solo-4.1.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="libs/robotium-solo-4.2.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

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

@@ -0,0 +1,36 @@
+package sh.calaba.instrumentationbackend;
+
+import sh.calaba.instrumentationbackend.actions.preferences.PreferencesUtils;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.test.InstrumentationTestRunner;
+import android.util.Log;
+
+/**
+ * Allows clearing SharedPreferences.
+ * 
+ * See Ruby API docs for more info:
+ * https://github.com/calabash/calabash-android/blob/master/documentation/ruby_api.md
+ * 
+ * @author Juan Delgado (juan@ustwo.co.uk)
+ */
+public class ClearPreferences extends InstrumentationTestRunner {
+
+	@Override
+    public void onCreate(Bundle arguments) {
+		
+		SharedPreferences preferences = null;
+
+		try{
+			preferences = PreferencesUtils.getPreferencesFromBundle(arguments, getTargetContext());
+		} catch(Exception e){
+			e.printStackTrace();
+			return;
+		}
+		
+		preferences.edit().clear().commit();
+		
+		String logcat = arguments.getString(PreferencesUtils.BUNDLE_LOGCAT_ID);
+		Log.d(logcat, PreferencesUtils.resultToJson(Result.successResult()));
+	}	
+}

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

@@ -0,0 +1,37 @@
+package sh.calaba.instrumentationbackend;
+
+import sh.calaba.instrumentationbackend.actions.preferences.PreferencesUtils;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.test.InstrumentationTestRunner;
+import android.util.Log;
+
+/**
+ * Allows reading of SharedPreferences.
+ * 
+ * See Ruby API docs for more info:
+ * https://github.com/calabash/calabash-android/blob/master/documentation/ruby_api.md
+ * 
+ * @author Juan Delgado (juan@ustwo.co.uk)
+ */
+public class GetPreferences extends InstrumentationTestRunner {
+
+	@Override
+    public void onCreate(Bundle arguments) {
+		
+		SharedPreferences preferences = null;
+
+		try{
+			preferences = PreferencesUtils.getPreferencesFromBundle(arguments, getTargetContext());
+		} catch(Exception e){
+			e.printStackTrace();
+			return;
+		}
+		
+		Result result = Result.successResult();
+		PreferencesUtils.addPreferencesToResult(preferences, result);
+		
+		String logcat = arguments.getString(PreferencesUtils.BUNDLE_LOGCAT_ID);
+		Log.d(logcat, PreferencesUtils.resultToJson(result));
+	}
+}

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

@@ -0,0 +1,56 @@
+package sh.calaba.instrumentationbackend;
+
+import java.util.Set;
+
+import sh.calaba.instrumentationbackend.actions.preferences.PreferencesUtils;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.test.InstrumentationTestRunner;
+import android.util.Log;
+
+/**
+ * Allows writing of SharedPreferences.
+ * 
+ * See Ruby API docs for more info:
+ * https://github.com/calabash/calabash-android/blob/master/documentation/ruby_api.md
+ * 
+ * @author Juan Delgado (juan@ustwo.co.uk)
+ */
+public class SetPreferences extends InstrumentationTestRunner {
+
+	@Override
+    public void onCreate(Bundle arguments) {
+		
+		SharedPreferences preferences = null;
+
+		try{
+			preferences = PreferencesUtils.getPreferencesFromBundle(arguments, getTargetContext());
+		} catch(Exception e){
+			e.printStackTrace();
+			return;
+		}
+		
+	    Set<String> keys = arguments.keySet();
+	    
+	    String[] parserdArgs = new String[keys.size() * 2];
+	    
+	    int added = 0;
+	    for (String key : keys) {
+	    	
+	    	if(key.equals(PreferencesUtils.BUNDLE_LOGCAT_ID) || key.equals(PreferencesUtils.BUNDLE_NAME)){
+	    		continue;
+	    	}
+	    	
+	    	parserdArgs[added++] = key;
+	    	parserdArgs[added++] = arguments.get(key).toString();
+	    }
+		
+		SharedPreferences.Editor editor = preferences.edit();
+		
+		PreferencesUtils.setPreferences(editor, parserdArgs);
+		editor.commit();
+	    
+		String logcat = arguments.getString(PreferencesUtils.BUNDLE_LOGCAT_ID);
+		Log.d(logcat, PreferencesUtils.resultToJson(Result.successResult()));
+	}
+}

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

@@ -11,6 +11,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources.NotFoundException;
 import android.graphics.drawable.Drawable;
@@ -53,19 +54,42 @@ public class TestHelpers {
         if (!expectedViewType.isInstance(theView)) {
             throw new RuntimeException(String.format("getViewById:  Expected to find a View of type %s but found one of type %s", expectedViewType.getClass().getName(), theView.getClass().getName()));
         }
-        
+
         return (ViewType) theView;
     }
 
     public static View getViewById(String resName) {
-        int id = InstrumentationBackend.solo.getCurrentActivity().getResources().getIdentifier(resName, "id", InstrumentationBackend.solo.getCurrentActivity().getPackageName());
+        int id = getIdFromString(resName);
         if (id == 0) {
             return null;
         }
 
         return InstrumentationBackend.solo.getView(id);
     }
-    
+
+    /**
+     * Converts a string identifier name to the corresponding {@code R.id.*}
+     * (Integer) resource identifier.
+     *
+     * If the string appears to be a number, it will be converted to an
+     * integer and assumed to be an existing identifier.
+     *
+     * @param resName the resource identifier name
+     * @return the corresponding {@code R.id.[resName]} identifier
+     */
+    public static int getIdFromString(String resName) {
+        try
+        {
+            // Check if th string is just a direct number (unlikely)
+            return Integer.parseInt(resName);
+        } catch (NumberFormatException nfe) {
+            // Assume this is an "R.id.<name>" string.
+        }
+
+        final Activity activity = InstrumentationBackend.solo.getCurrentActivity();
+        return activity.getResources().getIdentifier(resName, "id", activity.getPackageName());
+    }
+
     public static Drawable getDrawableById(String resName) {
         int id;
         try {
@@ -117,7 +141,7 @@ public class TestHelpers {
     public static void wait(int durationInSeconds) {
     	wait(new Double(durationInSeconds));
     }
-    
+
 
     public static void wait(double durationInSeconds) {
         try {

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

@@ -0,0 +1,37 @@
+package sh.calaba.instrumentationbackend.actions.preferences;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.content.SharedPreferences;
+
+/**
+ * Allows clearing SharedPreferences.
+ *
+ * See Ruby API docs for more info:
+ * https://github.com/calabash/calabash-android/blob/master/documentation/ruby_api.md
+ * 
+ * @author Juan Delgado (juan@ustwo.co.uk)
+ */
+public class ClearPreferences implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		
+		try{
+			
+			SharedPreferences preferences = PreferencesUtils.getPreferencesFromArgs(args, InstrumentationBackend.instrumentation.getTargetContext());
+			preferences.edit().clear().commit();
+			
+			return Result.successResult();
+			
+		} catch(Exception e) {
+			return Result.fromThrowable(e);
+		}
+	}
+
+	@Override
+	public String key() {
+		return "clear_preferences";
+	}
+}

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

@@ -0,0 +1,39 @@
+package sh.calaba.instrumentationbackend.actions.preferences;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.content.SharedPreferences;
+
+/**
+ * Allows reading of SharedPreferences.
+ * 
+ * See Ruby API docs for more info:
+ * https://github.com/calabash/calabash-android/blob/master/documentation/ruby_api.md
+ * 
+ * @author Juan Delgado (juan@ustwo.co.uk)
+ */
+public class GetPreferences implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		
+		SharedPreferences preferences = null;
+		
+		try{
+			preferences = PreferencesUtils.getPreferencesFromArgs(args, InstrumentationBackend.instrumentation.getTargetContext());
+		} catch(Exception e){
+			return Result.fromThrowable(e);
+		}
+		
+		Result result = Result.successResult();
+		PreferencesUtils.addPreferencesToResult(preferences, result);
+		
+		return result;
+	}
+	
+	@Override
+	public String key() {
+		return "get_preferences";
+	}
+}

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

@@ -0,0 +1,229 @@
+package sh.calaba.instrumentationbackend.actions.preferences;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.org.codehaus.jackson.map.DeserializationConfig.Feature;
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.os.Bundle;
+
+/**
+ * Utility methods for SharedPreferences actions and instrumentation.
+ * 
+ * See Ruby API docs for more info:
+ * https://github.com/calabash/calabash-android/blob/master/documentation/ruby_api.md
+ * 
+ * @author Juan Delgado (juan@ustwo.co.uk)
+ */
+public class PreferencesUtils {
+	
+	private static final String MISSING_CONTEXT = "Missing context";
+	private static final String MISSING_BUNDLE = "Missing bundle";
+	private static final String MISSING_NAME = "Missing SharedPreferences name";
+	private static final String MISSING_LOGCAT_ID = "Missing LogCat ID";
+	private static final String MISSING_PREFERENCES = "Missing preferences";
+	private static final String MISSING_RESULT = "Missing result";
+	private static final String MISSING_EDITOR = "Missing editor";
+	private static final String MISSING_VALUES = "Missing values";
+	
+	public static final String BUNDLE_NAME = "name";
+	public static final String BUNDLE_LOGCAT_ID = "logcat";
+	
+	private final static ObjectMapper mapper = createJsonMapper();
+	
+	/**
+	 * Returns a SharedPreferences object based on arguments and context. 
+	 * 
+	 * @param args First item on the array is the name expected to retrieve the SharedPreferences.
+	 * @param context Typically the context of the tested application.
+	 * @return A SharedPreferences instance.
+	 * 
+	 * @throws IllegalArgumentException if missing args, name or context.
+	 */
+	public static SharedPreferences getPreferencesFromArgs(String[] args, Context context){
+		
+		if(args == null){
+			throw new IllegalArgumentException(MISSING_NAME);
+		}
+		
+		if(context == null){
+			throw new IllegalArgumentException(MISSING_CONTEXT);
+		}
+		
+		String name = args[0];
+		
+		if(name == null){
+			throw new IllegalArgumentException(MISSING_NAME);
+		}
+		
+		return context.getSharedPreferences(name, Context.MODE_PRIVATE);
+	}
+	
+	/**
+	 * Returns a SharedPreferences object based on arguments and context.
+	 * 
+	 * @param bundle Expected to contain "name" and "logcat" properties.
+	 * @param context Typically the context of the tested application.
+	 * @return A SharedPreferences instance.
+	 * 
+	 * @throws IllegalArgumentException if missing bundle, name, logcat or context.
+	 */
+	public static SharedPreferences getPreferencesFromBundle(Bundle bundle, Context context){
+		
+		if(bundle == null){
+			throw new IllegalArgumentException(MISSING_BUNDLE);
+		}
+		
+		if(context == null){
+			throw new IllegalArgumentException(MISSING_CONTEXT);
+		}
+		
+		String logcat = bundle.getString(PreferencesUtils.BUNDLE_LOGCAT_ID);
+		String name = bundle.getString(PreferencesUtils.BUNDLE_NAME);
+		
+		if(logcat == null){
+			throw new IllegalArgumentException(MISSING_LOGCAT_ID);
+		}		
+		
+		if(name == null){
+			throw new IllegalArgumentException(MISSING_NAME);
+		}
+		
+		return context.getSharedPreferences(name, Context.MODE_PRIVATE);
+	}
+	
+	/**
+	 * Iterates over the values stored in SharedPrefereces and adds them as JSON
+	 * key:value pairs to the bonusInformation of a result.
+	 * 
+	 * @param preferences SharedPreferences object we want to add.
+	 * @param result The Result object we want to add to.
+	 * 
+	 * @throws IllegalArgumentException if missing preferences or result.
+	 */
+	public static void addPreferencesToResult(SharedPreferences preferences, Result result){
+		
+		if(preferences == null){
+			throw new IllegalArgumentException(MISSING_PREFERENCES);
+		}
+		
+		if(result == null){
+			throw new IllegalArgumentException(MISSING_RESULT);
+		}
+		
+		Map<String, ?> map = preferences.getAll();
+		
+		for(Entry<String, ?> entry : map.entrySet()){
+			
+			StringBuilder json = new StringBuilder();
+			String value = null;
+			
+			json.append("{");
+			
+			if(entry.getValue() instanceof Integer ||
+				entry.getValue() instanceof Float || 
+				entry.getValue() instanceof Boolean){
+				
+				value = String.valueOf(entry.getValue());
+				
+			} else {
+				value = "\"" + entry.getValue() + "\"";
+			}
+			
+			json.append("\"key\": \"" + entry.getKey() + "\", ");
+			json.append("\"value\": " + value);
+			json.append("}");
+			
+			result.addBonusInformation(json.toString());
+		}	
+	}
+	
+	/**
+	 * Adds values to a SharedPreferences Editor object. Key,value
+	 * pairs are expected to come in the values array one after another
+	 * such as [key1, value1, key2, value2], etc. This is a side effect
+	 * of the Ruby to Java communication through ADB.
+	 * 
+	 * @param editor Editor to which add the values to.
+	 * @param values Array of key/value pairs.
+	 * 
+	 * @throws IllegalArgumentException if missing editor or values.
+	 */
+	public static void setPreferences(Editor editor, String[] values){
+		
+		if(editor == null){
+			throw new IllegalArgumentException(MISSING_EDITOR);
+		}
+		
+		if(values == null){
+			throw new IllegalArgumentException(MISSING_VALUES);
+		}
+		
+		// we expect key/value pairs passed one after another such as:
+		// [key1 value1 key2 value2], etc
+		// So we go through them with a 2 step loop
+		int totalParsedArgs = values.length;
+		for(int i = 0; i <totalParsedArgs; i += 2){
+			
+			if(values[i] == null){
+				break;
+			}
+			
+			String key = values[i];
+			String value = values[i+1];
+			
+			try {
+				
+				int x = Integer.parseInt(value);
+				editor.putInt(key, x);
+				
+			} catch (NumberFormatException e){
+				
+				try {
+					
+					float y = Float.parseFloat(value);
+					editor.putFloat(key, y);
+					
+				} catch (NumberFormatException e1) {
+					
+					if(value.equals("true") || value.equals("false")){
+						editor.putBoolean(key, Boolean.parseBoolean(value));
+					} else {
+						editor.putString(key, value);
+					}
+				}
+			} 
+		}
+	}
+	
+	/**
+	 * Formats a Result object as a JSON string.
+	 * 
+	 * @param result The result that has to be formatted. 
+	 * @return The result formatted as a JSON string
+	 * 
+	 * @throws IllegalArgumentException if missing result.
+	 */
+	public static String resultToJson(Result result) {
+		
+		if(result == null){
+			throw new IllegalArgumentException(MISSING_RESULT);
+		}
+		
+		try {
+			return mapper.writeValueAsString(result);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	private static ObjectMapper createJsonMapper() {
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, true);
+		return mapper;
+	}
+}

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

@@ -0,0 +1,56 @@
+package sh.calaba.instrumentationbackend.actions.preferences;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.content.SharedPreferences;
+
+/**
+ * Allows writing of SharedPreferences.
+ * 
+ * See Ruby API docs for more info:
+ * https://github.com/calabash/calabash-android/blob/master/documentation/ruby_api.md
+ * 
+ * @author Juan Delgado (juan@ustwo.co.uk)
+ */
+public class SetPreferences implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		
+		SharedPreferences preferences = null;
+		
+		try{
+			preferences = PreferencesUtils.getPreferencesFromArgs(args, InstrumentationBackend.instrumentation.getTargetContext());
+		} catch(Exception e){
+			return Result.fromThrowable(e);
+		}
+		
+		String[] parserdArgs = new String[args.length];
+		
+		int totalArgs = args.length;
+		int added = 0;
+		for(int i = 0; i <totalArgs; i++){
+			
+			String arg = args[i];
+			
+			// ignoring SharedPreferences name and weird chars 
+			if(arg.equals(args[0]) || arg.equals("{") || arg.equals("}")){
+				continue;
+			}
+			
+			parserdArgs[added++] = arg;
+		}
+		
+		SharedPreferences.Editor editor = preferences.edit();
+		PreferencesUtils.setPreferences(editor, parserdArgs);
+		editor.commit();
+		
+		return Result.successResult();
+	}
+
+	@Override
+	public String key() {
+		return "set_preferences";
+	}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.7.pre9
+  version: 0.4.7.pre10
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -190,7 +190,7 @@ files:
 - test-server/instrumentation-backend/build-libs/antlr-3.4-complete.jar
 - test-server/instrumentation-backend/build-libs/junit.jar
 - test-server/instrumentation-backend/build.xml
-- test-server/instrumentation-backend/libs/robotium-solo-4.1.jar
+- test-server/instrumentation-backend/libs/robotium-solo-4.2.jar
 - test-server/instrumentation-backend/project.properties
 - test-server/instrumentation-backend/res/drawable-hdpi/ic_launcher.png
 - test-server/instrumentation-backend/res/drawable-ldpi/ic_launcher.png
@@ -287,10 +287,13 @@ files:
 - test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeWizard.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/ClearPreferences.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/Command.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/FranklyResult.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/GetPreferences.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/Result.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/SetPreferences.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/TestHelpers.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/WakeUp.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/Action.java
@@ -337,6 +340,10 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/SetMapZoom.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/TapAwayFromMarkers.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/TapMapMarker.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/preferences/ClearPreferences.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/preferences/GetPreferences.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/preferences/PreferencesUtils.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/preferences/SetPreferences.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/scrolling/ScrollDown.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/scrolling/ScrollUp.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/search/EnterQueryByIndex.java
@@ -861,3 +868,4 @@ signing_key:
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
+has_rdoc: