calabash-android 0.2.22 → 0.3.0.pre1

data/Rakefile

@@ -1,2 +1,51 @@
 require 'bundler'
+load 'lib/calabash-android/helpers.rb'
+
+def build
+  test_server_template_dir = File.join(File.dirname(__FILE__), 'test-server')
+  
+  Dir.mktmpdir do |workspace_dir|
+    
+    @test_server_dir = File.join(workspace_dir, 'test-server')
+    FileUtils.cp_r(test_server_template_dir, workspace_dir)
+    
+    ant_executable = (is_windows? ? "ant.bat" : "ant")
+    args = [
+      ant_executable,
+      "clean", 
+      "package",
+      "-Dandroid.api.level=#{api_level}",
+    ]
+    Dir.chdir(@test_server_dir) do
+      STDOUT.sync = true
+      IO.popen(args.join(" ")) do |io|
+        io.each { |s| print s }
+      end
+      if $?.exitstatus != 0
+        puts "Could not build the test server. Please see the output above."
+        exit $?.exitstatus
+      end
+    end
+
+    FileUtils.mkdir_p "test_servers" unless File.exist? "test_servers"
+    
+    FileUtils.cp(File.join(@test_server_dir, "bin", "Test_unsigned.apk"), File.join(File.dirname(__FILE__), 'lib/calabash-android/lib/TestServer.apk'))
+  end
+end
+
+
+
+task :build do
+  unless File.exists? "test-server/calabash-js/src"
+    puts "calabash-js not found!"
+    puts "For instuctions see: https://github.com/calabash/calabash-android/wiki/Building-calabash-android"
+    exit 1
+  end
+
+  build
+
+  Rake::Task["install"].execute
+
+end
+
 Bundler::GemHelper.install_tasks

data/bin/calabash-android-build.rb

@@ -1,48 +1,25 @@
 def calabash_build(app)
-
-
-
   keystore = read_keystore_info()
 
-  test_server_template_dir = File.join(File.dirname(__FILE__), '..', 'test-server')
-  
-  Dir.mktmpdir do |workspace_dir|
-    
-    @test_server_dir = File.join(workspace_dir, 'test-server')
-    FileUtils.cp_r(test_server_template_dir, workspace_dir)
-    
-    ant_executable = (is_windows? ? "ant.bat" : "ant")
-    args = [
-      ant_executable,
-      "clean", 
-      "package",
-      "-Dtested.package_name=#{package_name(app)}",
-      "-Dtested.main_activity=#{main_activity(app)}",
-      "-Dtested.project.apk=\"#{app}\"",
-      "-Dandroid.api.level=#{api_level}",
-      "-Dkey.store=\"#{File.expand_path keystore["keystore_location"]}\"",
-      "-Dkey.store.password=#{keystore["keystore_password"]}",
-      "-Dkey.alias=#{keystore["keystore_alias"]}",
-      "-Dkey.alias.password=#{keystore["keystore_alias_password"]}",
-    ]
-    Dir.chdir(@test_server_dir) {
-      STDOUT.sync = true
-      IO.popen(args.join(" ")) do |io|
-        io.each { |s| print s }
-      end
-      if $?.exitstatus != 0
-        puts "Could not build the test server. Please see the output above."
-        exit $?.exitstatus
-      end
-    }
+  test_server_file_name = test_server_path(app)
+  unsigned_test_apk = File.join(File.dirname(__FILE__), '..', 'lib/calabash-android/lib/TestServer.apk')
+  android_platform = Dir["#{ENV["ANDROID_HOME"]}/platforms/android-*"].last
 
-    FileUtils.mkdir_p "test_servers" unless File.exist? "test_servers"
+  Dir.mktmpdir do |workspace_dir|
+    Dir.chdir(workspace_dir) do
+      FileUtils.cp(unsigned_test_apk, "TestServer.apk")
+      FileUtils.cp(File.join(File.dirname(__FILE__), '..', 'test-server/AndroidManifest.xml'), "AndroidManifest.xml")
 
