calabash-android 0.3.2.pre2 → 0.3.2.pre3

data/bin/calabash-android-run.rb

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

data/features-skeleton/irb_android.sh

@@ -1,2 +1,13 @@
 #!/bin/bash
-IRBRC=.irbrc irb
+TEST_SERVER_PORT=34777 
+MOBILE_APP_PACKAGE=$1
+if [ -z "$MOBILE_APP_PACKAGE" ]; then
+   echo 'The parameter about your mobile app package is missing: e.g. com.springsource.greenhouse.test'
+   exit 1
+else
+   # use this line for calabash version 0.1
+   # adb shell am instrument -e class sh.calaba.instrumentationbackend.InstrumentationBackend -w $MOBILE_APP_PACKAGE/android.test.InstrumentationTestRunner &
+  adb shell am instrument -e class sh.calaba.instrumentationbackend.InstrumentationBackend -w $MOBILE_APP_PACKAGE/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner &
+   sleep 7
+   IRBRC=.irbrc TEST_SERVER_PORT=$TEST_SERVER_PORT irb
+fi

data/features-skeleton/support/app_life_cycle_hooks.rb

@@ -3,7 +3,7 @@ require 'calabash-android/operations'
 include Calabash::Android::Operations
 
 AfterConfiguration do |config|
-  wake_up
+  wake_up unless config.dry_run?
 end
 
 Before do |scenario|

data/lib/calabash-android/canned_steps.md

@@ -220,6 +220,23 @@ To use a set of concrete GPS cordinates
     Then /^I am at ([-+]?[0-9]*\.?[0-9]+), ([-+]?[0-9]*\.?[0-9]+)$/ do |latitude, longitude|
     Then /^I go to ([-+]?[0-9]*\.?[0-9]+), ([-+]?[0-9]*\.?[0-9]+)$/ do |latitude, longitude|
 
+Internationalization
+--------------------
+
+	Then /^I press text of translated l10key (\d+)$/ 
+Simulates that the user pressed the text of the l10nkey.	
+
+	Then /^I press button of translated l10key (\d+)$/
+Simulates that the user pressed the button with the label text of the l10nkey.
+
+	Then /^I press menu item of translated l10key (\d+)$/
+Simulates that the user pressed the menu item with the label text of the l10nkey.
+
+	Then /^I press toggle button of translated l10key (\d+)$/ 
+Simulates that the user pressed the toggle button with the label text of the l10nkey.	
+
+	Then /^I wait for the translated "([^\"]*)" l10nkey to appear$/ 
+Waits until the text of the translated l10nkey is displayed.
 
 Rotation
 --------

data/lib/calabash-android/helpers.rb

