calabash-android 0.4.22.pre4 → 0.5.0.pre1

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

@@ -1,31 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-
-public class HasView implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        final String idArgument = args[0];
-        final View foundView = TestHelpers.getViewById(idArgument);
-        
-        if( null == foundView ) {
-            return notFoundResult(idArgument);
-        }
-        
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "has_view";
-    }
-
-    private Result notFoundResult(final String firstArgument) {
-        return Result.failedResult(String.format("View with id %s was not found", firstArgument));
-    }
-}
-

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

@@ -1,30 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-
-public class IsEnabled implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        final String firstArgument = args[0];
-        final View foundView = TestHelpers.getViewById(firstArgument);
-        
-        if( null == foundView ) {
-            return notFoundResult(firstArgument);
-        }
-        
-        return new Result(foundView.isEnabled());
-    }
-
-    @Override
-    public String key() {
-        return "is_enabled";
-    }
-
-    private Result notFoundResult(final String firstArgument) {
-        return Result.failedResult(String.format("View with id %s was not found", firstArgument));
-    }
-}

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

@@ -1,34 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-
-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;
-
-
-/*
- * Warning: Unlike most other actions this action will allow you to click on views that are not visible.
- */
-public class LongPressOnViewById implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        final View view = TestHelpers.getViewById(args[0]);
-
-        if(view == null) {
-            return new Result(false, "Could not find view with id: '" + args[0] + "'");
-        }
-        InstrumentationBackend.solo.clickLongOnView(view);
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "long_press_on_view_by_id";
-    }
-
-   
-    
-}

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

@@ -1,89 +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.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-
-public class Press implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        View viewToPress = null;
-        String helpText = "";
-        String description = args[0];
-        // Try to press button
-
-        InstrumentationBackend.solo.searchButton(description);
-        helpText += "Buttons:\n";
-        for (Button b : InstrumentationBackend.solo.getCurrentViews(Button.class)) {
-            helpText += b.getText() + "\n";
-            if (b.getText().toString().equalsIgnoreCase(description)) {
-                System.out.println("Found button to press:" + b);
-                viewToPress = b;
-                break;
-            }
-        }
-
-        // Try to press view with content description
-        if (viewToPress == null) {
-            helpText += "Content descriptions:\n";
-            for (View view : InstrumentationBackend.solo.getCurrentViews()) {
-                String viewDescription = view.getContentDescription() != null ? view.getContentDescription().toString() : "";
-
-                if (viewDescription.length() > 0) {
-                    helpText += viewDescription + "\n";
-                }
-                if (viewDescription != null && viewDescription.equalsIgnoreCase(description)) {
-                    System.out.println("Found view to press:" + view);
-                    viewToPress = view;
-                    break;
-                }
-            }
-        }
-
-        // Try to find view with matching class name
-        if (viewToPress == null) {
-        	InstrumentationBackend.solo.searchText(description);
-        	System.out.println("searchText(" + description + ")");
-        	helpText += "Classes:\n";
-            for (View v : InstrumentationBackend.solo.getCurrentViews()) {
-                if (v.getClass() == TextView.class) {
-                    TextView tv = (TextView) v;
-                    helpText += v.getClass().getName() + "(" + tv.getText().toString() + ")(" + tv.getParent().getClass() + ")\n";
-                    if (tv.getText().toString().equalsIgnoreCase(description)) {
-                        viewToPress = v;
-                        break;
-                    }
-
-                } else {
-                    helpText += v.getClass().getName() + "\n";
-                    if (v.getClass().getName().endsWith(description)) {
-                        viewToPress = v;
-                        break;
-                    }
-                }
-            }
-        }
-        if (viewToPress != null) {
-            System.out.println("Pressing:" + viewToPress);
-            if (viewToPress instanceof TextView) {
-                System.out.println("Pressing(.getText()):" + ((TextView) viewToPress).getText());
-            }
-            InstrumentationBackend.solo.clickOnView(viewToPress);
-            return Result.successResult();
-        } else {
-            return new Result(false, ("Could not find anything to press matching: '" + description + "' found: \n" + helpText));
-        }
-    }
-
-    @Override
-    public String key() {
-        return "press";
-    }
-
-}

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

