calabash-android 0.4.15.pre1 → 0.4.15.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5eae7958aa42bb890bce213080b57a787677f4b
-  data.tar.gz: 6c053a02a4974b3b87738453e9f516a9ea4927e4
+  metadata.gz: e755b2bf29c1fc5dfb3dcf8a268cc4a742af6153
+  data.tar.gz: 0d9cb17214c52a01e58166d8fce6e6ab6fc01087
 SHA512:
-  metadata.gz: a53197a47f6009f6cf5b1f6017df9065396bd4aad5e5c97dcac0dcb5fe03dfb81513202a4c9ebf1049f0a54f8a938c7ce256a44c9f51ca54ab7b7a87e4fc82d0
-  data.tar.gz: 19dfb707600e501ff59abb80f8fb0cbb881d32658b376cbe4be6fe9f912c75a903c0f969b16f7130f5cd3bc1c24ce25e7108977e33a4f23d24cc3e644eebe80c
+  metadata.gz: bc5a1b74c3e3cbca6e1ba51ec043392d4e2bf4fdf1ad66aaa39c7d8d74ada62c5859ab17d96f64c548d4c5e7c96acb50102d7dbe91ff3fc035f310db2807c29f
+  data.tar.gz: 95c1a94f439c58ace65d2a9343736cec61f1ecd17f70f8dde301a31a86ad0d610e41b8da6a285b01a6a126eadc870884174b611914442ac48eedd5756cce21fb

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.15.pre1"
+    VERSION = "0.4.15.pre2"
   end
 end

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