-    test_apk = File.join(@test_server_dir, "bin", "Test.apk")
-    test_server_file_name = test_server_path(app)
-    FileUtils.cp(test_apk, test_server_file_name)
-    puts "Done building the test server. Moved it to #{test_server_file_name}"
+      system  %Q{ruby -pi.bak -e "gsub(/#targetPackage#/, '#{package_name(app)}')" AndroidManifest.xml}
+      
+      system("aapt package -M AndroidManifest.xml  -I #{android_platform}/android.jar -F dummy.apk")
+      system("unzip -o dummy.apk AndroidManifest.xml")
+      system("zip TestServer.apk AndroidManifest.xml")
+    end
+    cmd = "jarsigner -sigalg MD5withRSA -digestalg SHA1 -signedjar #{test_server_file_name} -storepass #{keystore["keystore_password"]} -keystore \"#{File.expand_path keystore["keystore_location"]}\" #{workspace_dir}/TestServer.apk #{keystore["keystore_alias"]}"
+    system(cmd)
   end
+  puts "Done signing the test server. Moved it to #{test_server_file_name}"
 end
 
 def read_keystore_info

data/bin/calabash-android-run.rb

@@ -14,7 +14,7 @@ def calabash_run(app_path = nil)
 
   if app_path
     unless File.exist?(test_server_path(app_path))
-      puts "No test server found for this combination of app and calabash version. Rebuilding test server."
+      puts "No test server found for this combination of app and calabash version. Recreating test server."
       calabash_build(app_path)
     end
 
@@ -25,6 +25,7 @@ def calabash_run(app_path = nil)
       test_server_port = "34777"
     end
     env = "PACKAGE_NAME=#{package_name(app_path)} "\
+          "MAIN_ACTIVITY=#{main_activity(app_path)} "\
           "TEST_PACKAGE_NAME=#{package_name(test_server_path)} "\
           "APP_PATH=\"#{app_path}\" "\
           "TEST_APP_PATH=\"#{test_server_path}\" "\

data/calabash-android.gemspec

@@ -11,14 +11,12 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/calabash"
   s.summary     = %q{Client for calabash-android for automated functional testing on Android}
   s.description = %q{calabash-android drives tests for native  and hybrid Android apps. }
-  s.files         = `git ls-files`.split("\n") + Dir["test-server/calabash-js/src/*.js"]
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files         = `git ls-files`.split("\n") + Dir["test-server/calabash-js/src/*.js"] + ["lib/calabash-android/lib/TestServer.apk"]
   s.executables   = "calabash-android"
   s.require_paths = ["lib"]
 
   s.add_dependency( "cucumber" )
   s.add_dependency( "json" )
-  s.add_dependency( "slowhandcuke" )
   s.add_dependency( "retriable" )
 
 end

data/features-skeleton/support/app_life_cycle_hooks.rb

@@ -1,17 +1,6 @@
 require 'calabash-android/management/adb'
 
 Before do |scenario|
-  # John Gallagher provided the "scenario_is_outline" fix: https://groups.google.com/forum/?fromgroups#!topic/calabash-ios/ICA4f24eSsY
-  # ...there may be a better way of doing this...
-  @scenario_is_outline = (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow) 
-  if @scenario_is_outline 
-    scenario = scenario.scenario_outline
-    # Still need to call connect_to_test_server...
-  elsif scenario.failed?
-    return #No need to start the server is anything before this has failed.
-  end
-
-  return if scenario.failed? #No need to start the server is anything before this has failed.
   start_test_server_in_background
 end
 

data/lib/calabash-android/operations.rb

@@ -275,8 +275,7 @@ module Operations
     end
 
     def start_test_server_in_background
