adding more TODOs

freynaud · freynaud · commit 6bc9117ec1fe · 2013-01-08T11:41:08.000Z
diff --git a/release.notes b/release.notes
@@ -28,7 +28,8 @@
 - handle alerts for web
 - cleanup and document setValue vs sendKeys
 - send info to jason to start / compile etc + feature list.
-
+- implicit wait for web ( would help with pageLoad issues )
+- avoid switching between native and web for internal command.
 
 
 
diff --git a/server/src/main/java/org/uiautomation/ios/mobileSafari/DefaultMessageHandler.java b/server/src/main/java/org/uiautomation/ios/mobileSafari/DefaultMessageHandler.java
@@ -46,7 +46,6 @@ public DefaultMessageHandler(EventListener listener, ResponseFinder... finders)
     for (ResponseFinder finder : finders) {
       this.extraFinders.add(finder);
     }
-
   }
 
   @Override
diff --git a/server/src/main/java/org/uiautomation/ios/mobileSafari/WebInspector.java b/server/src/main/java/org/uiautomation/ios/mobileSafari/WebInspector.java
@@ -110,7 +110,7 @@ public WebInspector(UIADriver nativeDriver, String bundleId, ServerSideSession s
     this.session = session;
     DOMContext context = session.getContext().getDOMContext();
     protocol =
-        new DebugProtocol(context, bundleId, new AlertDetector((RemoteUIADriver) nativeDriver));
+        new DebugProtocol(context, bundleId/*, new AlertDetector((RemoteUIADriver) nativeDriver)*/);
     enablePageEvent();
   }
 
diff --git a/server/src/main/java/org/uiautomation/ios/server/CommandMapping.java b/server/src/main/java/org/uiautomation/ios/server/CommandMapping.java
@@ -44,6 +44,7 @@
 import org.uiautomation.ios.server.command.web.IsSelectedHandler;
 import org.uiautomation.ios.server.command.web.RefreshHandler;
 import org.uiautomation.ios.server.command.web.SetFrameHandler;
+import org.uiautomation.ios.server.command.web.SetImplicitWaitTimeoutHandler;
 import org.uiautomation.ios.server.command.web.SetTimeoutHandler;
 import org.uiautomation.ios.server.command.web.SetValueHandler;
 import org.uiautomation.ios.server.command.web.SubmitHandler;
