calabash-android 0.4.0.pre6 → 0.4.0.pre7

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

@@ -1,24 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-
-public class Query implements Action {
-
-    @Override
-    public Result execute(String... args) {
-    	    	
-    	String result = QueryHelper.executeJavascriptInWebview("calabash.js", args[1], args[0]);
-    	return new Result(true, result);
-    }
-
-    @Override
-    public String key() {
-        return "query";
-    }
-    
-    
-
-}

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

@@ -1,44 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
-import sh.calaba.org.codehaus.jackson.type.TypeReference;
-
-
-public class Touch implements Action {
-
-    @Override
-    public Result execute(String... args) {
-
-        try {
-            String queryResult = QueryHelper.executeJavascriptInWebview("calabash.js", args[1], args[0]);
-            List<HashMap<String,Object>> p = new ObjectMapper().readValue(queryResult, new TypeReference<List<HashMap<String,Object>>>(){});
-
-            if (p.isEmpty()) {
-                throw new RuntimeException("No element found");
-            }
-
-            Map<String, Object> firstRect = QueryHelper.findFirstVisibleRectangle(p);
-
-            float[] screenCoordinates = QueryHelper.getScreenCoordinatesForCenter(firstRect);
-
-            InstrumentationBackend.solo.clickOnScreen(screenCoordinates[0], screenCoordinates[1]);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        return new Result(true, "");
-    }
-
-    @Override
-    public String key() {
-        return "touch";
-    }
-}

data/test-server/instrumentation-backend/tests/sh/calaba/instrumentationbackend/query/tests/UIQueryTest.java

@@ -1,134 +0,0 @@
-package sh.calaba.instrumentationbackend.query.tests;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryAST;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryASTClassName;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryEvaluator;
-
-public class UIQueryTest extends TestCase {
-
-	@SuppressWarnings("rawtypes")
-	public void testEvaluateQueryOnEmpty() {
-		String query = "button";
-		List res = UIQueryEvaluator.evaluateQuery(query, Collections.EMPTY_LIST);		
-		assertEquals(0, res.size());
-	}
-
-	public void testConvertSimpleQueryToUIQueryAst() throws Exception {
-		List<UIQueryAST> parsedQuery = UIQueryEvaluator.parseQuery("button");
-		assertEquals(1, parsedQuery.size());
-		
-		UIQueryAST uiQueryAST = parsedQuery.get(0);
-		
-		assertTrue(uiQueryAST instanceof UIQueryASTClassName);
-		assertEquals("button", ((UIQueryASTClassName)uiQueryAST).simpleClassName);
-		
-	}
-
-	public void testConvertQualifiedQueryToUIQueryAst() throws Exception {
-		List<UIQueryAST> parsedQuery = UIQueryEvaluator.parseQuery("junit.framework.TestCase");
-		assertEquals(1, parsedQuery.size());
-		
-		UIQueryAST uiQueryAST = parsedQuery.get(0);
-		
-		assertTrue(uiQueryAST instanceof UIQueryASTClassName);				
-		assertEquals(junit.framework.TestCase.class, ((UIQueryASTClassName)uiQueryAST).qualifiedClassName);
-	}
-	
-	public void testConvertComposedQueryToUIQueryAst() throws Exception {
-		List<UIQueryAST> parsedQuery = UIQueryEvaluator.parseQuery("view button");
-		assertEquals(2, parsedQuery.size());
-		
-		UIQueryAST uiQueryASTFirst = parsedQuery.get(0);
-		UIQueryAST uiQueryASTSecond = parsedQuery.get(1);
-		
-		assertTrue(uiQueryASTFirst instanceof UIQueryASTClassName);
-		assertTrue(uiQueryASTSecond instanceof UIQueryASTClassName);
-		
-		assertEquals("view", ((UIQueryASTClassName)uiQueryASTFirst).simpleClassName);
-		assertEquals("button", ((UIQueryASTClassName)uiQueryASTSecond).simpleClassName);
-		
-	}
-
-	
-	private static class View {
-		@SuppressWarnings("rawtypes")
-		List views;
-
-		@SuppressWarnings("rawtypes")
-		public View(List views) {
-			super();
-			this.views = views;
-		}
-		public Object getChildAt(int idx)
-		{			
-			return this.views.get(idx);
-		}
-		@SuppressWarnings("unused")
-		public Object getChildCount() {return this.views.size();}
-		
-	}
-	private static class SubView extends View {
-
-		@SuppressWarnings("rawtypes")
-		public SubView(List views) {
-			super(views);
-		}
-		
-	}
-	private static class Button extends View {
-
-		@SuppressWarnings("rawtypes")
-		public Button(List views) {
-			super(views);
-			// TODO Auto-generated constructor stub
-		}
-		
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public void testEvaluateSimpleQuery() throws Exception {
-		List<View> views = setupViews();
-		
-		List evaluateQuery = UIQueryEvaluator.evaluateQuery("subview", views);
-		assertEquals(1, evaluateQuery.size());
-		assertTrue(evaluateQuery.get(0) instanceof SubView);
-		
-		List evaluateQueryButtons = UIQueryEvaluator.evaluateQuery("button", views);
-		assertEquals(3, evaluateQueryButtons.size());
-		assertTrue(evaluateQueryButtons.get(0) instanceof Button);
-		assertTrue(evaluateQueryButtons.get(1) instanceof Button);
-		assertTrue(evaluateQueryButtons.get(2) instanceof Button);
-		
-	}
-	
-
-	@SuppressWarnings("rawtypes")
-	public void testEvaluateComposedQuery() throws Exception {
-		List<View> views = setupViews();
-		SubView vv = (SubView) views.get(1);
-		Button b = (Button) vv.getChildAt(0);
-		
-		List evaluateQuery = UIQueryEvaluator.evaluateQuery("subview button", views);
-		assertEquals(1, evaluateQuery.size());
-		assertTrue(evaluateQuery.get(0) instanceof Button);
-		assertEquals(evaluateQuery.get(0), b);
-		
-		
-	}
-
-	private List<View> setupViews() {
-		return Arrays.asList(new View[]{
-			new Button(Collections.EMPTY_LIST),
-			new SubView(Arrays.asList(new View[]{
-					new Button(Collections.EMPTY_LIST)
-			})),
-			new Button(Collections.EMPTY_LIST)
-		});
-	}
-
-}