calabash-android 0.4.22.pre4 → 0.5.0.pre1

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

@@ -1,22 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.text;
-
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-
-public class ClickOnText implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        InstrumentationBackend.solo.clickOnText(args[0]);
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "click_on_text";
-    }
-
-}

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

@@ -1,32 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.text;
-
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-import android.widget.EditText;
-
-
-public class EnterTextByContentDescription implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        View view = TestHelpers.getTextViewByDescription(args[1]);
-        if(view == null) {
-            return new Result(false, "No view found with content description: '" + args[1] + "'");
-        } else if (!(view instanceof EditText)) {
-            return new Result(false, "Expected EditText found: '" + view.getClass() + "'");
-        } else {
-            InstrumentationBackend.solo.enterText((EditText)view, args[0]);
-            return Result.successResult();
-        }
-    }
-
-    @Override
-    public String key() {
-        return "enter_text_into_named_field";
-    }
-
-}

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

@@ -1,33 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.text;
-
-import android.view.View;
-import android.widget.EditText;
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-public class EnterTextById implements Action {
-
-	@Override
-	public Result execute(String... args) {
-        if(args[1] == null) {
-            return Result.failedResult("Input text cannot be null");
-        }
-        View view = TestHelpers.getViewById(args[1]);
-        if(view == null) {
-            return new Result(false, "No view found with id: '" + args[1] + "'");
-        } else if (!(view instanceof EditText)) {
-            return new Result(false, "Expected EditText found: '" + view.getClass() + "'");
-        } else {
-            InstrumentationBackend.solo.enterText((EditText)view, args[0]);
-            return Result.successResult();
-        }
-	}
-
-	@Override
-	public String key() {
-		return "enter_text_into_id_field";
-	}
-
-}

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

@@ -1,22 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.text;
-
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-
-public class EnterTextByIndex implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        InstrumentationBackend.solo.enterText(Integer.parseInt(args[1]) - 1, args[0]);
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "enter_text_into_numbered_field";
-    }
-
-}

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

@@ -1,42 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.text;
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-import android.widget.TextView;
-
-public class GetTextById implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        String idArgument = args[0];
-        final View theView = TestHelpers.getViewById(idArgument);
-
-        if (null == theView) {
-            return notFoundResult(idArgument);
-        } else if (!(theView instanceof TextView)) {
-            return foundButNotATextViewResult(idArgument, theView);
-        }
-        
-        return new Result(true, textOf(theView));
-    }
-
-    @Override
-    public String key() {
-        return "get_text_by_id";
-    }
-
-    private String textOf(final View theView) {
-        return ((TextView)theView).getText().toString();
-    }
-
-    private Result foundButNotATextViewResult(String idArgument, final View theView) {
-        return Result.failedResult(String.format("Found View with id %s but it is a %s not a %s", idArgument, theView.getClass().getName(), TextView.class.getName()));
-    }
-
-    private Result notFoundResult(String idArgument) {
-        return Result.failedResult(String.format("View with id %s was not found.", idArgument));
-    }
-
-}

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