@@ -59,7 +60,7 @@ public enum CommandMapping {
   SESSIONS(GetSessionsNHandler.class),
   DELETE_SESSION(StopSessionNHandler.class),
   SET_TIMEOUT(SetTimeoutNHandler.class, SetTimeoutHandler.class),
-  IMPLICIT_WAIT(SetImplicitWaitTimeoutNHandler.class, NotImplementedWebHandler.class),
+  IMPLICIT_WAIT(SetImplicitWaitTimeoutNHandler.class, SetImplicitWaitTimeoutHandler.class),
   GET_TIMEOUT(GetTimeoutNHandler.class),
 
   CONFIGURE(SetConfigurationNHandler.class),
diff --git a/server/src/main/java/org/uiautomation/ios/server/Context.java b/server/src/main/java/org/uiautomation/ios/server/Context.java
@@ -18,9 +18,9 @@
 
 /**
  * state of the current application under test
- * 
  */
 public class Context {
+
   private WorkingMode mode = WorkingMode.Native;
   private final DOMContext context;
 
@@ -37,7 +37,7 @@ public WorkingMode getWorkingMode() {
   }
 
   public void switchToFrame(String id) {
-    
+
   }
 
   public DOMContext getDOMContext() {
diff --git a/server/src/main/java/org/uiautomation/ios/server/DOMContext.java b/server/src/main/java/org/uiautomation/ios/server/DOMContext.java
@@ -141,6 +141,10 @@ public void waitForPageToLoad(long timeout) {
     return;
   }
 
+  public boolean isLoading() {
+    return !isReady();
+  }
+
   private boolean isReady() {
     try {
       String state = (String) session.getWebInspector().executeScript(
diff --git a/server/src/main/java/org/uiautomation/ios/server/command/BaseWebCommandHandler.java b/server/src/main/java/org/uiautomation/ios/server/command/BaseWebCommandHandler.java
@@ -23,12 +23,26 @@ public BaseWebCommandHandler(IOSDriver driver, WebDriverLikeRequest request) {
     super(driver, request);
   }
 
- 
+
   protected <T> T getConfiguration(String key) {
     return getConfiguration(key, (T) null);
   }
 
-  
+  protected void waitForPageToLoad() throws InterruptedException {
+    boolean loadHappened = false;
+    while (getSession().getContext().getDOMContext().isLoading()) {
+      loadHappened = true;
+      Thread.sleep(500);
+    }
+
+    // if safari, wait for things to stop moving ( for instance for the JS to execute and the URL
+    // bar to finish its animation.
+    if (loadHappened) {
+      Thread.sleep(1000);
+    }
+
+  }
+
   protected <T> T getConfiguration(String key, T defaultValue) {
     T webSpecific = getConf(WorkingMode.Web + "." + key);
     if (webSpecific != null) {
diff --git a/server/src/main/java/org/uiautomation/ios/server/command/web/FindElementHandler.java b/server/src/main/java/org/uiautomation/ios/server/command/web/FindElementHandler.java
@@ -21,6 +21,7 @@
 import org.uiautomation.ios.mobileSafari.NodeId;
 import org.uiautomation.ios.server.IOSDriver;
 import org.uiautomation.ios.server.command.BaseWebCommandHandler;
+import org.uiautomation.ios.webInspector.DOM.RemoteExceptionException;
 import org.uiautomation.ios.webInspector.DOM.RemoteWebElement;
 
 public class FindElementHandler extends BaseWebCommandHandler {
@@ -31,6 +32,41 @@ public FindElementHandler(IOSDriver driver, WebDriverLikeRequest request) {
 
   @Override
   public Response handle() throws Exception {
+    waitForPageToLoad();
+
+    int implicitWait = (Integer) getConf("implicit_wait", 0);
+    long deadline = System.currentTimeMillis() + implicitWait;
+    RemoteWebElement rwe = null;
+    do {
+      try {
+        rwe = findElement();
+        break;
+      } catch (NoSuchElementException e) {
+        //ignore.
+      } catch (RemoteExceptionException e2) {
+        // ignore.
+        // if the page is reloading, the previous nodeId won't be there anymore, resulting in a
+        // RemoteExceptionException: Could not find node with given id.Keep looking.
+      }
+    } while (System.currentTimeMillis() < deadline);
+
+    if (rwe == null) {
+      throw new NoSuchElementException(
+          "No element found for " + getRequest().getPayload() + " after waiting for " + implicitWait
+          + " ms.");
+    } else {
+      JSONObject res = new JSONObject();
+      res.put("ELEMENT", "" + rwe.getNodeId().getId());
+      Response resp = new Response();
+      resp.setSessionId(getSession().getSessionId());
+      resp.setStatus(0);
+      resp.setValue(res);
+      return resp;
+    }
+  }
+
+
+  private RemoteWebElement findElement() throws Exception {
     JSONObject payload = getRequest().getPayload();
     String type = payload.getString("using");
     String value = payload.getString("value");
@@ -56,18 +92,7 @@ public Response handle() throws Exception {
       String cssSelector = ToCSSSelectorConvertor.convertToCSSSelector(type, value);
       rwe = element.findElementByCSSSelector(cssSelector);
     }
-
-    JSONObject res = new JSONObject();
-    if (rwe == null) {
-      throw new NoSuchElementException("No element found for " + type + "=" + value);
-    } else {
-      res.put("ELEMENT", "" + rwe.getNodeId().getId());
-      Response resp = new Response();
-      resp.setSessionId(getSession().getSessionId());
-      resp.setStatus(0);
-      resp.setValue(res);
-      return resp;
-    }
+    return rwe;
   }
 
   @Override
diff --git a/server/src/main/java/org/uiautomation/ios/server/command/web/FindElementsHandler.java b/server/src/main/java/org/uiautomation/ios/server/command/web/FindElementsHandler.java
@@ -16,11 +16,13 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.remote.Response;
 import org.uiautomation.ios.communication.WebDriverLikeRequest;
 import org.uiautomation.ios.mobileSafari.NodeId;
 import org.uiautomation.ios.server.IOSDriver;
 import org.uiautomation.ios.server.command.BaseWebCommandHandler;
+import org.uiautomation.ios.webInspector.DOM.RemoteExceptionException;
 import org.uiautomation.ios.webInspector.DOM.RemoteWebElement;
 
 import java.util.ArrayList;
@@ -34,6 +36,41 @@ public FindElementsHandler(IOSDriver driver, WebDriverLikeRequest request) {
 
   @Override
   public Response handle() throws Exception {
+    waitForPageToLoad();
+
+    int implicitWait = (Integer) getConf("implicit_wait", 0);
+    long deadline = System.currentTimeMillis() + implicitWait;
+    List<RemoteWebElement> elements = null;
+    do {
+      try {
+        elements = findElements();
+        if (elements.size() != 0) {
+          break;
+        }
+      } catch (NoSuchElementException e) {
+        //ignore.
+      } catch (RemoteExceptionException e2) {
+        // ignore.
+        // if the page is reloading, the previous nodeId won't be there anymore, resulting in a
+        // RemoteExceptionException: Could not find node with given id.Keep looking.
+      }
+    } while (System.currentTimeMillis() < deadline);
+
+    JSONArray array = new JSONArray();
+
+    List<JSONObject> list = new ArrayList<JSONObject>();
+    for (RemoteWebElement el : elements) {
+      list.add(new JSONObject().put("ELEMENT", "" + el.getNodeId().getId()));
+    }
+
+    Response resp = new Response();
+    resp.setSessionId(getSession().getSessionId());
+    resp.setStatus(0);
+    resp.setValue(list);
+    return resp;
+  }
+
+  private List<RemoteWebElement> findElements() throws Exception {
     JSONObject payload = getRequest().getPayload();
     String type = payload.getString("using");
     String value = payload.getString("value");
@@ -58,19 +95,7 @@ public Response handle() throws Exception {
       String cssSelector = ToCSSSelectorConvertor.convertToCSSSelector(type, value);
       res = element.findElementsByCSSSelector(cssSelector);
     }
-
-    JSONArray array = new JSONArray();
-
-    List<JSONObject> list = new ArrayList<JSONObject>();
-    for (RemoteWebElement el : res) {
-      list.add(new JSONObject().put("ELEMENT", "" + el.getNodeId().getId()));
-    }
-
-    Response resp = new Response();
-    resp.setSessionId(getSession().getSessionId());
-    resp.setStatus(0);
-    resp.setValue(list);
-    return resp;
+    return res;
   }
 
   @Override
diff --git a/server/src/main/java/org/uiautomation/ios/server/command/web/GetHandler.java b/server/src/main/java/org/uiautomation/ios/server/command/web/GetHandler.java
@@ -33,7 +33,7 @@ public class GetHandler extends BaseWebCommandHandler {
 
   // TODO freynaud cached by session.
   private UIAElement addressBar;
-  private static final boolean nativeEvents = true;
+  private static final boolean nativeEvents = false;
 
   public GetHandler(IOSDriver driver, WebDriverLikeRequest request) {
     super(driver, request);
diff --git a/server/src/main/java/org/uiautomation/ios/server/command/web/SetImplicitWaitTimeoutHandler.java b/server/src/main/java/org/uiautomation/ios/server/command/web/SetImplicitWaitTimeoutHandler.java
@@ -0,0 +1,48 @@
+package org.uiautomation.ios.server.command.web;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.openqa.selenium.remote.Response;
+import org.uiautomation.ios.communication.WebDriverLikeCommand;
+import org.uiautomation.ios.communication.WebDriverLikeRequest;
+import org.uiautomation.ios.server.IOSDriver;
+import org.uiautomation.ios.server.command.BaseWebCommandHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class SetImplicitWaitTimeoutHandler extends BaseWebCommandHandler {
+
+  private static final List<WebDriverLikeCommand> impacted = new ArrayList<WebDriverLikeCommand>();
+
+  public SetImplicitWaitTimeoutHandler(IOSDriver driver, WebDriverLikeRequest request) {
+    super(driver, request);
+    impacted.add(WebDriverLikeCommand.ELEMENT);
+    impacted.add(WebDriverLikeCommand.ELEMENT_ROOT);
+    impacted.add(WebDriverLikeCommand.ELEMENTS);
+    impacted.add(WebDriverLikeCommand.ELEMENTS_ROOT);
+  }
+
+
+  @Override
+  public Response handle() throws Exception {
+    Integer ms = getRequest().getPayload().getInt("ms");
+    for (WebDriverLikeCommand command : impacted) {
+      getSession().configure(command).set("implicit_wait", ms);
+    }
+
+    Response res = new Response();
+    res.setSessionId(getSession().getSessionId());
+    res.setStatus(0);
+    res.setValue(new JSONObject());
+    return res;
+  }
+
+
+  @Override
+  public JSONObject configurationDescription() throws JSONException {
+    return noConfigDefined();
+  }
+
+}
diff --git a/server/src/main/java/org/uiautomation/ios/webInspector/DOM/RemoteWebElement.java b/server/src/main/java/org/uiautomation/ios/webInspector/DOM/RemoteWebElement.java
@@ -107,6 +107,12 @@ private void clickNative() throws Exception {
     session.setMode(WorkingMode.Native);
     ((JavascriptExecutor) nativeDriver).executeScript(getNativeElementClickOnIt());
     session.setMode(origin);
+    long start = System.currentTimeMillis();
+
+    /*while (true) {
+      long end = System.currentTimeMillis();
+      System.out.println((end-start)+"ms,is loading? :" + session.getContext().getDOMContext().isLoading());
+    } */
   }
 
   public NodeId getNodeId() {
@@ -179,6 +185,8 @@ private String getNativeElementClickOnIt() throws Exception {
     // web stuff.
     scrollIntoViewIfNeeded();
     Point po = findPosition();
+    System.out.println("click native on po :" + po.toString());
+
     Dimension dim = inspector.getSize();
     int webPageWidth = inspector.getInnerWidth();
     if (dim.getWidth() != webPageWidth) {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ public DefaultMessageHandler(EventListener listener, ResponseFinder... finders)`
`46`	`46`	`for (ResponseFinder finder : finders) {`
`47`	`47`	`this.extraFinders.add(finder);`
`48`	`48`	`}`
`49`		`-`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public WebInspector(UIADriver nativeDriver, String bundleId, ServerSideSession s`
`110`	`110`	`this.session = session;`
`111`	`111`	`DOMContext context = session.getContext().getDOMContext();`
`112`	`112`	`protocol =`
`113`		`- new DebugProtocol(context, bundleId, new AlertDetector((RemoteUIADriver) nativeDriver));`
	`113`	`+ new DebugProtocol(context, bundleId/, new AlertDetector((RemoteUIADriver) nativeDriver)/);`
`114`	`114`	`enablePageEvent();`
`115`	`115`	`}`
`116`	`116`