@@ -5,7 +5,7 @@ import android.app.Instrumentation;
 
 public class PublicViewFetcher extends ViewFetcher {
 
-    public PublicViewFetcher(Instrumentation instrumentation, Activity activity) {
-        super(new ActivityUtils(instrumentation, activity, new Sleeper()));
+    public PublicViewFetcher(ActivityUtils activityUtils) {
+        super(activityUtils);
     }
 }

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

@@ -1,96 +1,75 @@
-package com.jayway.android.robotium.solo;
-
-import java.util.List;
-
-import android.app.Instrumentation;
-
-public class SoloEnhanced extends Solo {
-//	private Pincher pincher;
-	private MapViewUtils mapViewUtils;
-
-	public SoloEnhanced(Instrumentation instrumentation) {
-		super(instrumentation);
-		this.mapViewUtils = new MapViewUtils(instrumentation, viewFetcher, sleeper, waiter);
-//		this.pincher = new Pincher(instrumentation, viewFetcher);
-	}
-
-	public void setMapCenter( double lat, double lon ) {
-		mapViewUtils.setCenter(lat, lon);
-	}
-	
-	/** @return {lat,lon} */
-	public double[] getMapCenter() {
-		return mapViewUtils.getMapCenter();
-	}
-	
-	public void panMapTo( double lat, double lon ) {
-		mapViewUtils.panTo(lat, lon);
-	}
-	
-	public boolean zoomInOnMap() {
-		return mapViewUtils.zoomIn();
-	}
-	
-	public boolean zoomOutOnMap() {
-		return mapViewUtils.zoomOut();
-	}
-	
-	public int setMapZoom( int zoomLevel ) {
-		return mapViewUtils.setZoom(zoomLevel);
-	}
-	
-	public int getMapZoom() {
-		return mapViewUtils.getZoom();
-	}
-	
-	public List<String> getMapMarkerItems() {
-		return mapViewUtils.getMarkerItems();
-	}
-	
-	public String getMapMarkerItem( String title ) {
-		return mapViewUtils.getMarkerItem( title );
-	}
-
-	/**
-	 * @param title
-	 * @param timeout in ms
-	 * @return
-	 */
-	public boolean tapMapMarkerItem( String title, long timeout ) {
-		return mapViewUtils.tapMarkerItem( title, timeout );
-	}
-	
-	public boolean tapMapAwayFromMarkers( int step ) {
-		return mapViewUtils.tapAwayFromMarkerItems( step );
-	}
-	
-	/**
-	 * @return [top, right, bottom, left] in decimal degrees
-	 */
-	public List<String> getMapBounds() {
-		return mapViewUtils.getBounds();
-	}
-	
-//	/**
-//	 * Sorry, doesn't work yet
-//	 * @param togetherOrApart - {@link Pincher#TOGETHER} or {@link Pincher#APART}
-//	 */
-//	public void pinch(int togetherOrApart) {
-//		switch( togetherOrApart ) {
-//		case Pincher.TOGETHER: pincher.pinch(Pincher.Direction.TOGETHER); break;
-//		case Pincher.APART: pincher.pinch(Pincher.Direction.APART); break;
-//		}
-//	}
-//	
-//	/**
-//	 * Sorry, doesn't work yet
-//	 * @param togetherOrApart - {@link Pincher#TOGETHER} or {@link Pincher#APART}
-//	 * @param view
-//	 */
-//	public void pinch(int togetherOrApart, View view) {
-//		switch( togetherOrApart ) {
-//		case Pincher.TOGETHER: pincher.pinch(Pincher.Direction.TOGETHER, view); break;
-//		case Pincher.APART: pincher.pinch(Pincher.Direction.APART, view); break;
-//		}
-//	}
-}
+package com.jayway.android.robotium.solo;
+
+import java.util.List;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+
+public class SoloEnhanced extends Solo {
+	private MapViewUtils mapViewUtils;
+
+	public SoloEnhanced(Instrumentation instrumentation, Activity activity) {
+		super(instrumentation, activity);
+		this.mapViewUtils = new MapViewUtils(instrumentation, viewFetcher, sleeper, waiter);
+	}
+    public ActivityUtils getActivityUtils() {
+        return activityUtils;
+    }
+
+	public void setMapCenter( double lat, double lon ) {
+		mapViewUtils.setCenter(lat, lon);
+	}
+
+	/** @return {lat,lon} */
+	public double[] getMapCenter() {
+		return mapViewUtils.getMapCenter();
+	}
+
+	public void panMapTo( double lat, double lon ) {
+		mapViewUtils.panTo(lat, lon);
+	}
+
+	public boolean zoomInOnMap() {
+		return mapViewUtils.zoomIn();
+	}
+
+	public boolean zoomOutOnMap() {
+		return mapViewUtils.zoomOut();
+	}
+
+	public int setMapZoom( int zoomLevel ) {
+		return mapViewUtils.setZoom(zoomLevel);
+	}
+
+	public int getMapZoom() {
+		return mapViewUtils.getZoom();
+	}
+
+	public List<String> getMapMarkerItems() {
+		return mapViewUtils.getMarkerItems();
+	}
+
+	public String getMapMarkerItem( String title ) {
+		return mapViewUtils.getMarkerItem( title );
+	}
+
+	/**
+	 * @param title
+	 * @param timeout in ms
+	 * @return
+	 */
+	public boolean tapMapMarkerItem( String title, long timeout ) {
+		return mapViewUtils.tapMarkerItem( title, timeout );
+	}
+
+	public boolean tapMapAwayFromMarkers( int step ) {
+		return mapViewUtils.tapAwayFromMarkerItems( step );
+	}
+
+	/**
+	 * @return [top, right, bottom, left] in decimal degrees
+	 */
+	public List<String> getMapBounds() {
+		return mapViewUtils.getBounds();
+	}
+}

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

@@ -1,5 +1,7 @@
 package sh.calaba.instrumentationbackend;
 
+import android.os.Looper;
+import android.os.MessageQueue;
 import sh.calaba.instrumentationbackend.actions.Actions;
 import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.Manifest;
@@ -16,6 +18,10 @@ import android.util.Log;
 import com.jayway.android.robotium.solo.PublicViewFetcher;
 import com.jayway.android.robotium.solo.SoloEnhanced;
 
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Activity> {
     public static String testPackage;
     public static Class<? extends Activity> mainActivity;
@@ -40,8 +46,7 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Act
         i.setClassName(testPackage, mainActivity.getName());
         i.putExtras(extras);
         setActivityIntent(i);
-        solo = new SoloEnhanced(getInstrumentation());
-        viewFetcher = new PublicViewFetcher(getInstrumentation(), this.getActivity());
+
         actions = new Actions(getInstrumentation(), this);
         instrumentation = getInstrumentation();
     }
@@ -49,12 +54,70 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Act
     /**
      * Here to have JUnit3 start the instrumentationBackend
      */
+
     public void testHook() throws Exception {
-        HttpServer httpServer = HttpServer.getInstance();
-        httpServer.setReady();
-        httpServer.waitUntilShutdown();
-        solo.finishOpenedActivities();
-        System.exit(0);
+
+        final AtomicReference<Activity> activityReference = new AtomicReference<Activity>();
+        Thread activityStarter = new Thread() {
+            public void run() {
+                activityReference.set(getActivity());
+            }
+        };
+        activityStarter.start();
+        activityStarter.join(10000);
+
+        Activity activity = null;
+        if (activityReference.get() != null) {
+            activity = activityReference.get();
+            System.out.println("testHook: Activity set to: " + activity);
+        } else {
+            System.out.println("testHook: Activity not set");
+            try {
+
+                Field mQueue = Looper.getMainLooper().getClass().getDeclaredField("mQueue");
+                mQueue.setAccessible(true);
+                MessageQueue messageQueue = (MessageQueue)mQueue.get(Looper.getMainLooper());
+
+                Field f = messageQueue.getClass().getDeclaredField("mIdleHandlers");
+                f.setAccessible(true);
+                List<?> waiters = (List<?>)f.get(messageQueue);
+                for(Object o : waiters) {
+                    Class<?> activityGoingClazz = o.getClass();
+                    if (!activityGoingClazz.getName().equals("android.app.Instrumentation$ActivityGoing")) {
+                        continue;
+                    }
+
+
+                    Field mWaiterField = activityGoingClazz.getDeclaredField("mWaiter");
+                    mWaiterField.setAccessible(true);
+                    Object waiter = mWaiterField.get(o);
+                    Class<?> activityWaiterClazz = waiter.getClass();
+
+                    Field activityField = activityWaiterClazz.getDeclaredField("activity");
+                    activityField.setAccessible(true);
+                    activity = (Activity)activityField.get(waiter);
+
+                    instrumentation.addMonitor(new Instrumentation.ActivityMonitor(activity.getClass().getName(), null, false));
+
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if (activity != null) {
+            solo = new SoloEnhanced(getInstrumentation(), activity);
+            setActivity(activity);
+
+            viewFetcher = new PublicViewFetcher(solo.getActivityUtils());
+
+            HttpServer httpServer = HttpServer.getInstance();
+            httpServer.setReady();
+            httpServer.waitUntilShutdown();
+            solo.finishOpenedActivities();
+            System.exit(0);
+        } else {
+            throw new RuntimeException("Could not get detect the first Activity");
+        }
     }
 
     @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.15.pre1
+  version: 0.4.15.pre2
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber