calabash-android 0.2.11 → 0.2.12

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

@@ -5,12 +5,10 @@ import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
 
 public class WaitForScreen implements Action {
+	private static final int DEFAULT_TIMEOUT = 5 * 1000;
 
     @Override
     public Result execute(String... args) {
-
-        final int DEFAULT_TIMEOUT = 5 * 1000;
-
         switch (args.length) {
         case 0:
             return new Result(false, "Cannot check for correct screen. No Activity name supplied!");
@@ -18,11 +16,14 @@ public class WaitForScreen implements Action {
             if (InstrumentationBackend.solo.waitForActivity(args[0], DEFAULT_TIMEOUT)) {
                 return Result.successResult();
             } else {
-                return new Result(false, "Screen " + args[0] + " not found");
+            	String currentActivity = InstrumentationBackend.solo.getCurrentActivity().getLocalClassName();
+            	Result result = new Result(false, "Screen " + args[0] + " not found.  Current activity is " + currentActivity);
+            	result.addBonusInformation(currentActivity);
+            	return result;
             }
         }
         case 2: { // 1st arg is Activity name, 2nd arg is timeout
-            int timeout = DEFAULT_TIMEOUT;
+            int timeout;
             
             try {
                 // given seconds; want milliseconds
@@ -34,7 +35,10 @@ public class WaitForScreen implements Action {
             if (InstrumentationBackend.solo.waitForActivity(args[0], timeout)) {
                 return Result.successResult();
             } else {
-                return new Result(false, "Screen " + args[0] + " not found");
+                String currentActivity = InstrumentationBackend.solo.getCurrentActivity().getLocalClassName();
+            	Result result = new Result(false, "Screen " + args[0] + " not found.  Current activity is " + currentActivity);
+            	result.addBonusInformation(currentActivity);
+            	return result;
             }
         }
         default:

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

@@ -0,0 +1,108 @@
+package sh.calaba.instrumentationbackend.actions.wait;
+
+import java.util.List;
+
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.View;
+import android.widget.TabHost;
+import android.widget.TextView;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+/**
+ * Waits for a tab by name
+ * 
+ * @author Nicholas Albion
+ */
+public class WaitForTab implements Action {
+
+    @Override
+    public Result execute(String... args) {
+
+        final int DEFAULT_TIMEOUT = 5 * 1000;
+        int timeout = DEFAULT_TIMEOUT;
+
+        switch (args.length) {
+        case 0:
+            return new Result(false, "Cannot check for correct screen. No tab name supplied!");
+        case 1: {
+        	return waitForTab( args[0], DEFAULT_TIMEOUT );
+        }
+        case 2: { // 1st arg is Activity name, 2nd arg is timeout
+            try {
+                timeout = Integer.parseInt(args[1]);
+            } catch (NumberFormatException e) {
+                return new Result(false, "Invalid timeout supplied. Should be an integer!"); 
+            }            
+            return waitForTab( args[0], timeout );
+        }
+        default:
+            return new Result(false, "Too many argument supplied to wait_for_tab!");
+        }
+    }
+    
+    private Result waitForTab( String tabName, int timeout ) {
+    	int tabHostIndex = 0;
+    	long startTime = SystemClock.uptimeMillis();
+    	// TabHost tabHost = InstrumentationBackend.solo.getView( TabHost.class, tabHostIndex );		// waits 10 seconds
+    	
+    	if( InstrumentationBackend.solo.waitForView( TabHost.class, 1, timeout ) ) {
+        	TabHost tabHost = (TabHost)InstrumentationBackend.solo.getView(TabHost.class, tabHostIndex);
+        	
+        	boolean tabFound = false;
+        	int numberOfTabs = tabHost.getChildCount();
+        	for( int i = 0; i < numberOfTabs; i++ ) {
+        		if( tabName.equals( tabHost.getTag(i) ) ) {
+        			tabFound = true;
+        			break;
+        		}
+        	}
+        	if( tabFound == false ) {
+        		Log.w("WaitForTab", "Tab was not found: " + tabName);
+//        		return new Result(false, "Tab " + tabName + " not found");
+        	}
+        	
+        	String currentTab;
+        	do {
+        		int tabIndex = tabHost.getCurrentTab();
+        		View view = tabHost.getTabWidget().getChildTabViewAt(tabIndex);
+        		if( view instanceof TextView ) {
+        			currentTab = ((TextView)view).getText().toString();	
+        			if( tabName.equals(currentTab) ) {
+        				return new Result(true, "The current tab text view matches");
+            		}
+        		} else {
+        			Log.i("WaitForTab", "current tab view: " + view.getId() + ", " + view.getClass().getSimpleName());
+        			List<TextView> textViews = InstrumentationBackend.solo.getCurrentTextViews(view);
+        			for( TextView textView : textViews ) {
+        				currentTab = textView.getText().toString();
+        				Log.i("WaitForTab", " child text view: " + currentTab);
+            			if( tabName.equals(currentTab) ) {
+            				return new Result(true, "The current tab text view matches");
+                		}
+					}
+        		}
+        		
+        		currentTab = tabHost.getCurrentTabTag();
+        		
+        		if( tabName.equals(currentTab) ) {
+        			return new Result(true, "The current tab's tag matches");
+        		}
+        		try {
+					Thread.sleep(500);
+				} catch (InterruptedException e) {}
+        	} while( (SystemClock.uptimeMillis() - startTime) < timeout );
+        
+            return new Result(false, "The current tab is: " + currentTab + ", was tab even found? " + tabFound);
+        } else {
+            return new Result(false, "Timed out waiting for a TabActivity. Current activity is " + InstrumentationBackend.solo.getCurrentActivity().getLocalClassName());
+        }
+    }
+
+    @Override
+    public String key() {
+        return "wait_for_tab";
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/{view → wait}/WaitForView.java

@@ -1,4 +1,4 @@
-package sh.calaba.instrumentationbackend.actions.view;
+package sh.calaba.instrumentationbackend.actions.wait;
 
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/{view → wait}/WaitForViewById.java

@@ -1,4 +1,4 @@
-package sh.calaba.instrumentationbackend.actions.view;
+package sh.calaba.instrumentationbackend.actions.wait;
 
 
 import sh.calaba.instrumentationbackend.Result;
@@ -12,26 +12,36 @@ public class WaitForViewById implements Action {
     @Override
     public Result execute(String... args) {
         String viewId = args[0];
-        System.out.println("Waiting for view with id '" + viewId + "'");
-        long endTime = System.currentTimeMillis() + 60000;
+        
+        try {
+        	if( getViewById(viewId, 60000) != null ) {
+        		return Result.successResult();
+        	} else {
+        		return new Result(false, "Timed out while waiting for view with id:'" + viewId + "'");
+        	}
+        } catch( InterruptedException e ) {
+    		return Result.fromThrowable(e);
+    	}
+    }
+    
+    protected View getViewById( String viewId, long timeout ) throws InterruptedException {
+    	System.out.println("Waiting for view with id '" + viewId + "'");
+        long endTime = System.currentTimeMillis() + timeout;
         while (System.currentTimeMillis() < endTime) {
             View view = TestHelpers.getViewById(viewId);
             System.out.println("Waiting for view with id '" + viewId + "' found view " + view);
 
             if (view != null) {
                 System.out.println("Waiting for view with id '" + viewId + "' Success");
-                return Result.successResult();
+                return view;
             } else {
-                try {
-                    System.out.println("Waiting for view with id '" + viewId + "' sleeping...");
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    return Result.fromThrowable(e);
-                }
+            	System.out.println("Waiting for view with id '" + viewId + "' sleeping...");
+            	Thread.sleep(500);
             }
         }
+        
         System.out.println("Waiting for view with id '" + viewId + "' Timed out");
-        return new Result(false, "Timed out while waiting for view with id:'" + viewId + "'");
+        return null;
     }
 
     @Override

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

@@ -62,9 +62,9 @@ public class QueryHelper {
 			int[] webviewLocation = new int[2];
 			webView.getLocationOnScreen(webviewLocation);
 			
-			//TODO: Exception if center_x or center_y are not integers
-			float x = webviewLocation[0] + (Integer)rectangle.get("center_x") * scale;
-			float y = webviewLocation[1] + (Integer)rectangle.get("center_y") * scale;
+			//TODO: Exception if center_x or center_y are not numbers
+			float x = webviewLocation[0] + ((Number)rectangle.get("center_x")).floatValue() * scale;
+			float y = webviewLocation[1] + ((Number)rectangle.get("center_y")).floatValue() * scale;
 			return new float[]{x, y};
 		} catch (Exception e) {
 			throw new RuntimeException(e);

metadata

@@ -1,89 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: calabash-android
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.2.12
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 11
-  version: 0.2.11
 platform: ruby
-authors: 
+authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-14 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: slowhandcuke
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: slowhandcuke
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: retriable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-description: "calabash-android drives tests for native  and hybrid Android apps. "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'calabash-android drives tests for native  and hybrid Android apps. '
+email:
 - jonas@lesspainful.com
-executables: 
+executables:
 - calabash-android
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .calabash_settings
 - CHANGES.txt
 - Gemfile
@@ -127,7 +126,9 @@ files:
 - lib/calabash-android/steps/context_menu_steps.rb
 - lib/calabash-android/steps/date_picker_steps.rb
 - lib/calabash-android/steps/enter_text_steps.rb
+- lib/calabash-android/steps/list_steps.rb
 - lib/calabash-android/steps/location_steps.rb
+- lib/calabash-android/steps/map_steps.rb
 - lib/calabash-android/steps/navigation_steps.rb
 - lib/calabash-android/steps/press_button_steps.rb
 - lib/calabash-android/steps/progress_steps.rb
@@ -139,6 +140,7 @@ files:
 - test-server/AndroidManifest.xml
 - test-server/build.xml
 - test-server/instrumentation-backend/.classpath
+- test-server/instrumentation-backend/.gitignore
 - test-server/instrumentation-backend/.project
 - test-server/instrumentation-backend/.settings/org.eclipse.jdt.core.prefs
 - test-server/instrumentation-backend/AndroidManifest.xml
@@ -150,6 +152,8 @@ files:
 - test-server/instrumentation-backend/res/drawable-mdpi/ic_launcher.png
 - 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/SoloEnhanced.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/CalabashInstrumentationTestRunner.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/Command.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java
@@ -172,9 +176,21 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/ClickOnScreen.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Swipe.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/helpers/ListActions.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/GetListItemProperties.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/GetListItemText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/LongPressListItems.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/PressListItems.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/location/FakeGPSLocation.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/GetMapBounds.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/GetMapCenter.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/GetMapMarker.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/GetMapMarkers.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/GetMapZoom.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/PanMapTo.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map/SetMapCenter.java
+- 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/scrolling/ScrollDown.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/scrolling/ScrollUp.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/DownKey.java
@@ -182,7 +198,9 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/GoBack.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/PressMenu.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/SelectFromMenuByText.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/spinner/GetSelectedSpinnerItemText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/spinner/SelectSpinnerItemByContentDescription.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/AssertGridViewContainsNoDuplicates.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/AssertText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/AssertTextOfSpecificTextViewByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/ClearTextById.java
@@ -192,21 +210,28 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/EnterTextByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/EnterTextById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/EnterTextByIndex.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/GetTextById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetDateByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetDateByIndex.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetTimeByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetTimeByIndex.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/AssertViewProperty.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/ClickOnViewById.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/GetActivityName.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/GetViewProperty.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/HasView.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/IsEnabled.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/LongPressOnViewById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/Press.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/WaitForView.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/WaitForViewById.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/SelectTab.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/Wait.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForDialogClose.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForProgress.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForScreen.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForTab.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForText.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForView.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForViewById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/CalabashChromeClient.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/DumpBodyHtml.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/DumpHtml.java
@@ -629,39 +654,28 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/package-info.java
 - test-server/calabash-js/src/calabash.js
 - test-server/calabash-js/src/set_text.js
-has_rdoc: true
 homepage: http://github.com/calabash
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
-