-      test_server_package = package_name(@test_server_path)
-      cmd = "#{adb_command} shell am instrument -w -e class sh.calaba.instrumentationbackend.InstrumentationBackend #{test_server_package}/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
+      cmd = "#{adb_command} shell am instrument -w -e target_package #{ENV["PACKAGE_NAME"]} -e main_activity #{ENV["MAIN_ACTIVITY"]} -e class sh.calaba.instrumentationbackend.InstrumentationBackend sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
       log "Starting test server using:"
       log cmd
       if is_windows?

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.2.22"
+    VERSION = "0.3.0.pre1"
   end
 end

data/test-server/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="#TESTED_APP_PACKAGE#.test"
+      package="sh.calaba.android.test"
       android:versionCode="3"
       android:versionName="0.3.0">
     <application android:label="instrumentation_backend">
@@ -8,6 +8,6 @@
       <uses-library android:name="com.google.android.maps" android:required="false" />
     </application>
     <uses-sdk android:minSdkVersion="4" />
-    <instrumentation android:targetPackage="#TESTED_APP_PACKAGE#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
+    <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest> 

data/test-server/build.xml

@@ -9,11 +9,9 @@
     <property file="build.properties"/>
     <property name="staging.dir" location="staging"/>
     <property name="bin.dir" location="bin"/>
-    <property name="test.app" location="${bin.dir}/Test.apk"/>
     <property name="test.app.aapt" location="${bin.dir}/Test_aapt.apk"/>
     <property name="dex.file" location="${bin.dir}/classes.dex"/>
     <property name="test.app.unsigned" location="${bin.dir}/Test_unsigned.apk"/>
-    <property name="test.app.signed" location="${bin.dir}/Test.apk"/>
     <property name="calabashjs.dir" location="calabash-js/src"/>
 
 
@@ -48,33 +46,18 @@
     </path>
 
     <target name="-check.preconditions">
-      <available file="${tested.project.apk}" property="tested.apk.found" />
-      <fail unless="tested.apk.found" message="Tested apk: '${tested.project.apk}' could not be found"/>
       <available file="${calabashjs.dir}" type="dir" property="doesCalabashJsExist" />
       <fail unless="doesCalabashJsExist">
         ${calabashjs.dir} does not exist.
       </fail>
     </target>
 
-    <target name="-init" depends="-check.preconditions">
-      <uptodate property="test.app.upto.date" targetfile="${test.app.signed}" >
-        <srcfiles dir= "instrumentation-backend/" includes="**/*"/>
-        <srcfiles file="build.properties"/>
-      </uptodate>
-    </target>
-    
     <target name="-stage">
       <mkdir dir="${staging.dir}"/>
       <mkdir dir="${bin.dir}"/>
-      <antcall target="-prepare.manifest"/>
       <antcall target="-prepare.testserver"/>
     </target>
 
-    <target name="-prepare.manifest" description="Makes sure the manifest matches the tested application by looking at its manifest file">
-      <copy file="AndroidManifest.xml" todir="${staging.dir}"/>
-      <replace file="${staging.dir}/AndroidManifest.xml" token="#TESTED_APP_PACKAGE#" value="${tested.package_name}"/>
-    </target>
-
     <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">
@@ -89,14 +72,6 @@
       <copy todir="${staging.dir}/assets">
         <fileset dir="${calabashjs.dir}"/>
       </copy>
-      <replace file="${staging.dir}/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java" token="#ACTIVITY_PACKAGE#" value="${tested.package_name}"/>
-
-      <replace file="${staging.dir}/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java" token="#ACTIVITY_QUALIFIED_NAME#" value="${tested.main_activity}"/>
-			<exec executable="${env.ANDROID_HOME}/platform-tools/aapt" failonerror="true" output="${staging.dir}/assets/ids.txt">
-				<arg value="dump" />
-        <arg value="resources" />
-        <arg file="${tested.project.apk}" />
-			</exec>
     </target>
 
 
@@ -116,12 +91,11 @@
     </target>
 
     
-    <target name="package" depends="-init" unless="test.app.upto.date">
+    <target name="package" depends="-check.preconditions">
       <antcall target="-compile" />
       <antcall target="-aapt" />
       <antcall target="-dex" />
       <antcall target="-apk" />
