calabash-android 0.2.11 → 0.2.12

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

@@ -0,0 +1,97 @@
+package com.jayway.android.robotium.solo;
+
+import java.util.List;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+
+public class SoloEnhanced extends Solo {
+//	private Pincher pincher;
+	private MapViewUtils mapViewUtils;
+
+	public SoloEnhanced(Instrumentation instrumentation, Activity activity) {
+		super(instrumentation, activity);
+		this.mapViewUtils = new MapViewUtils(instrumentation, viewFetcher, sleeper, waiter);
+//		this.pincher = new Pincher(instrumentation, viewFetcher);
+	}
+
+	public void setMapCenter( double lat, double lon ) {
+		mapViewUtils.setCenter(lat, lon);
+	}
+	
+	/** @return {lat,lon} */
+	public double[] getMapCenter() {
+		return mapViewUtils.getMapCenter();
+	}
+	
+	public void panMapTo( double lat, double lon ) {
+		mapViewUtils.panTo(lat, lon);
+	}
+	
+	public boolean zoomInOnMap() {
+		return mapViewUtils.zoomIn();
+	}
+	
+	public boolean zoomOutOnMap() {
+		return mapViewUtils.zoomOut();
+	}
+	
+	public int setMapZoom( int zoomLevel ) {
+		return mapViewUtils.setZoom(zoomLevel);
+	}
+	
+	public int getMapZoom() {
+		return mapViewUtils.getZoom();
+	}
+	
+	public List<String> getMapMarkerItems() {
+		return mapViewUtils.getMarkerItems();
+	}
+	
+	public String getMapMarkerItem( String title ) {
+		return mapViewUtils.getMarkerItem( title );
+	}
+
+	/**
+	 * @param title
+	 * @param timeout in ms
+	 * @return
+	 */
+	public boolean tapMapMarkerItem( String title, long timeout ) {
+		return mapViewUtils.tapMarkerItem( title, timeout );
+	}
+	
+	public boolean tapMapAwayFromMarkers( int step ) {
+		return mapViewUtils.tapAwayFromMarkerItems( step );
+	}
+	
+	/**
+	 * @return [top, right, bottom, left] in decimal degrees
+	 */
+	public List<String> getMapBounds() {
+		return mapViewUtils.getBounds();
+	}
+	
+//	/**
+//	 * Sorry, doesn't work yet
+//	 * @param togetherOrApart - {@link Pincher#TOGETHER} or {@link Pincher#APART}
+//	 */
+//	public void pinch(int togetherOrApart) {
+//		switch( togetherOrApart ) {
+//		case Pincher.TOGETHER: pincher.pinch(Pincher.Direction.TOGETHER); break;
+//		case Pincher.APART: pincher.pinch(Pincher.Direction.APART); break;
+//		}
+//	}
+//	
+//	/**
+//	 * Sorry, doesn't work yet
+//	 * @param togetherOrApart - {@link Pincher#TOGETHER} or {@link Pincher#APART}
+//	 * @param view
+//	 */
+//	public void pinch(int togetherOrApart, View view) {
+//		switch( togetherOrApart ) {
+//		case Pincher.TOGETHER: pincher.pinch(Pincher.Direction.TOGETHER, view); break;
+//		case Pincher.APART: pincher.pinch(Pincher.Direction.APART, view); break;
+//		}
+//	}
+}

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

@@ -6,7 +6,7 @@ import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
-import com.jayway.android.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.SoloEnhanced;
 
 public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     public static final String TARGET_PACKAGE = "#ACTIVITY_PACKAGE#"; //Set from Ant at compile time
@@ -15,7 +15,7 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     private static final String TAG = "InstrumentationBackend";
     
     public static Instrumentation instrumentation;