@@ -1,141 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.DrawableContainer;
-import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-
-/**
- * eg: performAction( 'assert_view_property', 'my_view', 'visibility', 'visible' )  // or invisible/gone
- * eg: performAction( 'assert_view_property', 'my_view', 'drawable', 'expected_id' )
- * eg: performAction( 'assert_view_property', 'my_view', 'compoundDrawables', 'left', 'expected_id' )
- * 
- * @author Nicholas Albion
- */
-public class AssertViewProperty extends GetViewProperty implements Action {
-	private static final String TAG = "assert_view_property";
-
-	@Override
-	protected Result getPropertyValue( String propertyName, View view, String[] args ) throws NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		if( "compoundDrawables".equals(propertyName) ) {
-			if( view instanceof TextView ) {
-				// performAction( 'get_view_property', 'my_view', 'compoundDrawables', 'left', 'expected_id'
-				String expected_id = args[3];
-				int pos;
-				if( "top".equals(args[2]) ) {
-					pos = 1;
-				} else if( "right".equals(args[2]) ) {
-					pos = 2;
-				} else if( "bottom".equals(args[2]) ) {
-					pos = 3;
-				} else {
-					pos = 0;
-				}
-				Drawable[] drawables = ((TextView)view).getCompoundDrawables();		// [left, top, right, bottom]
-				Drawable actualDrawable = drawables[pos];
-				Drawable expectedDrawable = TestHelpers.getDrawableById(expected_id);
-				return assertSameDrawables( propertyName + ", " + args[2], expectedDrawable, actualDrawable );
-			} else {
-				throw new IllegalArgumentException("compoundDrawables is only supported for subclasses of TextView, not " + view.getClass().getName());
-			}
-		} else {
-			return super.getPropertyValue(propertyName, view, args);
-		}
-	}
-	
-	/**
-	 * @param propertyName
-	 * @param propertyValue
-	 * @param args
-	 * @return successResult if <code>propertyValue</code> is equal to <code>args[2]</code>
-	 * 			otherwise provides a descriptive message and the expected and actual values in the <code>bonusInformation</code> 
-	 */
-	@Override
-	protected Result processProperty( String propertyName, Object propertyValue, String[] args ) {
-		String expected = args[2];
-		String value;
-		if( propertyValue == null ) {
-			if( expected == null || "null".equals(expected) ) {
-				return Result.successResult();
-			}
-			value = "null";
-		} else if( "drawable".equals(propertyName) ) {
-			Drawable actualDrawable = (Drawable)propertyValue; //  ((ImageButton)view).getDrawable();
-			if( actualDrawable instanceof DrawableContainer ) {
-				actualDrawable = ((DrawableContainer)actualDrawable).getCurrent();
-			}
-			Drawable expectedDrawable = TestHelpers.getDrawableById(expected);
-			return assertSameDrawables( propertyName, expectedDrawable, actualDrawable );
-		} else {
-			value = propertyValue.toString();
-			if( value.equals(expected) ) {
-				return Result.successResult();
-			}
-		}
-		Result result = new Result(false, "For " + propertyName + " expected " + expected + " but was actually " + value);
-		result.addBonusInformation( expected );
-		result.addBonusInformation( value );
-		return result;
-	}
-    
-	private Result assertSameDrawables( String propertyName, Drawable expectedDrawable, Drawable actualDrawable ) {
-		if( sameDrawables( expectedDrawable, actualDrawable) ) {
-			return Result.successResult();
-		} else {
-			Result result = new Result(false, "For " + propertyName + " expected " + expectedDrawable + " but was actually " + actualDrawable);
-			result.addBonusInformation( expectedDrawable == null ? "null" : expectedDrawable.toString() );
-			result.addBonusInformation( actualDrawable == null ? "null" : actualDrawable.toString() );
-			return result;
-		}
-	}
-	
-	private boolean sameDrawables( Drawable expected, Drawable actual ) {
-		if( expected.equals(actual) ) {
-			return true;
-		}
-		if( expected instanceof DrawableContainer ) {
-			expected = ((DrawableContainer)expected).getCurrent();
-		}
-		if( actual instanceof DrawableContainer ) {
-			actual = ((DrawableContainer)actual).getCurrent();
-		}
-		if( (expected instanceof BitmapDrawable) && (actual instanceof BitmapDrawable) ) {
-			Bitmap expectedBitmap = ((BitmapDrawable)expected).getBitmap();
-			Bitmap actualBitmap = ((BitmapDrawable)actual).getBitmap();
-			try {
-				// As pointed out by kbielenberg, Bitmap.sameAs() was only added in level 12/Android 3.1/Honeycomb MR1
-				Method sameAs = Bitmap.class.getMethod("sameAs", Bitmap.class);
-				return (Boolean)sameAs.invoke( expectedBitmap, actualBitmap );
-			} catch (Exception e) {
-				if( expectedBitmap.getWidth() != actualBitmap.getWidth() ) { return false; }
-				if( expectedBitmap.getHeight() != actualBitmap.getHeight() ) { return false; }
-				if( expectedBitmap.getConfig() != actualBitmap.getConfig() ) { return false; }
-				boolean bitmapsEqual = expectedBitmap.equals(actualBitmap);
-				if( !bitmapsEqual ) {
-					Log.i(TAG, "Bitmaps are not equal");
-				}
-				boolean drawablesEqual = expected.equals(actual);
-				if( !drawablesEqual ) {
-					Log.i(TAG, "Drawables are not equal");
-				}
-				return bitmapsEqual && drawablesEqual;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public String key() {
-		return "assert_view_property";
-	}
-}

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

@@ -1,46 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-
-/*
- * Warning: Unlike most other actions this action will allow you to click on views that are not visible.
- */
-public class ClickOnViewByDescription implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        final View view = TestHelpers.getViewByDescription(args[0]);
-
-        if(view == null) {
-            return new Result(false, "Could not find view with description: '" + args[0] + "'");
-        }
-        try {
-            System.out.println("Clicking on view: " + view.getClass());
-            InstrumentationBackend.solo.clickOnView(view);		
-            return Result.successResult();
-		} catch(junit.framework.AssertionFailedError e) {
-			System.out.println("solo.clickOnView failed - using fallback");
-			if (view.isClickable()) {
-				InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
-					public void run() {
-						view.performClick();
-					}	
-				});
-			}
-		}
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "click_on_view_by_description";
-    }
-
-   
-    
-}

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

