calabash-android 0.1.0 → 0.2.0.pre2

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

@@ -5,33 +5,89 @@ import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
 import android.content.Context;
+import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationProvider;
 
 
 public class FakeGPSLocation implements Action {
+	
+	static LocationProviderThread t;
 
     @Override
     public Result execute(String... args) {
         
-        LocationManager locationManager = (LocationManager) InstrumentationBackend.solo.getCurrentActivity().getSystemService(Context.LOCATION_SERVICE);
-        
         if(!doesDeviceProvideGPS()) {
             return new Result(false, "This devices does not support GPS");
         }
         
-        LocationProvider currentGPSProvider = locationManager.getProvider(LocationManager.GPS_PROVIDER);
-        addTestProvider(currentGPSProvider, LocationManager.GPS_PROVIDER);
-            
-        Location location = new Location(LocationManager.GPS_PROVIDER);
-        location.setLatitude(Double.parseDouble(args[0]));
-        location.setLongitude(Double.parseDouble(args[1]));
-        location.setTime(System.currentTimeMillis());
-        locationManager.setTestProviderLocation(LocationManager.GPS_PROVIDER, location);
+        final double latitude = Double.parseDouble(args[0]);
+        final double longitude = Double.parseDouble(args[1]);
+
         
+        if (t != null) {
+        	t.finish();
+        }
+    	
+    	t = new LocationProviderThread(latitude, longitude);
+    	
+    	t.start();
+    	
         return Result.successResult();
     }
+    
+   
+    private class LocationProviderThread extends Thread {
+    	
+    	private final double latitude;
+		private final double longitude;
+		
+		boolean finish = false;
+
+		LocationProviderThread(double latitude, double longitude) {
+			this.latitude = latitude;
+			this.longitude = longitude;
+    	}
+    	
+    	@Override
+		public void run() {
+    		LocationManager locationManager = (LocationManager) InstrumentationBackend.solo.getCurrentActivity().getSystemService(Context.LOCATION_SERVICE);
+    		locationManager.addTestProvider(LocationManager.NETWORK_PROVIDER, false, false, false, false, false, false, false, Criteria.POWER_LOW, Criteria.ACCURACY_FINE);
+    		locationManager.addTestProvider(LocationManager.GPS_PROVIDER, false, false, false, false, false, false, false, Criteria.POWER_LOW, Criteria.ACCURACY_FINE);
+
+    		locationManager.setTestProviderEnabled(LocationManager.NETWORK_PROVIDER, true);
+    		locationManager.setTestProviderEnabled(LocationManager.GPS_PROVIDER, true);
+
+    		while(!finish) {
+				System.out.println("Mocking location to: (" + latitude + ", " + longitude + ")");
+				setLocation(locationManager, LocationManager.NETWORK_PROVIDER, latitude, longitude);
+				setLocation(locationManager, LocationManager.GPS_PROVIDER, latitude, longitude);
+				try {
+					Thread.sleep(1000);
+				} catch (InterruptedException e) {
+					throw new RuntimeException(e);
+				}
+			}
+		}
+    	
+    	private void setLocation(LocationManager locationManager, String locationProvider, double latitude, double longitude) {
+
+    		//locationManager.clearTestProviderLocation(locationProvider);
+
+    		Location location = new Location(locationProvider);
+    		location.setLatitude(latitude);
+    		location.setLongitude(longitude);
+    		location.setAccuracy(1);
+    		location.setTime(System.currentTimeMillis());
+
+    		locationManager.setTestProviderLocation(locationProvider, location);        
+    	}
+
+    	public void finish() {
+    		finish = true;
+    	}
+    }
 
     @Override
     public String key() {

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: calabash-android
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 3048859453
+  prerelease: 6
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  - pre
+  - 2
+  version: 0.2.0.pre2
 platform: ruby
 authors: 
 - Jonas Maturana Larsen
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-20 00:00:00 -03:00
+date: 2012-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,9 +101,10 @@ files:
 - lib/calabash-android/canned_steps.md
 - lib/calabash-android/color_helper.rb
 - lib/calabash-android/cucumber.rb
+- lib/calabash-android/helpers.rb
+- lib/calabash-android/lib/AXMLPrinter2.jar
 - lib/calabash-android/lib/screenShotTaker.jar
 - lib/calabash-android/management/adb.rb
-- lib/calabash-android/management/app_installation.rb
 - lib/calabash-android/operations.rb
 - lib/calabash-android/steps/additions_manual_steps.rb
 - lib/calabash-android/steps/app_steps.rb
@@ -126,7 +129,6 @@ files:
 - test-server/instrumentation-backend/.settings/org.eclipse.jdt.core.prefs
 - test-server/instrumentation-backend/AndroidManifest.xml
 - test-server/instrumentation-backend/assets/foo.bar
-- test-server/instrumentation-backend/gen/com/lesspainful/simpleui/test/R.java
 - test-server/instrumentation-backend/libs/robotium-solo-3.3.jar
 - test-server/instrumentation-backend/project.properties
 - test-server/instrumentation-backend/res/drawable-hdpi/ic_launcher.png
@@ -141,6 +143,8 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/TestHelpers.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/Action.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/Actions.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NanoHTTPD.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NullAction.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressButtonNumber.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressButtonText.java
@@ -625,12 +629,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/calabash-android/management/app_installation.rb

@@ -1,21 +0,0 @@
-def install_app(app_path)
-
-  cmd = "#{adb_command} install #{app_path}"
-  log "Installing: #{app_path}"
-	result = `#{cmd}`
-  if result.include? "Success"
-    log "Success"
-  else
-    log "#Failure"
-    log "'#{cmd}' said:"
-    log result.strip
-    raise "Could not install app #{app_path}: #{result.strip}"
-  end
-end
-
-def uninstall_apps
-  log "Uninstalling: #{ENV["TEST_PACKAGE_NAME"]}"
-  log `#{adb_command} uninstall #{ENV["TEST_PACKAGE_NAME"]}`
-  log "Uninstalling: #{ENV["PACKAGE_NAME"]}"
-  log `#{adb_command} uninstall #{ENV["PACKAGE_NAME"]}`
-end

data/test-server/instrumentation-backend/gen/com/lesspainful/simpleui/test/R.java

@@ -1,23 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.lesspainful.simpleui.test;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int ic_launcher=0x7f020000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int hello=0x7f040000;
-    }
-}