calabash-android 0.3.3 → 0.3.4

data/CHANGES.txt

@@ -1,3 +1,8 @@
+0.3.4:
+      Removed maps_unsupported
+      The test will fail at run time if the device does not have
+      com.google.android.maps installed.
+
 0.3.3:
       A series of bugfixes.
 

data/bin/calabash-android-helpers.rb

@@ -17,7 +17,7 @@ def print_usage
       prints more detailed help information.
     gen
       generate a features folder structure.
-    setup 
+    setup
       sets up a non-default keystore to use with this test project.
     build <apk>
       builds the test server that will be used when testing the app.
@@ -29,8 +29,6 @@ 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

@@ -39,7 +39,7 @@ def calabash_run(app_path = nil)
   end
 
   STDOUT.sync = true
-  arguments = ARGV - ["--google-maps-support", "--no-build"]
+  arguments = ARGV - ["--no-build"]
   cmd = "cucumber #{arguments.join(" ")} #{env}"
   log cmd
   exit_code = system(cmd)

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/test-server/build.xml

@@ -5,7 +5,7 @@
     </description>
 
     <property name="adb.device.arg" value="" />
-    <property environment="env"/>    
+    <property environment="env"/>
     <property file="build.properties"/>
     <property name="staging.dir" location="staging"/>
     <property name="bin.dir" location="bin"/>
@@ -31,7 +31,7 @@
     <taskdef name="apkbuilder" classname="com.android.ant.ApkBuilderTask" classpathref="android.antlibs" />
 
 
-    
+
 
     <path id="jar.libs.ref">
       <fileset dir="${staging.dir}/libs/" includes="*.jar" />
@@ -40,7 +40,7 @@
     <path id="cucumber.path">
       <fileset dir="cucumber/" includes="*.jar" />
     </path>
-    
+
     <path id="android.target.classpath">
       <fileset dir="${env.ANDROID_HOME}/platforms/android-${android.api.level}/" includes="*.jar"/>
     </path>
@@ -60,10 +60,7 @@
 
     <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">
-          <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> 
+				<fileset dir="instrumentation-backend" />
       </copy>
       <copy todir="${staging.dir}/libs">
         <fileset erroronmissingdir="false" dir="${env.ANDROID_HOME}/add-ons/addon-google_apis-google_inc_-${android.api.level}/libs"/>
@@ -77,7 +74,7 @@
 
     <target name="-compile">
       <antcall target="-stage" />
-      <javac 
+      <javac
 	       srcdir="${staging.dir}/src"
 	       destdir="${bin.dir}"
 	       verbose="${verbose}"
@@ -90,7 +87,7 @@
       </javac>
     </target>
 
-    
+
     <target name="package" depends="-check.preconditions">
       <antcall target="-compile" />
       <antcall target="-aapt" />
@@ -98,7 +95,7 @@
       <antcall target="-apk" />
     </target>
 
-    
+
     <target name="clean" description="clean up">
       <delete dir="${staging.dir}"/>
       <delete dir="${bin.dir}"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -215,17 +215,6 @@ 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/search/EnterQueryByIndex.java

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

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

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

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

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

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

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

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

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

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

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

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