@@ -1,56 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-
-
-/*
- * Warning: Unlike most other actions this action will allow you to click on views that are not visible.
- */
-public class ClickOnViewById implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        final View view = TestHelpers.getViewById(args[0]);
-
-        if(view == null) {
-            return new Result(false, "Could not find view with id: '" + args[0] + "'");
-        }
-		try {
-			System.out.println("Clicking on view: " + view.getClass());
-			System.out.println(view.getLeft());
-			System.out.println(view.getTop());
-			System.out.println(view.getWidth());
-			System.out.println(view.getHeight());
-			int[] xy = new int[2];
-
-			view.getLocationOnScreen(xy);
-			System.out.println(xy[0]);
-			System.out.println(xy[1]);
-			
-			InstrumentationBackend.solo.clickOnView(view);		
-		} catch(junit.framework.AssertionFailedError e) {
-			System.out.println("solo.clickOnView failed - using fallback");
-			if (view.isClickable()) {
-				InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
-					public void run() {
-						view.performClick();
-					}	
-				});
-			}
-		}
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "click_on_view_by_id";
-    }
-
-   
-    
-}

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

@@ -1,101 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import sh.calaba.instrumentationbackend.actions.wait.WaitForViewById;
-import android.view.View;
-
-/**
- * eg: performAction( 'get_view_property', 'my_view', 'visibility')  => visible, invisible or gone
- * 
- * @see AssertViewProperty
- * @author Nicholas Albion
- */
-public class GetViewProperty extends WaitForViewById implements Action {
-
-	@Override
-	public Result execute(String... args) {
-		String viewId = args[0];
-        
-        try {
-        	View view = getViewById(viewId, 60000);
-        	if( view != null ) {
-        		String propertyName = args[1];
-        		return getPropertyValue(propertyName, view, args);
-        	} else {
-        		return new Result(false, "Timed out while waiting for view with id:'" + viewId + "'");
-        	}
-        } catch( Exception e ) {
-    		return Result.fromThrowable(e);
-        }
-	}
-	
-	/**
-	 * @param propertyName
-	 * @param view
-	 * @param args - used by {@link AssertViewProperty#getPropertyValue}
-	 * @return
-	 * @throws NoSuchMethodException
-	 * @throws IllegalArgumentException
-	 * @throws IllegalAccessException
-	 * @throws InvocationTargetException
-	 */
-	protected Result getPropertyValue( String propertyName, View view, String[] args ) throws NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		if( "visibility".equals(propertyName) ) {
-			String value;
-			
-			switch( view.getVisibility() ) {
-			case View.VISIBLE:
-				value = "visible";
-				break;
-			case View.INVISIBLE:
-				value = "invisible";
-				break;
-			case View.GONE:
-				value = "gone";
-				break;
-			default:
-				value = Integer.toString(view.getVisibility());
-			}
-			
-			return new Result( true, value );
-		} else {
-			// resort to reflection
-			Class<? extends View> clazz = view.getClass();
-			Method method = null;
-			try {
-				String methodName = propertyName;
-				method = clazz.getMethod( methodName );
-			} catch( NoSuchMethodException e ) {
-				try {
-					String methodName = "get" + Character.toUpperCase(propertyName.charAt(0)) + propertyName.substring(1);
-					method = clazz.getMethod( methodName );
-				} catch( NoSuchMethodException e2 ) {
-					String methodName = "is" + Character.toUpperCase(propertyName.charAt(0)) + propertyName.substring(1);
-					method = clazz.getMethod( methodName );
-				}
-			}
-			Object valueObj = method.invoke(view);
-			return processProperty( propertyName, valueObj, args );
-		}
-	}
-	
-	/**
-	 * @param propertyName
-	 * @param propertyValue
-	 * @param args - used by {@link AssertViewProperty#getPropertyValue}
-	 * @return a successful result with the requested property as the <code>message</code> field
-	 */
-	protected Result processProperty( String propertyName, Object propertyValue, String[] args ) {
-		String message = (propertyValue == null) ? "null" : propertyValue.toString();
-		return new Result( true, message );
-	}
-
-	@Override
-	public String key() {
-		return "get_view_property";
-	}
-}