-      <antcall target="-sign" />
     </target>
 
     
@@ -149,7 +123,9 @@
     </target>
 
     <target name="-dex">
-      <antcall target="-stage.libs"/>
+      <copy todir="${bin.dir}/libs">
+        <fileset dir="instrumentation-backend/libs"/>
+      </copy>
       <exec executable="${dx}" failonerror="yes">
         <arg value="--dex" />
         <arg value="--output" />
@@ -158,12 +134,6 @@
       </exec>
     </target>
 
-    <target name="-stage.libs">
-      <copy todir="${bin.dir}/libs">
-				<fileset dir="instrumentation-backend/libs"/>
-      </copy>
-    </target>
-
     <target name="-apk">
       <exec executable="${apkbuilder}" failonerror="yes">
         <arg file="${test.app.unsigned}" />
@@ -175,24 +145,4 @@
       </exec>
     </target>
 
-
-    <target name ="-sign">
-      <exec executable="jarsigner" failonerror="true">
-        <arg value="-sigalg" />
-        <arg value="MD5withRSA" />
-        <arg value="-digestalg" />
-        <arg value="SHA1" />
-        <arg value="-signedjar" />
-        <arg file="${test.app.signed}" />
-        <arg value="-storepass" />
-        <arg value="${key.store.password}" />
-        <arg value="-keystore" />
-        <arg file="${key.store}" />
-        
-        <arg file="${test.app.unsigned}" />
-        <arg value="${key.alias}" />
-
-      </exec>
-    </target>
-
 </project>

data/test-server/instrumentation-backend/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:15

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

@@ -17,12 +17,21 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
 			method.invoke (null, context, null, new String[]{context.getApplicationInfo ().sourceDir});
 			System.out.println("Calabash loaded Mono");
 		} catch (Exception e) {
-			System.out.println("Calabash could not load Mono");
+			System.out.println("Calabash did not load Mono. This is only a problem if you are trying to test a Mono application");
 		}
 
         // Start the HttpServer as soon as possible in a not-ready state
         HttpServer.instantiate();
 
+        InstrumentationBackend.testPackage = arguments.getString("target_package");
+
+        try {
+            InstrumentationBackend.mainActivity = Class.forName(arguments.getString("main_activity"));
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
         super.onCreate(arguments);
+
 	}	
 }

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

@@ -9,8 +9,8 @@ import android.util.Log;
 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
-    private static final String LAUNCHER_ACTIVITY_FULL_CLASSNAME = "#ACTIVITY_QUALIFIED_NAME#"; //Set from Ant at compile time
+    public static String testPackage;
+    public static Class mainActivity;
     
     private static final String TAG = "InstrumentationBackend";
     
@@ -18,16 +18,8 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     public static SoloEnhanced solo;
     public static Actions actions;
 
-    private static Class getActivityClass() {
-    	try {
-			return Class.forName(LAUNCHER_ACTIVITY_FULL_CLASSNAME);
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		}
-    }
-    
     public InstrumentationBackend() {
-        super(TARGET_PACKAGE, getActivityClass());
+        super(testPackage, mainActivity);
     }
 
     @Override
@@ -37,7 +29,6 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
         solo = new SoloEnhanced(getInstrumentation(), this.getActivity());
         actions = new Actions(getInstrumentation(), this);
         instrumentation = getInstrumentation();
-        TestHelpers.loadIds(instrumentation.getContext());
     }
 
     /**

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.2.22
-  prerelease: 
+  version: 0.3.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: slowhandcuke
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  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
@@ -88,7 +72,6 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
-- bin/.DS_Store
 - bin/calabash-android
 - bin/calabash-android-build.rb
 - bin/calabash-android-generate.rb
@@ -669,6 +652,7 @@ 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
+- lib/calabash-android/lib/TestServer.apk
 homepage: http://github.com/calabash
 licenses: []
 post_install_message: 
@@ -684,9 +668,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24