@@ -41,4 +41,6 @@ def is_windows?
   (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
 end
 
-
+def log(message, error = false)
+  $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (error or ARGV.include? "-v" or ARGV.include? "--verbose")
+end

data/lib/calabash-android/operations.rb

@@ -30,7 +30,7 @@ module Operations
     end
   end
   def default_device
-    Device.default_device(self)
+    Device.default_device
   end
 
   def performAction(action, *arguments)
@@ -59,7 +59,8 @@ module Operations
   end
 
   def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
-    default_device.screenshot_embed(options)
+    path = default_device.screenshot(options)
+    embed(path, "image/png", options[:label] || File.basename(path))
   end
 
   def screenshot(options={:prefix => nil, :name => nil})
@@ -121,9 +122,9 @@ module Operations
   class Device
     @@default_device = nil
 
-    def self.default_device(cucumber_world)
+    def self.default_device
       unless @@default_device
-        @@default_device = Device.new(cucumber_world, ENV["ADB_DEVICE_ARG"], ENV["TEST_SERVER_PORT"], ENV["APP_PATH"], ENV["TEST_APP_PATH"])
+        @@default_device = Device.new(ENV["ADB_DEVICE_ARG"], ENV["TEST_SERVER_PORT"], ENV["APP_PATH"], ENV["TEST_APP_PATH"])
       end
       @@default_device
     end
@@ -132,15 +133,15 @@ module Operations
       @@default_device = self
     end
 
-    def initialize(cucumber_world, serial, server_port, app_path, test_server_path)
-      @cucumber_world = cucumber_world
+    def initialize(serial, server_port, app_path, test_server_path)
       @serial = serial
       @server_port = server_port
       @app_path = app_path
       @test_server_path = test_server_path
 
-      puts "#{adb_command} forward tcp:b#{server_port} tcp:7102"
-      log `#{adb_command} forward tcp:#{server_port} tcp:7102`
+      forward_cmd = "#{adb_command} forward tcp:#{server_port} tcp:7102"
+      log forward_cmd
+      log `#{forward_cmd}`
     end
 
     def reinstall_apps()
@@ -230,11 +231,6 @@ module Operations
       end
     end
 
-    def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
-      path = screenshot(options)
-      @cucumber_world.embed(path, "image/png", options[:label] || File.basename(path))
-    end
-
     def screenshot(options={:prefix => nil, :name => nil})
       prefix = options[:prefix] || ENV['SCREENSHOT_PATH'] || ""
       name = options[:name]
@@ -311,10 +307,6 @@ module Operations
       http("/kill")
     end
 
-    def log(message)
-      $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
-    end
-
     ##location
     def set_gps_coordinates_from_location(location)
       require 'geocoder'

data/lib/calabash-android/steps/l10n_steps.rb

@@ -0,0 +1,19 @@
+Then /^I press text of translated l10key (\d+)$/ do |l10key|
+  performAction('press_l10n_element', l10key) 
+end
+
+Then /^I press button of translated l10key (\d+)$/ do |l10key|
+  performAction('press_l10n_element', l10key,'button') 
+end
+
+Then /^I press menu item of translated l10key (\d+)$/ do |l10key|
+  performAction('press_l10n_element', l10key,'menu_item') 
+end
+
+Then /^I press toggle button of translated l10key (\d+)$/ do |l10key|
+  performAction('press_l10n_element', l10key,'toggle_button') 
+end
+
+Then /^I wait for the translated "([^\"]*)" l10nkey to appear$/ do |l10nkey|
+  performAction('wait_for_l10n_element', l10nkey)
+end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.2.pre2"
+    VERSION = "0.3.2.pre3"
   end
 end

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

@@ -0,0 +1,76 @@
+package sh.calaba.instrumentationbackend.actions.helpers;
+
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.ScrollView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.jayway.android.robotium.solo.Solo;
+
+/**
+ * Command is inspecting the current dialog and returns a list of details about the current
+ * displayed UI items.
+ * 
+ * @author Dominik Dary
+ * 
+ */
+public class InspectCurrentDialog implements Action {
+
+  @Override
+  public Result execute(String... args) {
+    Solo solo = InstrumentationBackend.solo;
+    StringBuffer viewInfo = new StringBuffer();
+    viewInfo.append("<views activity='" + solo.getCurrentActivity().getComponentName() + "'>");
+    for (View view : solo.getViews()) {
+      if ((view instanceof RelativeLayout) || (view instanceof LinearLayout)
+          || (view instanceof ScrollView) || (view instanceof FrameLayout)) {
+        // for automation are this ui elements normally not so interesting
+        continue;
+      }
+      viewInfo.append("<view>");
+      viewInfo.append("<type>" + view.getClass().getSimpleName() + "</type>");
+
+      try {
+        viewInfo.append("<name>"
+            + InstrumentationBackend.solo.getCurrentActivity().getResources()
+                .getResourceName(view.getId()) + "</name>");
+
+      } catch (Exception e) {
+        // in case the resource name cannot be identified
+        viewInfo.append("<name></name>");
+      }
+
+      if (view instanceof TextView) {
+        viewInfo.append("<textViewText>" + ((TextView) view).getText() + "</textViewText>");
+      } else if (view instanceof Button) {
+        viewInfo.append("<buttonText>" + ((Button) view).getText() + "</buttonText>");
+      } else if (view instanceof Spinner) {
+        viewInfo.append("<spinnerText>" + ((Spinner) view).getSelectedItem() + "</spinnerText>");
+      } else if (view instanceof EditText) {
+        viewInfo.append("<editText>" + ((EditText) view).getText() + "</editText>");
+      }
+
+      viewInfo.append("</view>");
+    }
+
+    viewInfo.append("</views>");
+    Result result = new Result(true);
+    result.addBonusInformation(viewInfo.toString());
+    return result;
+  }
+
+  @Override
+  public String key() {
+    return "inspect_current_dialog";
+  }
+
+}

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

@@ -0,0 +1,31 @@
+package sh.calaba.instrumentationbackend.actions.l10n;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+
+/**
+ * Helper to access Android L10n files.
+ * 
+ * @author Dominik Dary
+ * 
+ */
+public class L10nHelper {
+  /**
+   * get the translated value based on the current active locale.
+   * 
+   * @param l10nKey The l10n key to use
+   * @return The translated value.
+   */
+  public static String getValue(String l10nKey) {
+    int resourceId =
+        InstrumentationBackend.solo
+            .getCurrentActivity()
+            .getResources()
+            .getIdentifier(l10nKey, "string",
+                InstrumentationBackend.solo.getCurrentActivity().getPackageName());
+
+    String localizedString =
+        InstrumentationBackend.solo.getCurrentActivity().getResources().getString(resourceId);
+
+    return localizedString;
+  }
+}

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

@@ -0,0 +1,48 @@
+
+package sh.calaba.instrumentationbackend.actions.l10n;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+/**
+ * Action is getting the translated value of the provided #l10nKey and is
+ * searching for the text and then clicking on it.
+ * 
+ * @author Dominik Dary
+ * @see L10nHelper
+ */
+public class PressElement implements Action {
+	public static final String BUTTON = "button";
+	public static final String TOGGLE_BUTTON = "toggle_button";
+	public static final String MENU_ITEM = "menu_item";
+
+	@Override
+	public Result execute(String... args) {
+		String l10nKey = args[0];
+		String elementType = args.length > 1 ? args[1] : null;
+		String myLocalizedString = L10nHelper.getValue(l10nKey);
+		InstrumentationBackend.solo.searchText(myLocalizedString);
+		if (elementType == null) {
+			InstrumentationBackend.solo.clickOnText(myLocalizedString);
+		} else if (BUTTON.equalsIgnoreCase(elementType)) {
+			InstrumentationBackend.solo.clickOnButton(myLocalizedString);
+		} else if (MENU_ITEM.equalsIgnoreCase(elementType)) {
+			InstrumentationBackend.solo.clickOnMenuItem(myLocalizedString);
+		} else if (TOGGLE_BUTTON.equalsIgnoreCase(elementType)) {
+			InstrumentationBackend.solo.clickOnToggleButton(myLocalizedString);
+		} else {
+			return Result.fromThrowable(new Throwable(
+					"specified element type: '" + elementType
+							+ " ' is not supported."));
+		}
+
+		return Result.successResult();
+	}
+
+	@Override
+	public String key() {
+		return "press_l10n_element";
+	}
+
+}

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012 calabash-driver committers.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package sh.calaba.instrumentationbackend.actions.l10n;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+/**
+ * Action is waiting until the text of the given #l10nKey is displayed.
+ * 
+ * @author Dominik Dary
+ * @see L10nHelper
+ */
+public class WaitForElement implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		String l10nKey = args[0];
+		
+		String myLocalizedString = L10nHelper.getValue(l10nKey);
+		boolean timedOut = !InstrumentationBackend.solo.waitForText(
+				myLocalizedString, 1, 90000);
+		if (timedOut) {
+			return new Result(false, "Time out while waiting for text:"
+					+ args[0]);
+		} else {
+			return Result.successResult();
+		}
+	}
+
+	@Override
+	public String key() {
+		return "wait_for_l10n_element";
+	}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.2.pre2
+  version: 0.3.2.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -140,6 +140,7 @@ 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/l10n_steps.rb
 - lib/calabash-android/steps/list_steps.rb
 - lib/calabash-android/steps/location_steps.rb
 - lib/calabash-android/steps/map_steps.rb
@@ -193,7 +194,11 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/ClickOnScreen.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Drag.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Swipe.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/helpers/InspectCurrentDialog.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/helpers/ListActions.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/l10n/L10nHelper.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/l10n/PressElement.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/l10n/WaitForElement.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