calabash-android 0.4.7.pre7 → 0.4.7.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cef60c767cc5d65fbe92b152d074a39110485815
-  data.tar.gz: 2176ececc5a8775c25c273459c7365b72a63e9db
+  metadata.gz: 19abb342f1359f26b1e7b8a1d53778979a9bde51
+  data.tar.gz: 62aceab9963f035a0263b06902f52b9165d3f26b
 SHA512:
-  metadata.gz: 7d2f70bebaf738c050561bf42b9fd0be6853496270b546f9fb326e00de49bcd9dd42f5b0cfc8a9b33e8312c785553d8c1d6001e9eb419849c8fe3ad8a89fa36d
-  data.tar.gz: f819d4a18a951b5264fb7e6a17786a98faed5f07efd0b164f7e8db4b49dc033bc658e75155ae217f62b169f7051e04eea4bf0e1164b18d9bb1f5a497e9446a5a
+  metadata.gz: d7817b6dd4e7864d1a964096b99c29c9b7d3d3bec69772a980d579797f64c75863076372cdeceec9fb05a432994eada5732967383e5b42bd21f58483ba476887
+  data.tar.gz: d66b8cb96a8bc16add49a94c75d94fc5cc2f255d583e9e3b435d28f9b96b5f06d0cb7b5382124968cdd856aabb8bd2e6c930acba854f3e5ab91f8deac12f0ceb

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.7.pre7"
+    VERSION = "0.4.7.pre8"
   end
 end

data/test-server/build.xml

@@ -17,7 +17,7 @@
     <condition property="bat" value=".bat" else=""><os family="windows" /></condition>
 
     <property name="dx" location="${tools.dir}/dx${bat}" />
-    <property name="aapt" location="${tools.dir}/aapt${bat}" />
+    <property name="aapt" location="${tools.dir}/aapt" />
     
     <property name="android.lib" location="${env.ANDROID_HOME}/platforms/android-${android.api.level}/android.jar"/>
     <path id="android.antlibs">
@@ -64,6 +64,13 @@
         <fileset dir="${calabashjs.dir}"/>
       </copy>
       <replace file="${staging.dir}/src/sh/calaba/instrumentationbackend/actions/version/Version.java" token="####VERSION####" value="${version}" failOnNoReplacements="true" />
+
+      <property name="src.dir.absolute" location="${staging.dir}/src" />
+      <pathconvert property="testserver.actions" pathsep="${line.separator}" dirsep=".">
+        <fileset dir="${src.dir.absolute}" includes="sh/calaba/instrumentationbackend/actions/**/*.java" />
+        <globmapper from="${src.dir.absolute}/*.java" to="*" handledirsep="true" />
+      </pathconvert>
+      <echo file="${staging.dir}/assets/actions" message="${testserver.actions}${line.separator}" />
     </target>
 
 

data/test-server/instrumentation-backend/.classpath

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="src" path="assets"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="lib" path="libs/robotium-solo-4.1.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

data/test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/SoloEnhanced.java

@@ -2,15 +2,14 @@ package com.jayway.android.robotium.solo;
 
 import java.util.List;
 
