calabash-android 0.5.2 → 0.5.3

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

@@ -1,31 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.version;
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-
-/**
- * Generated Code.
- * Do not edit.
- *
- */
-public class Version implements Action {
-
-	/******
-	 * Generate Version Number
-	 * DO NOT EDIT
-	 *
-	 */
-	public static final String VERSION="####VERSION####";
-
-	@Override
-    public Result execute(String... args) {
-        return new Result(true,VERSION);
-    }
-
-    @Override
-    public String key() {
-        return "version";
-    }
-
-}

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

@@ -1,32 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.app.Activity;
-import android.app.TabActivity;
-
-/**
- * @author Nicholas Albion
- */
-@SuppressWarnings("deprecation")
-public class GetActivityName implements Action {
-
-	@Override
-	public Result execute(String... args) {
-		Activity currentActivity = InstrumentationBackend.solo.getCurrentActivity();
-		
-		Result result = new Result(true, currentActivity.getClass().getSimpleName());
-		
-		if( currentActivity instanceof TabActivity ) {
-			result.addBonusInformation( ((TabActivity)currentActivity).getTabHost().getCurrentTabTag() );
-		}
-		
-		return result;
-	}
-
-	@Override
-	public String key() {
-		return "get_activity_name";
-	}
-}

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

@@ -1,40 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.app.Activity;
-
-/**
- * This action checks that the current activity under test has the focus.
- * 
- * This is useful to run tests across different applications (for example,
- * your application launching the browser). Since the instrumentation can
- * only work with the application under test, then all we can assert is that
- * said application has lost the focus.
- * 
- * @author Gianpiero Puleo (gianpi@ustwo.co.uk)
- * @author Juan Delgado (juan@ustwo.co.uk)
- */
-@SuppressWarnings("deprecation")
-public class IsCurrentActivityFocused implements Action {
-
-	@Override
-	public Result execute(String... args) {
-		
-		Activity currentActivity = InstrumentationBackend.solo.getCurrentActivity();
-		
-		String hasFocus = "false";
-		
-		if (currentActivity.hasWindowFocus()) {
-			hasFocus = "true";
-		}
-		
-		return new Result(true, hasFocus);	
-	}
-
-	@Override
-	public String key() {
-		return "is_current_activity_focused";
-	}
-}

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