@@ -1,110 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.view;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.app.Activity;
-import android.app.TabActivity;
-import android.util.Log;
-import android.view.View;
-import android.widget.TabHost;
-import android.widget.TextView;
-
-/**
- * Select the tab by 1-based index or by name
- * 
- * @author Nicholas Albion
- */
-@SuppressWarnings("deprecation")
-public class SelectTab implements Action {
-	@Override
-	public Result execute(String... args) {
-		
-		Activity currentActivity = InstrumentationBackend.solo.getCurrentActivity();
-		
-		if( currentActivity instanceof TabActivity == false ) {
-			Activity parent = currentActivity.getParent();
-			if( parent != null ) {
-				currentActivity = parent;
-			}
-		}
-		
-		if( currentActivity instanceof TabActivity ) {
-			final TabHost tabHost = ((TabActivity)currentActivity).getTabHost();
-			
-			String tabName = args[0];
-			if( tabName.length() == 1 ) {
-				char c = tabName.charAt(0);
-				if( c >= '0' && c <= '9' ) {
-					int index = (c - '0') - 1;
-					tabHost.setCurrentTab( index );
-					return Result.successResult();
-				}
-			}
-
-			List<String> foundTabs = new LinkedList<String>();
-			int numberOfTabs = ((TabActivity)currentActivity).getTabWidget().getTabCount();
-			Log.i("SelectTab", "numberOfTabs: " + numberOfTabs);
-			
-			String resultMessage = null;
-			int tabIndex;
-FIND_TAB:			
-			for( tabIndex = 0; tabIndex < numberOfTabs; tabIndex++ ) {
-				if( tabName.equals( tabHost.getTag(tabIndex) ) ) {
-					resultMessage = "Selected the tab by tag";
-					break;
-				}
-				
-				String currentTab;
-				View view = tabHost.getTabWidget().getChildTabViewAt(tabIndex);
-        		if( view instanceof TextView ) {
-        			currentTab = ((TextView)view).getText().toString();	
-        			if( tabName.equals(currentTab) ) {
-        				resultMessage = "Selected the tab by text view";
-        				break;
-            		}
-        			foundTabs.add(currentTab);
-        		} else {
-        			Log.i("SelectTab", "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("SelectTab", " child text view: " + currentTab);
-            			if( tabName.equals(currentTab) ) {
-            				resultMessage = "Selected the tab by child text view";
-            				break FIND_TAB;
-                		}
-            			foundTabs.add(currentTab);
-					}
-        		}
-			}
-			
-			if( resultMessage != null ) {
-				final int matchingTabIndex = tabIndex;
-				
-				currentActivity.runOnUiThread( new Runnable() {
-					@Override
-					public void run() {
-						tabHost.setCurrentTab( matchingTabIndex );
-					}
-				});
-				
-				return new Result(true, resultMessage);
-			}
-			
-			Result result = new Result(false, "Was unable to find a matching tab");
-			result.setExtras( foundTabs );
-			return result;
-		} else {
-			return new Result(false, "The current activity is not a TabActivity: " + currentActivity.getLocalClassName() );
-		}
-	}
-
-	@Override
-	public String key() {
-		return "select_tab";
-	}
-}

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

@@ -1,24 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.wait;
-
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-
-public class Wait implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        int seconds = Integer.parseInt(args[0]);
-
-        TestHelpers.wait(seconds);
-
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "wait";
-    }
-}

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

@@ -1,21 +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 WaitForDialogClose implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        InstrumentationBackend.solo.waitForDialogToClose(30000);
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "wait_for_dialog_to_close";
-    }
-}

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

@@ -1,47 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.wait;
-
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import android.view.View;
-import android.widget.ProgressBar;
-
-
-public class WaitForProgress implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        int timeout = 60000;
-        long waitUntil = System.currentTimeMillis() + timeout;
-
-        while (numberOfVisibleProgressBars() > 0) {
-            if (System.currentTimeMillis() > waitUntil) {
-                return new Result(false, "Timedout waiting for no visible progressbars (" + numberOfVisibleProgressBars() +" still visible).");
-            }
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        return Result.successResult();
-    }
-
-    @Override
-    public String key() {
-        return "wait_for_no_progress_bars";
-    }
-
-    private int numberOfVisibleProgressBars() {
-        int visibleProgressBars = 0;
-        for (ProgressBar v : InstrumentationBackend.solo.getCurrentViews(ProgressBar.class)) {
-            if (v != null & v.getVisibility() != View.GONE && v.getVisibility() != View.INVISIBLE && v.isShown()) {
-                visibleProgressBars++;
-                System.out.println("Found visible progressbar number:" + visibleProgressBars);
-            }
-        }
-        return visibleProgressBars;
-    }
-
-}

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

@@ -1,54 +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 WaitForScreen implements Action {
-	private static final int DEFAULT_TIMEOUT = 5 * 1000;
-
-    @Override
-    public Result execute(String... args) {
-        switch (args.length) {
-        case 0:
-            return new Result(false, "Cannot check for correct screen. No Activity name supplied!");
-        case 1: {
-            if (InstrumentationBackend.solo.waitForActivity(args[0], DEFAULT_TIMEOUT)) {
-                return Result.successResult();
-            } else {
-            	String currentActivity = InstrumentationBackend.solo.getCurrentActivity().getClass().getSimpleName();
-            	Result result = new Result(false, "Screen " + args[0] + " not found.  Current activity is " + currentActivity);
-            	result.addBonusInformation(currentActivity);
-            	return result;
-            }
-        }
-        case 2: { // 1st arg is Activity name, 2nd arg is timeout
-            int timeout;
-            
-            try {
-                // given seconds; want milliseconds
-                timeout = 1000 * Integer.parseInt(args[1]);
-            } catch (NumberFormatException e) {
-                return new Result(false, "Invalid timeout supplied. Should be an integer!"); 
-            }
-            
-            if (InstrumentationBackend.solo.waitForActivity(args[0], timeout)) {
-                return Result.successResult();
-            } else {
-                String currentActivity = InstrumentationBackend.solo.getCurrentActivity().getClass().getSimpleName();
-            	Result result = new Result(false, "Screen " + args[0] + " not found.  Current activity is " + currentActivity);
-            	result.addBonusInformation(currentActivity);
-            	return result;
-            }
-        }
-        default:
-            return new Result(false, "Too many argument supplied to wait_for_screen!");
-        }
-    }
-
-    @Override
-    public String key() {
-        return "wait_for_screen";
-    }
-
-}