calabash-android 0.5.2 → 0.5.3

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

@@ -1,19 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-public class GetMapZoom implements Action {
-
-	@Override
-    public Result execute(String... args) {
-    	int zoomLevel = InstrumentationBackend.solo.getMapZoom();
-        return new Result(true, Integer.toString(zoomLevel));
-    }
-
-    @Override
-    public String key() {
-        return "get_map_zoom";
-    }
-}

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

@@ -1,23 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-/**
- * Center on lat, lon
- * @author Nicholas Albion
- */
-public class PanMapTo implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        InstrumentationBackend.solo.panMapTo( Double.parseDouble(args[0]), Double.parseDouble(args[1]) );
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "pan_map_to";
-    }
-}

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

@@ -1,23 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-/**
- * Center on lat, lon
- * @author Nicholas Albion
- */
-public class SetMapCenter implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        InstrumentationBackend.solo.setMapCenter( Double.parseDouble(args[0]), Double.parseDouble(args[1]) );
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "set_map_center";
-    }
-}

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

@@ -1,34 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-/**
- * @author Nicholas Albion
- */
-public class SetMapZoom implements Action {
-
-    @Override
-    public Result execute(String... args) {
-    	if( "in".equals(args[0]) ) {
-    		return new Result( InstrumentationBackend.solo.zoomInOnMap() );
-    	} else if( "out".equals(args[0]) ) {
-    		return new Result( InstrumentationBackend.solo.zoomOutOnMap() );
-    	}
-    	
-    	int zoomLevel = Integer.parseInt(args[0]);
-        int newZoom = InstrumentationBackend.solo.setMapZoom( zoomLevel );
-        
-        if( newZoom == zoomLevel ) {
-        	return Result.successResult();
-        } else {
-        	return new Result(false, "Requested zoom level: " + zoomLevel + " but current zoom level is " + newZoom);
-        }
-    }
-
-    @Override
-    public String key() {
-        return "set_map_zoom";
-    }
-}

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

@@ -1,28 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-/**
- * An optional "step" parameter lets the test script specify the number of pixels to increment down/across when
- * searching for a marker - defaults to 5 
- * 
- * @author Nicholas Albion
- */
-public class TapAwayFromMarkers implements Action {
-
-	@Override
-	public Result execute(String... args) {
-		int step = (args.length == 0) ? 5 : Integer.parseInt(args[0]);
-		if( InstrumentationBackend.solo.tapMapAwayFromMarkers(step) ) {
-			return Result.successResult();
-		}
-		return new Result(false, "Could not find any where to tap away from markers");
-	}
-
-	@Override
-	public String key() {
-		return "tap_map_away_from_markers";
-	}
-}

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

@@ -1,29 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-/**
- * eg: tap_map_marker_by_title, "my marker"
- * eg: tap_map_marker_by_title, "my marker", "10000"   (keep trying for 10 seconds)
- * 
- * @author Nicholas Albion
- */
-public class TapMapMarker implements Action {
-
-	@Override
-	public Result execute(String... args) {
-		String title = args[0];
-		long timeout = (args.length > 1) ? Long.parseLong(args[1]) : 10000;
-		if( InstrumentationBackend.solo.tapMapMarkerItem(title, timeout) ) {
-			return Result.successResult();
-		}
-		return new Result(false, "Could not find marker '" + title + "' to tap after waiting " + timeout + " ms");
-	}
-
-	@Override
-	public String key() {
-		return "tap_map_marker_by_title";
-	}
-}

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

@@ -1,37 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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

@@ -1,229 +0,0 @@
-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;
-	}
-}