@@ -1,248 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-import java.io.IOException;
-import java.lang.RuntimeException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import android.os.Looper;
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
-import sh.calaba.org.codehaus.jackson.type.TypeReference;
-
-import android.os.Build;
-import android.os.ConditionVariable;
-import android.view.View;
-import android.webkit.JsPromptResult;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-
-public class CalabashChromeClient extends WebChromeClient {
-	private WebChromeClient mWebChromeClient;
-	private final WebView webView;
-	private final WebFuture scriptFuture;
-
-	public CalabashChromeClient(final WebView webView) {
-		this.webView = webView;
-		this.scriptFuture = new WebFuture(webView);
-		if (Build.VERSION.SDK_INT < 16) { // jelly bean
-			try {
-				Method methodGetConfiguration = webView.getClass().getMethod(
-						"getWebChromeClient");
-				mWebChromeClient = (WebChromeClient) methodGetConfiguration
-						.invoke(webView);
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-		}  else {
-				
-				/*
-				 * pick up the chromeClient from the webView
-				 * this is required because in Jelly Bean there is no getWebChromeClient
-				 * above sdk 16.This will help HTML5 hybrid application (Cordova) to pass the prompt messages 
-				 * to Native code. Previously the CalabashChromeClient did not populate the mWebChromeClient
-				 * which lead to the Cordova.exec messages not forward to the Cordova ChromeClient.
-				 */
-				Field field = getChromeClientField(webView.getClass());
-				if (field == null) {
-					mWebChromeClient = null;
-				}
-				else {
-					try {
-						field.setAccessible(true);
-						mWebChromeClient = (WebChromeClient) field.get(webView);
-					} catch (IllegalArgumentException e) {					
-						e.printStackTrace();
-						throw new UnableToFindChromeClientException(e, webView);
-					} catch (IllegalAccessException e) {
-						
-						e.printStackTrace();
-						throw new UnableToFindChromeClientException(e, webView);
-					}	
-				}
-	
-							
-		}
-
-        if ( Looper.getMainLooper().getThread() == Thread.currentThread()) {
-            webView.setWebChromeClient(this);
-        } else {
-            InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {
-                @Override
-                public void run() {
-                    webView.setWebChromeClient(CalabashChromeClient.this);
-                }
-            });
-        }
-	}
-
-	/*
-	 * returns the chromeClient from the WebView.
-	 * recursively moves up to its superClass to get the chromeClient 
-	 * if there is no chromeClient it returns null.
-	 */
-	private Field getChromeClientField(Class currentClass) {
-		if (currentClass == null)
-			return null;
-		try {
-			return currentClass.getDeclaredField("chromeClient");
-		} catch (NoSuchFieldException e) {
-			return getChromeClientField(currentClass.getSuperclass());
-		}
-	}
-
-	@Override
-	public boolean onJsPrompt(WebView view, String url, String message,
-			String defaultValue, JsPromptResult r) {
-		if (message != null && message.startsWith("calabash:")) {
-			r.confirm("CALABASH_ACK");
-			System.out.println("onJsPrompt: " + message);
-			String jsonResponse = message.replaceFirst("calabash:", "");
-			scriptFuture.setResult(jsonResponse);			
-			return true;
-		} else {
-			if (mWebChromeClient == null) {
-				r.confirm("CALABASH_ERROR");
-				scriptFuture.complete();
-				return true;
-			} else {
-				// TODO I'm not what this case does...
-				return mWebChromeClient.onJsPrompt(view, url, message,
-						defaultValue, r);
-			}
-		}
-	}
-
-	public WebView getWebView() {
-		return webView;
-	}
-
-	public static CalabashChromeClient prepareWebView(WebView webView) {
-		CalabashChromeClient calabashChromeClient = new CalabashChromeClient(
-				webView);
-		webView.getSettings().setJavaScriptEnabled(true);
-		return calabashChromeClient;
-	}
-
-	public static List<CalabashChromeClient> findAndPrepareWebViews() {
-		List<CalabashChromeClient> webViews = new ArrayList<CalabashChromeClient>();
-		ArrayList<View> views = InstrumentationBackend.solo.getCurrentViews();
-		for (View view : views) {
-			if (view instanceof WebView) {
-				WebView webView = (WebView) view;
-				webViews.add(prepareWebView(webView));
-			}
-		}
-		return webViews;
-
-	}
-
-	public WebFuture getResult() {
-		return scriptFuture;
-	}
-
-    public void evaluateCalabashScript(String script) {
-        webView.evaluateJavascript(script, new ValueCallback<String>() {
-            public void onReceiveValue(String rawResponseJSON) {
-                String jsonResponse = null;
-
-                try {
-                    jsonResponse = new ObjectMapper().readValue(
-                            rawResponseJSON, new TypeReference<String>() {
-                    });
-                } catch (IOException e) {
-                    throw new RuntimeException("Incorrect JSON format returned from javascript: " + rawResponseJSON, e);
-                }
-
-                scriptFuture.setResult(jsonResponse);
-            }
-        });
-    }
-
-    @SuppressWarnings("rawtypes")
-	public static class WebFuture implements Future {
-		private final ConditionVariable eventHandled;
-		private volatile boolean complete;
-		private String result;
-		private final WebView webView;
-
-		public WebView getWebView() {
-			return webView;
-		}
-
-		public void complete() {
-			this.complete = true;
-			this.eventHandled.open();
-		}
-
-		public WebFuture(WebView webView) {
-			this.webView = webView;
-			eventHandled = new ConditionVariable();
-			result = null;
-		}
-
-		public synchronized void setResult(String result) {
-			this.result = result;
-			this.complete();
-		}
-
-		public synchronized String getResult() {
-			return this.result;
-		}
-
-		public boolean cancel(boolean mayInterruptIfRunning) {
-			return false;
-		}
-
-		@Override
-		public Object get() throws InterruptedException, ExecutionException {
-			eventHandled.block();
-			return asMap();
-		}
-
-		@Override
-		public Object get(long timeout, TimeUnit unit)
-				throws InterruptedException, ExecutionException,
-				TimeoutException {
-			eventHandled.block(unit.convert(timeout, TimeUnit.MILLISECONDS));
-			return asMap();
-		}
-
-		@Override
-		public boolean isCancelled() {
-			return false;
-		}
-
-		@Override
-		public boolean isDone() {
-			return complete;
-		}
-
-		public String getAsString() {				
-			try {
-				get(10,TimeUnit.SECONDS);
-				return getResult();
-			} catch (Exception e) {
-				e.printStackTrace();
-				throw new RuntimeException(e);
-			}			
-		}
-		
-		@SuppressWarnings("unchecked")
-		public Map asMap() {			
-			HashMap m = new HashMap();
-			m.put("webView", webView);
-			m.put("result",getResult());			
-			return m;
-		}
-	}
-}

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

@@ -1,53 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
-import android.webkit.WebView;
-
-@Deprecated
-public class DumpBodyHtml implements Action {
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-    public Result execute(String... args) {
-    	                             	
-    	List<WebFuture> webResults = (List<WebFuture>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {			
-			public Object call() throws Exception {
-				
-				List<WebFuture> webResults = new ArrayList();
-				for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-		    		WebView webView = ccc.getWebView();
-		            webView.loadUrl("javascript:(function() {" +
-		                    "prompt('calabash:' + document.body.innerHTML);" +
-		                    "})()");
-		            webResults.add(ccc.getResult());		            
-		        }
-				return webResults;
-				
-			}
-		});
-    	
-    	List<String> allResults = new ArrayList<String>(webResults.size());
-    	for (WebFuture f : webResults) {
-    		allResults.add(f.getAsString());			    		
-    	}
-    		
-    	if (allResults.size() == 0) {
-    		return new Result(false, "No WebView found");	
-    	}
-    	else {
-    		return new Result(true, allResults);
-    	}    	
-        
-    }
-    public String key() {
-        return "dump_body_html";
-    }
-}

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

@@ -1,55 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
-import android.webkit.WebView;
-
-public class DumpHtml implements Action {
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-    public Result execute(String... args) {
-    	
-    	List<WebFuture> webResults = (List<WebFuture>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {			
-			
-			public Object call() throws Exception {
-				
-				List<WebFuture> webResults = new ArrayList();
-				for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-		    		final WebView webView = ccc.getWebView();
-		            webView.loadUrl("javascript:(function() {" +
-		                    "prompt('calabash:' + document.body.parentNode.innerHTML);" +
-		                    "})()");		            
-		            webResults.add(ccc.getResult());
-		        }
-				return webResults;
-				
-			}
-		});
-    	
-    	List<String> allResults = new ArrayList<String>(webResults.size());
-    	for (WebFuture f : webResults) {
-    		allResults.add(f.getAsString());			    		
-    	}
-    		
-    	if (allResults.size() == 0) {
-    		return new Result(false, "No WebView found");	
-    	}
-    	else {
-    		return new Result(true, allResults);
-    	}
-
-    }
-
-    @Override
-    public String key() {
-        return "dump_html";
-    }
-}