calabash-android 0.2.15 → 0.2.16

data/CHANGES.txt

@@ -1,3 +1,11 @@
+0.2.16:
+      Added --google-maps-support option.
+      By default no actions from sh.calaba.instrumentationbackend.actions.map
+      will be available. By adding the --google-maps-support all actions will
+      be baked into the test server.
+
+      Removed colors from cucumber output on Windows
+
 0.2.15:
       Fixed bug related to Google maps api add-on being located at different location
       in different api versions.

data/bin/calabash-android

@@ -23,6 +23,10 @@ def relative_to_full_path(file_path)
   File.expand_path(file_path)
 end
 
+def raise_if_android_home_not_set
+  raise "Please set the ANDROID_HOME environment variable" unless ENV["ANDROID_HOME"]
+end
+
 if (ARGV.length == 0)
   print_usage
   exit 0
@@ -32,12 +36,14 @@ if cmd == 'help'
   print_help
   exit 0
 elsif cmd == 'build'
+  raise_if_android_home_not_set
   puts "Please specify the app you want to build a test server for" if (ARGV.empty? or not is_apk_file?(ARGV.first))
   while not ARGV.empty? and is_apk_file?(ARGV.first)
     calabash_build(relative_to_full_path(ARGV.shift))
   end
   exit 0
 elsif cmd == 'run'
+  raise_if_android_home_not_set
   if ARGV.empty? or not is_apk_file?(ARGV.first)
     calabash_run()
   else

data/bin/calabash-android-helpers.rb

@@ -29,6 +29,8 @@ def print_usage
   <options> can be
     -v, --verbose
       Turns on verbose logging
+    --google-maps-support
+      Adds supports for Google Maps to the test server
 EOF
 end
 

data/bin/calabash-android-run.rb

@@ -29,7 +29,8 @@ def calabash_run(app_path = nil)
   end
 
   STDOUT.sync = true
-  cmd = "cucumber -c #{ARGV.join(" ")} #{env}"
+  arguments = ARGV - ["--google-maps-support"]
+  cmd = "cucumber #{arguments.join(" ")} #{env} #{"-c" unless is_windows?}"
   puts cmd
   IO.popen(cmd) do |io|
     io.each { |s| print s }

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.2.15"
+    VERSION = "0.2.16"
   end
 end

data/test-server/build.xml

@@ -88,7 +88,10 @@
 
     <target name="-prepare.testserver" description="Makes sure the testserver matches the tested application by looking at its manifest file">
       <copy todir="${staging.dir}">
-				<fileset dir="instrumentation-backend"/>
+				<fileset dir="instrumentation-backend">
+          <exclude name="src/sh/calaba/instrumentationbackend/actions/map_unsupported/*.java" if="${google_maps_support}"/>
+          <exclude name="src/sh/calaba/instrumentationbackend/actions/map/*.java" unless="${google_maps_support}"/>
+        </fileset> 
       </copy>
       <copy todir="${staging.dir}/libs">
         <fileset erroronmissingdir="false" dir="${env.ANDROID_HOME}/add-ons/addon-google_apis-google_inc_-${android.api.level}/libs"/>

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

@@ -43,8 +43,7 @@ public class Actions {
                 }
             }
         } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
     }
 
@@ -57,13 +56,9 @@ public class Actions {
     }
 
     @SuppressWarnings("rawtypes")
-    private boolean isAction(Class action) {
-        for (Class i : action.getInterfaces()) {
-            if (i.equals(Action.class)) {
-                return true;
-            }
-        }
-        return false;
+    private boolean isAction(Class actionCandidate) {
+        boolean isImplementation = !actionCandidate.isInterface();
+        return isImplementation && Action.class.isAssignableFrom(actionCandidate);
     }
 
     private void put(Action action) {
@@ -71,8 +66,12 @@ public class Actions {
             Action duplicate = getActions().get(action.key());
             throw new RuntimeException("Found duplicate action key:'" + action.key() + "'. [" + duplicate.getClass().getName() + "," + action.getClass().getName() + "]");
         }
-        InstrumentationBackend.log("Added:'" + action.getClass().getSimpleName() + "', with key:'" + action.key() + "'");
-        getActions().put(action.key(), action);
+        if (action.key() == null) {
+            System.out.println("Skipping " + action.getClass() + ". Key is null.");
+        } else {
+            InstrumentationBackend.log("Added:'" + action.getClass().getSimpleName() + "', with key:'" + action.key() + "'");
+            getActions().put(action.key(), action);
+        }
     }
 
     public Action lookup(String key) {

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/GetMapBounds.java

@@ -0,0 +1,8 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class GetMapBounds extends UnsupportedMapAction {
+	@Override
+	public String key() {
+		return "get_map_bounds";
+	}
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/GetMapCenter.java

@@ -0,0 +1,8 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class GetMapCenter extends UnsupportedMapAction {
+	@Override
+	public String key() {
+		return "get_map_center";
+	}
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/GetMapMarker.java

@@ -0,0 +1,8 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class GetMapMarker extends UnsupportedMapAction {
+  @Override
+  public String key() {
+    return "get_map_marker";
+  }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/GetMapMarkers.java

@@ -0,0 +1,8 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class GetMapMarkers extends UnsupportedMapAction {
+  @Override
+  public String key() {
+   return "get_map_markers";
+  }
+}

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

@@ -0,0 +1,9 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class GetMapZoom extends UnsupportedMapAction {
+
+  @Override
+  public String key() {
+      return "get_map_zoom";
+  }
+}

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

@@ -0,0 +1,9 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class PanMapTo extends UnsupportedMapAction {
+
+  @Override
+  public String key() {
+      return "pan_map_to";
+  }
+}

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

@@ -0,0 +1,9 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class SetMapCenter extends UnsupportedMapAction {
+
+  @Override
+  public String key() {
+      return "set_map_center";
+  }
+}

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

@@ -0,0 +1,8 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class SetMapZoom extends UnsupportedMapAction {
+  @Override
+  public String key() {
+    return "set_map_zoom";
+  }
+}

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

@@ -0,0 +1,8 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class TapAwayFromMarkers extends UnsupportedMapAction {
+	@Override
+	public String key() {
+		return "tap_map_away_from_markers";
+	}
+}

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

@@ -0,0 +1,8 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+public class TapMapMarker extends UnsupportedMapAction {
+	@Override
+	public String key() {
+		return "tap_map_marker_by_title";
+	}
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/UnsupportedMapAction.java

@@ -0,0 +1,21 @@
+package sh.calaba.instrumentationbackend.actions.map_unsupported;
+
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class UnsupportedMapAction implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		throw new RuntimeException(
+			"Google Maps is not supported by default.\n" + 
+			"You can add support by following running calabash-android with --google-maps-support\n" + 
+			"See more at: https://github.com/calabash/calabash-android/wiki/Google-Maps-Support"
+			);
+	}
+
+	@Override
+	public String key() {
+		return null;
+	}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -190,6 +190,17 @@ 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/map_unsupported/GetMapBounds.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/GetMapCenter.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/GetMapMarker.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/GetMapMarkers.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/GetMapZoom.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/PanMapTo.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/SetMapCenter.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/SetMapZoom.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/TapAwayFromMarkers.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/TapMapMarker.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/UnsupportedMapAction.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