-import android.app.Activity;
 import android.app.Instrumentation;
 
 public class SoloEnhanced extends Solo {
 //	private Pincher pincher;
 	private MapViewUtils mapViewUtils;
 
-	public SoloEnhanced(Instrumentation instrumentation, Activity activity) {
-		super(instrumentation, activity);
+	public SoloEnhanced(Instrumentation instrumentation) {
+		super(instrumentation);
 		this.mapViewUtils = new MapViewUtils(instrumentation, viewFetcher, sleeper, waiter);
 //		this.pincher = new Pincher(instrumentation, viewFetcher);
 	}

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

@@ -3,6 +3,7 @@ package sh.calaba.instrumentationbackend;
 import java.lang.reflect.Method;
 
 import sh.calaba.instrumentationbackend.actions.HttpServer;
+import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.test.InstrumentationTestRunner;
@@ -27,7 +28,7 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
         InstrumentationBackend.extras = arguments;
 
         try {
-            InstrumentationBackend.mainActivity = Class.forName(arguments.getString("main_activity"));
+            InstrumentationBackend.mainActivity = Class.forName(arguments.getString("main_activity")).asSubclass(Activity.class);
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
         }

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

@@ -16,9 +16,9 @@ import android.util.Log;
 import com.jayway.android.robotium.solo.PublicViewFetcher;
 import com.jayway.android.robotium.solo.SoloEnhanced;
 
-public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
+public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Activity> {
     public static String testPackage;
-    public static Class mainActivity;
+    public static Class<? extends Activity> mainActivity;
     public static Bundle extras;
     
     private static final String TAG = "InstrumentationBackend";
@@ -28,8 +28,9 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     public static PublicViewFetcher viewFetcher;
     public static Actions actions;
 
+    @SuppressWarnings({ "deprecation", "unchecked" })
     public InstrumentationBackend() {
-        super(testPackage, mainActivity);
+        super(testPackage, (Class<Activity>) mainActivity);
     }
 
     @Override
@@ -39,7 +40,7 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
         i.setClassName(testPackage, mainActivity.getName());
         i.putExtras(extras);
         setActivityIntent(i);
-        solo = new SoloEnhanced(getInstrumentation(), this.getActivity());
+        solo = new SoloEnhanced(getInstrumentation());
         viewFetcher = new PublicViewFetcher(getInstrumentation(), this.getActivity());
         actions = new Actions(getInstrumentation(), this);
         instrumentation = getInstrumentation();

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

@@ -1,6 +1,7 @@
 package sh.calaba.instrumentationbackend.actions;
 
-import java.util.Enumeration;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,7 +13,6 @@ import android.content.pm.InstrumentationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.test.InstrumentationTestCase;
-import dalvik.system.DexFile;
 
 public class Actions {
 
@@ -20,8 +20,8 @@ public class Actions {
     public static Instrumentation parentInstrumentation;
     public static InstrumentationTestCase parentTestCase;
     private Context context;
-	private Context targetContext;
-
+    private Context targetContext;
+    
     public Actions(Instrumentation parentInstrumentation, InstrumentationTestCase parentTestCase) {
         Actions.parentInstrumentation = parentInstrumentation;
         Actions.parentTestCase = parentTestCase;
@@ -32,18 +32,16 @@ public class Actions {
     
     private void loadActions() {
         try {
-            DexFile dexFile = new DexFile(getApkLocation());
-            Enumeration<String> entries = dexFile.entries();
-            while (entries.hasMoreElements()) {
-                String element = entries.nextElement();
-                // Only look at classes from the actions package (and sub
-                // packages)
-                if (element.startsWith("sh.calaba.instrumentationbackend.actions.")) {
-                    addAction(element);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(context.getAssets().open("actions")));
+            try {
+                for (String line = reader.readLine(); line != null; line = reader.readLine()) {
+                    String name = line.trim();
+                    if (name.length() > 0) addAction(name);
                 }
+            } finally {
+                reader.close();
             }
-            dexFile.close();
-	    } catch (Exception e) {
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
@@ -84,29 +82,6 @@ public class Actions {
         return action;
     }
 
-    private String getApkLocation() {
-        PackageManager pm = context.getPackageManager();
-        InstrumentationInfo info = null;
-        try {
-            info = pm.getInstrumentationInfo(new ComponentName(context, parentInstrumentation.getClass()), 0);
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        return info != null ? info.sourceDir : null;
-    }
-    
-    private String getTargetApkLocation() {
-        PackageManager pm = targetContext.getPackageManager();
-        InstrumentationInfo info = null;
-        try {
-            info = pm.getInstrumentationInfo(new ComponentName(targetContext, parentInstrumentation.getClass()), 0);
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        return info != null ? info.sourceDir : null;
-    }
-
-
     public Map<String, Action> getActions() {
         return actions;
     }

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

@@ -10,7 +10,7 @@ public class PressListItems implements Action {
 
     @Override
     public Result execute(String... args) {
-        InstrumentationBackend.solo.clickInList(Integer.parseInt(args[0]) - 1, Integer.parseInt(args[1]));
+        InstrumentationBackend.solo.clickInList(Integer.parseInt(args[0]), Integer.parseInt(args[1]));
         return Result.successResult();
     }
 

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

@@ -1,10 +1,13 @@
 package sh.calaba.instrumentationbackend.actions.search;
 
+import android.annotation.TargetApi;
+import android.os.Build;
 import android.widget.SearchView;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
 
+@TargetApi(Build.VERSION_CODES.HONEYCOMB)
 public class EnterQueryByIndex implements Action {
     @Override
     public Result execute(String... args) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.7.pre7
+  version: 0.4.7.pre8
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -861,4 +861,3 @@ signing_key:
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
-has_rdoc: