calabash-android 0.4.22.pre4 → 0.5.0.pre1

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

@@ -1,108 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.wait;
-
-import java.util.List;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.View;
-import android.widget.TabHost;
-import android.widget.TextView;
-
-/**
- * Waits for a tab by name
- * 
- * @author Nicholas Albion
- */
-public class WaitForTab implements Action {
-
-    @Override
-    public Result execute(String... args) {
-
-        final int DEFAULT_TIMEOUT = 5 * 1000;
-        int timeout = DEFAULT_TIMEOUT;
-
-        switch (args.length) {
-        case 0:
-            return new Result(false, "Cannot check for correct screen. No tab name supplied!");
-        case 1: {
-        	return waitForTab( args[0], DEFAULT_TIMEOUT );
-        }
-        case 2: { // 1st arg is Activity name, 2nd arg is timeout
-            try {
-                timeout = Integer.parseInt(args[1]);
-            } catch (NumberFormatException e) {
-                return new Result(false, "Invalid timeout supplied. Should be an integer!"); 
-            }            
-            return waitForTab( args[0], timeout );
-        }
-        default:
-            return new Result(false, "Too many argument supplied to wait_for_tab!");
-        }
-    }
-    
-    private Result waitForTab( String tabName, int timeout ) {
-    	int tabHostIndex = 0;
-    	long startTime = SystemClock.uptimeMillis();
-    	// TabHost tabHost = InstrumentationBackend.solo.getView( TabHost.class, tabHostIndex );		// waits 10 seconds
-    	
-    	if( InstrumentationBackend.solo.waitForView( TabHost.class, 1, timeout ) ) {
-        	TabHost tabHost = (TabHost)InstrumentationBackend.solo.getView(TabHost.class, tabHostIndex);
-        	
-        	boolean tabFound = false;
-        	int numberOfTabs = tabHost.getChildCount();
-        	for( int i = 0; i < numberOfTabs; i++ ) {
-        		if( tabName.equals( tabHost.getTag(i) ) ) {
-        			tabFound = true;
-        			break;
-        		}
-        	}
-        	if( tabFound == false ) {
-        		Log.w("WaitForTab", "Tab was not found: " + tabName);
-//        		return new Result(false, "Tab " + tabName + " not found");
-        	}
-        	
-        	String currentTab;
-        	do {
-        		int tabIndex = tabHost.getCurrentTab();
-        		View view = tabHost.getTabWidget().getChildTabViewAt(tabIndex);
-        		if( view instanceof TextView ) {
-        			currentTab = ((TextView)view).getText().toString();	
-        			if( tabName.equals(currentTab) ) {
-        				return new Result(true, "The current tab text view matches");
-            		}
-        		} else {
-        			Log.i("WaitForTab", "current tab view: " + view.getId() + ", " + view.getClass().getSimpleName());
-        			List<TextView> textViews = InstrumentationBackend.solo.getCurrentViews(TextView.class, view);
-        			for( TextView textView : textViews ) {
-        				currentTab = textView.getText().toString();
-        				Log.i("WaitForTab", " child text view: " + currentTab);
-            			if( tabName.equals(currentTab) ) {
-            				return new Result(true, "The current tab text view matches");
-                		}
-					}
-        		}
-        		
-        		currentTab = tabHost.getCurrentTabTag();
-        		
-        		if( tabName.equals(currentTab) ) {
-        			return new Result(true, "The current tab's tag matches");
-        		}
-        		try {
-					Thread.sleep(500);
-				} catch (InterruptedException e) {}
-        	} while( (SystemClock.uptimeMillis() - startTime) < timeout );
-        
-            return new Result(false, "The current tab is: " + currentTab + ", was tab even found? " + tabFound);
-        } else {
-            return new Result(false, "Timed out waiting for a TabActivity. Current activity is " + InstrumentationBackend.solo.getCurrentActivity().getLocalClassName());
-        }
-    }
-
-    @Override
-    public String key() {
-        return "wait_for_tab";
-    }
-}

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

@@ -1,37 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.wait;
-
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-
-public class WaitForText implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        
-        int timeout = 90 * 1000;
-        if (args.length > 1) { // a second argument is a timeout
-            try {
-                // the argument is in seconds but robotium takes milliseconds
-                timeout = 1000 * Integer.parseInt(args[1]);
-            } catch (NumberFormatException e) {
-                return new Result(false, "Invalid timeout supplied. Should be an integer."); 
-            }
-        }
- 
-        boolean timedOut = !InstrumentationBackend.solo.waitForText(args[0], 1, timeout);
-        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_text";
-    }
-}

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

@@ -1,43 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.wait;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-
-public class WaitForView implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        String text = args[0];
-        long endTime = System.currentTimeMillis() + 60000;
-        while (System.currentTimeMillis() < endTime) {
-            if (InstrumentationBackend.solo.searchButton(text) || searchForViewWithContentDescription(text)) {
-                return Result.successResult();
-            } else {
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    return Result.fromThrowable(e);
-                }
-            }
-        }
-        return new Result(false, "Timed out while waiting for view with text or contentDescription:'" + text + "'");
-    }
-
-    @Override
-    public String key() {
-        return "wait_for_view";
-    }
-
-    private boolean searchForViewWithContentDescription(String description) {
-        View view = TestHelpers.getViewByDescription(description);
-        if (view != null) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-}

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

@@ -1,58 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.wait;
-
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-
-
-public class WaitForViewById implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        String viewId = args[0];
-        
-        try {
-        	if( getViewById(viewId, 60000) != null ) {
-        		return Result.successResult();
-        	} else {
-        		return new Result(false, "Waiting for view with id '" + viewId + "' to be visible timed out");
-        	}
-        } catch( InterruptedException e ) {
-    		return Result.fromThrowable(e);
-    	}
-    }
-    
-    protected View getViewById( String viewId, long timeout ) throws InterruptedException {
-        
-    	System.out.println("Waiting for view with id '" + viewId + "' to appear");
-    	
-    	View view = TestHelpers.getViewById(viewId);
-    	
-    	// no view, quick exit
-    	if(view == null){
-    	    throw new IllegalArgumentException("Could not find view with id '" + viewId + "'");
-    	}
-    	
-    	System.out.println("Waiting for view with id '" + viewId + "' found view " + view);
-    	
-        long endTime = System.currentTimeMillis() + timeout;
-        while (System.currentTimeMillis() < endTime) {
-            if (view.getVisibility() == View.VISIBLE) {
-                System.out.println("View with id '" + viewId + "' is visible, success");
-                return view;
-            } else {
-            	System.out.println("View with id '" + viewId + "' is not visible, sleeping...");
-            	Thread.sleep(500);
-            }
-        }
-        
-        return null;
-    }
-
-    @Override
-    public String key() {
-        return "wait_for_view_by_id";
-    }
-}

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

@@ -1,44 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-import sh.calaba.instrumentationbackend.query.Operation;
-
-public class JavaScriptOperation implements Operation {
-
-	public final String script;
-	public final String arg;	
-
-	public JavaScriptOperation(String script, String args) {		
-		this.script = script;
-		this.arg = args;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Object apply(Object o) {	
-		throw new UnsupportedOperationException("asd");
-		/*
-		Map<String, Object> domEl = (Map<String, Object>) o;
-		
-		WebView webView = (WebView) domEl.get("webView");
-		
-		domEl.remove("class");
-		domEl.remove("html");
-		domEl.remove("webView");
-		
-		String elJson = QueryHelper.toJsonString(domEl);
-
-		
-		WebFuture asyncRes = QueryHelper.executeAsyncJavascriptInWebviews(webView, this.script,
-						elJson, this.arg);		
-		return asyncRes.getAsString();		
-		*/
-	}
-
-	@Override
-	public String getName() {
-		return "JSOp[script="+this.script+"]";
-	}
-	
-	
-
-}

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

@@ -1,70 +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 PressByCssSelector implements Action {
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-    public Result execute(final 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() {" +
-		                    "var element = document.querySelector(\"" + args[0] + "\");" +
-		                    "if (element != null) {" +
-		                    "	var oEvent = document.createEvent ('MouseEvent');" +
-		                    "	oEvent.initMouseEvent('click', true, true,window, 1, 1, 1, 1, 1, false, false, false, false, 0, element);" +
-		                    "	element.dispatchEvent( oEvent );" +
-		                    "	prompt('calabash:true');" +
-                            "   return;" +
-		                    "}" +
-		                    "prompt('calabash:false');" +
-		                    "})()");
-
-		           webResults.add(ccc.getResult());		           		          
-		        }
-				return webResults;
-				
-			}
-		});
-    	
-    	List<String> allResults = new ArrayList<String>(webResults.size());
-    	boolean success = false;
-    	for (WebFuture f : webResults) {
-    		String result = f.getAsString();
-			allResults.add(result);
-    		if ("true".equals(result)) {	               
-               success = true;
-            }
-    	}
-    		
-    	if (allResults.size() == 0) {
-    		return new Result(false, "No WebView found");	
-    	}
-    	else {
-    		return new Result(success, allResults);
-    	}
-      }
-
-            @Override
-    public String key() {
-        return "click_by_selector";
-    }
-
-}

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

@@ -1,64 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-
-import android.webkit.WebView;
-
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import sh.calaba.instrumentationbackend.query.QueryResult;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
-
-
-public class SetText implements Action {
-
-	/**
-	 * args[0]: Selector type "xpath" or "css"
-	 * args[1]: xpath or css selector
-	 * args[2]: text to enter into the first selected element 
-	 */
-	@SuppressWarnings({ "rawtypes", "unchecked"})
-	@Override
-    public Result execute(final String... args) {
-        String query = args[1];
-        if (!query.startsWith("'")) {
-            query = "'" + query;
-        }
-        if (!query.endsWith("'")) {
-            query = query + "'";
-        }
-
-        final String uiQuery = "android.webkit.WebView " + args[0] + ":" + query;
-        QueryResult queryResult = new sh.calaba.instrumentationbackend.query.Query(uiQuery).executeQuery();
-        if (queryResult.isEmpty()) {
-            return Result.failedResult("No element found: " + query);
-        }
-        Map<String, Object> firstElement = QueryHelper.findFirstVisibleElement(queryResult.getResult());
-        firstElement.remove("class");
-        firstElement.remove("html");
-        final WebView webView =  (WebView) firstElement.remove("webView");
-
-        final String firstElementJson = QueryHelper.toJsonString(firstElement);
-
-
-        Map<String, Object> result = (Map<String, Object>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {
-            @Override
-            public Object call() throws Exception {
-                return QueryHelper.executeAsyncJavascriptInWebviews(webView, "set_text.js", firstElementJson, args[2]);
-            }
-        });
-
-        if (result.containsKey("error")) {
-            return Result.failedResult(result.get("details").toString());
-        }
-        return new Result(true);
-     }
-
-     @Override
-     public String key() {
-         return "set_text";
-     }
-
- }