-    public static Solo solo;
+    public static SoloEnhanced solo;
     public static Actions actions;
 
     private static Class getActivityClass() {
@@ -34,7 +34,7 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     protected void setUp() throws Exception {
         super.setUp();
         
-        solo = new Solo(getInstrumentation(), this.getActivity());
+        solo = new SoloEnhanced(getInstrumentation(), this.getActivity());
         actions = new Actions(getInstrumentation(), this);
         instrumentation = getInstrumentation();
         TestHelpers.loadIds(instrumentation.getContext());

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

@@ -12,6 +12,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import android.content.Context;
+import android.content.res.Resources.NotFoundException;
+import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.TextView;
 
@@ -69,6 +71,21 @@ public class TestHelpers {
         return null;
     }
 
+    @SuppressWarnings("unchecked")
+    public static <ViewType extends View> ViewType getViewById(String resName, Class<? extends View> expectedViewType) {
+        final View theView = getViewById(resName);
+
+        if (null == theView) {
+            return null;
+        }
+
+        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) {
         Integer intID = resourceNamesToIds.get(resName);
         System.out.println("getViewById: Looking for view " + resName + " as id " + intID);
@@ -76,7 +93,7 @@ public class TestHelpers {
             throw new RuntimeException("getViewById: Looking for view " + resName + " which does not have an id");
         }
         int id = intID.intValue();
-        View view = InstrumentationBackend.solo.getCurrentActivity().findViewById(id);
+        View view = InstrumentationBackend.solo.getView(id);
         if (view != null) {
             if (id == view.getId()) {
                 System.out.println("Did find view " + resName + ".");
@@ -87,6 +104,39 @@ public class TestHelpers {
         System.out.println("Did not find view " + resName);
         return view;
     }
+    
+    public static Drawable getDrawableById(String resName) {
+    	int id;
+// This would probably work too...
+if( true ) {
+    	try {
+//    		if( resName.startsWith("drawable/") == false ) {
+//    			resName = "drawable/" + resName;
+//    		}
+//    		TypedValue outValue = new TypedValue();
+//    		InstrumentationBackend.solo.getCurrentActivity().getResources().getValue( resName, outValue, false );
+//    		id = outValue.resourceId;
+    		id = InstrumentationBackend.solo.getCurrentActivity().getResources().getIdentifier( resName, "drawable", InstrumentationBackend.solo.getCurrentActivity().getPackageName() );
+    	} catch( NotFoundException e ) {
+    		throw new RuntimeException("getDrawableById: Looking for drawable " + resName + " but was not found");
+    	}
+} else {
+    	Integer intID = resourceNamesToIds.get(resName);
+        System.out.println("getDrawableById: Looking for drawable " + resName + " as id " + intID);
+        if (intID == null) {
+            throw new RuntimeException("getDrawableById: Looking for drawable " + resName + " which does not have an id");
+        }
+        id = intID.intValue();
+}
+        Drawable drawable = InstrumentationBackend.solo.getCurrentActivity().getResources().getDrawable(id);
+        if (drawable != null) {
+            System.out.println("Did find drawable " + resName + ": " + drawable);
+            return drawable;
+        } else {
+        	System.out.println("Did not find drawable " + resName);
+        	return drawable;
+        }
+    }
 
     public static int[] parseTime(String timeString) {
         String[] splitTimeString = timeString.split(":");

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

@@ -0,0 +1,195 @@
+package sh.calaba.instrumentationbackend.actions.list;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+/**
+ * args: 
+ * <ul> 
+ *   <li>1-based list index (first list is used if not specified)</li>
+ *   <li>1-based row index (returns all rows if &lt;=0 or not specified)</li>
+ * </ul>
+ * 
+ * eg: (all items of 1st list) <code>performAction( 'get_list_item_properties' )</code>
+ * eg: (all items of 2nd list) <code>performAction( 'get_list_item_properties', '2' )</code>
+ * eg: (1st item of 2nd list) <code>performAction( 'get_list_item_properties', '2' , '1' )</code>
+ * 
+ * @return <code>bonusInformation</code> contain an array of Strings, one for each row in the list (or only for the specified row):
+ *   eg: {[{"id":"title", "text":"My Title", "compoundDrawables":["left"]}, {"id":"subtitle", "text":"Another text field for the same list item"}]}
+ *   
+ *   
+ * In ruby, we can then parse the response:
+ * <pre>
+ *   response_table = result['bonusInformation']
+ *   response_table.each_with_index do | row_data, index |
+ *     row_data = JSON.parse( row_data )
+ *     response_table[index] = row_data
+ *   end
+ * </pre>
+ * 
+ * @author Nicholas Albion
+ */
+public class GetListItemProperties implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		int listIndex;
+		int rowIndex = -1;
+
+		if( args.length == 0 ) {
+			listIndex = 0;
+		} else {
+			if( args.length > 1 ) {
+				rowIndex = (Integer.parseInt(args[1]) - 1);
+			}
+			listIndex = (Integer.parseInt(args[0]) - 1);
+		}
+
+
+		ArrayList<ListView> listViews = InstrumentationBackend.solo.getCurrentListViews();
+		if( listViews == null || listViews.size() <= listIndex ) {
+			return new Result(false, "Could not find list #" + (listIndex + 1));
+		}
+
+		ListView list = listViews.get(listIndex);
+		Result result = new Result(true);
+
+		if( rowIndex < 0 ) {
+			int count = list.getChildCount();
+			for( int i = 0; i < count; i++ ) {
+				result.addBonusInformation( getListItemString( list.getChildAt(i) ) );
+			}
+		} else {
+			result.addBonusInformation( getListItemString( list.getChildAt(rowIndex) ) );
+		}
+
+		return result;
+	}
+
+	/**
+	 * @return <code>bonusInformation</code> contain an array of Strings, one for each row in the list (or only for the specified row):
+	 *   eg: {[{"id":"title", "text":"My Title", "compoundDrawables":{"left":"drawable_id"}}, {"id":"subtitle", "text":"Another text field for the same list item"}]}
+	 */
+	private String getListItemString( View row ) {
+		StringBuilder json = new StringBuilder("{");
+
+		if( row instanceof TextView ) {
+			addViewInfo( json, (TextView)row );
+		} else if( row instanceof ViewGroup ) {
+			addViewInfo( json, (ViewGroup)row );
+		}
+
+		json.deleteCharAt( json.length() - 1 );		// remove the last comma
+		json.append('}');
+		return json.toString();
+	}
+
+	private void addViewInfo( StringBuilder json, TextView view ) {
+		int resId = view.getId();
+		String resIdName = view.getResources().getResourceEntryName(resId);
+
+		json.append("\"id\":\"").append(resIdName).append("\", \"text:\"").append( ((TextView)view).getText() ).append("\"");
+
+		json.append(", \"color\":").append( view.getCurrentTextColor() );
+		Drawable background = view.getBackground();
+		if( background instanceof ColorDrawable ) {
+			try {
+				// As pointed out by kbielenberg, ColorDrawable.getColor() was only added in level 11/Android 3/Honeycomb
+				Method getColor = ColorDrawable.class.getMethod("getColor");
+				Integer color = (Integer)getColor.invoke(background);
+				json.append(", \"background\":").append( color );
+			} catch (Exception e) {}
+		}
+
+		StringBuilder compoundStr = new StringBuilder();
+		Drawable[] compoundDrawables = view.getCompoundDrawables();	//  left, top, right, and bottom
+		if( compoundDrawables[0] != null ) {
+			compoundStr.append("\"left\"");
+		}
+		if( compoundDrawables[1] != null ) {
+			if( compoundStr.length() != 0 ) {
+				compoundStr.append(',');
+			}
+			compoundStr.append("\"top\"");
+		}
+		if( compoundDrawables[2] != null ) {
+			if( compoundStr.length() != 0 ) {
+				compoundStr.append(',');
+			}
+			compoundStr.append("\"right\"");
+		}
+		if( compoundDrawables[3] != null ) {
+			if( compoundStr.length() != 0 ) {
+				compoundStr.append(',');
+			}
+			compoundStr.append("\"bottom\"");
+		}
+		if( compoundStr.length() != 0 ) {
+			json.append(", \"compoundDrawables\":[").append(compoundStr).append(']');
+		}
+	}
+
+	private void addViewInfo( StringBuilder json, TableRow tableRow ) {
+		json.append("\"cells\":[");
+
+		int count = tableRow.getVirtualChildCount();
+		for( int i = 0; i < count; i++ ) {
+			if( i != 0 ) {
+				json.append(", ");
+			}
+			json.append("{\"column\":").append(i).append(", ");
+
+			View view = tableRow.getVirtualChildAt(i);
+			if( view instanceof TextView ) {
+				addViewInfo( json, (TextView)view );
+			} else if( view instanceof ViewGroup ) {
+				addViewInfo( json, (ViewGroup)view );
+			}
+
+			json.append('}');
+		}
+
+		json.append(']');
+	}
+
+	private void addViewInfo( StringBuilder json, ViewGroup viewGroup ) {
+		json.append("\"children\":[");
+
+		int count = viewGroup.getChildCount();
+		for( int i = 0; i < count; i++ ) {
+			if( i != 0 ) {
+				json.append(", ");
+			}
+			json.append('{');
+
+			View view = viewGroup.getChildAt(i);
+			if( view instanceof TextView ) {
+				addViewInfo( json, (TextView)view );
+			} else if( view instanceof TableRow ) {
+				addViewInfo( json, (TableRow)view );
+			} else if( view instanceof ViewGroup ) {
+				addViewInfo( json, (ViewGroup)view );
+			}
+
+			json.append('}');
+		}
+
+		json.append(']');
+	}
+
+	@Override
+	public String key() {
+		return "get_list_item_properties";
+	}
+}

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

@@ -0,0 +1,136 @@
+package sh.calaba.instrumentationbackend.actions.list;
+
+import java.util.ArrayList;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+/**
+ * args: 
+ * <ul> 
+ *   <li>1-based list index (first list is used if not specified)</li>
+ *   <li>1-based row index (returns all rows if &lt;=0 or not specified)</li>
+ * </ul>
+ * 
+ * eg: (all items of 1st list) <code>performAction( 'get_list_item_text' )</code>
+ * eg: (all items of 2nd list) <code>performAction( 'get_list_item_text', '2' )</code>
+ * eg: (1st item of 2nd list) <code>performAction( 'get_list_item_text', '2' , '1' )</code>
+ * 
+ * @return <code>bonusInformation</code> contain an array of Strings, one for each row in the list (or only for the specified row):
+ *   eg: {"title":"My Title", "subtitle":"Another text field for the same list item"}
+ *   
+ *   
+ * In ruby, we can then parse the response:
+ * <pre>
+ *   response_table = result['bonusInformation']
+ *   response_table.each_with_index do | row_data, index |
+ *     row_data = JSON.parse( row_data )
+ *     response_table[index] = row_data
+ *   end
+ * </pre>
+ * 
+ * @author Nicholas Albion
+ */
+public class GetListItemText implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		int listIndex;
+		int rowIndex = -1;
+
+		if( args.length == 0 ) {
+			listIndex = 0;
+		} else {
+			if( args.length > 1 ) {
+				rowIndex = (Integer.parseInt(args[1]) - 1);
+			}
+			listIndex = (Integer.parseInt(args[0]) - 1);
+		}
+
+
+		ArrayList<ListView> listViews = InstrumentationBackend.solo.getCurrentListViews();
+		Log.d("GetListItemText", "Found " + listViews.size() + " list views");
+		if( listViews == null || listViews.size() <= listIndex ) {
+			return new Result(false, "Could not find list #" + (listIndex + 1));
+		}
+
+		ListView list = listViews.get(listIndex);
+		Result result = new Result(true);
+
+		if( rowIndex < 0 ) {
+			int count = list.getChildCount();
+			Log.d("GetListItemText", "Found " + count + " list items");
+			for( int i = 0; i < count; i++ ) {
+				result.addBonusInformation( getListItemString( list.getChildAt(i) ) );
+			}
+		} else {
+			result.addBonusInformation( getListItemString( list.getChildAt(rowIndex) ) );
+		}
+
+		return result;
+	}
+
+	/**
+	 * @return <code>bonusInformation</code> contain an array of Strings, one for each row in the list (or only for the specified row):
+	 *   eg: {"title":"My Title", "subtitle":"Another text field for the same list item"}
+	 */
+	private String getListItemString( View row ) {
+		StringBuilder json = new StringBuilder("{");
+
+		if( row instanceof TextView ) {
+			addViewInfo( json, (TextView)row );
+		} else if( row instanceof ViewGroup ) {
+			addViewInfo( json, (ViewGroup)row );
+		}
+
+		json.deleteCharAt( json.length() - 1 );		// remove the last comma
+		json.append('}');
+		return json.toString();
+	}
+
+	private void addViewInfo( StringBuilder json, TextView view ) {
+		int resId = view.getId();
+		String resIdName = view.getResources().getResourceEntryName(resId);
+
+		//json.append("\"id\":\"").append(resIdName).append("\", \"text:\"").append( ((TextView)row).getText() ).append("\"");
+		json.append('"').append(resIdName).append("\":\"").append( ((TextView)view).getText() ).append("\",");
+	}
+
+	private void addViewInfo( StringBuilder json, TableRow tableRow ) {
+		int count = tableRow.getVirtualChildCount();
+		for( int i = 0; i < count; i++ ) {
+			View view = tableRow.getVirtualChildAt(i);
+			if( view instanceof TextView ) {
+				addViewInfo( json, (TextView)view );
+			} else if( view instanceof ViewGroup ) {
+				addViewInfo( json, (ViewGroup)view );
+			}
+		}
+	}
+
+	private void addViewInfo( StringBuilder json, ViewGroup viewGroup ) {
+		int count = viewGroup.getChildCount();
+		for( int i = 0; i < count; i++ ) {
+			View view = viewGroup.getChildAt(i);
+			if( view instanceof TextView ) {
+				addViewInfo( json, (TextView)view );
+			} else if( view instanceof TableRow ) {
+				addViewInfo( json, (TableRow)view );
+			} else if( view instanceof ViewGroup ) {
+				addViewInfo( json, (ViewGroup)view );
+			}
+		}
+	}
+
+	@Override
+	public String key() {
+		return "get_list_item_text";
+	}
+}