merge from 3.0 branch till 1451.

1 files changed, 826 insertions, 187 deletions

diff --git a/tests/test_tools/selenium/core/scripts/selenium-api.js b/tests/test_tools/selenium/core/scripts/selenium-api.js
index ad0509ee..e8e587f7 100644
--- a/tests/test_tools/selenium/core/scripts/selenium-api.js
+++ b/tests/test_tools/selenium/core/scripts/selenium-api.js
@@ -15,12 +15,14 @@
  *
  */
 
+// TODO: stop navigating this.page().document() ... it breaks encapsulation
+
 var storedVars = new Object();
 
 function Selenium(browserbot) {
 	/**
 	 * Defines an object that runs Selenium commands.
-	 * 
+	 *
 	 * <h3><a name="locators"></a>Element Locators</h3>
 	 * <p>
 	 * Element Locators tell Selenium which HTML element a command refers to.
@@ -28,7 +30,7 @@ function Selenium(browserbot) {
 	 * <blockquote>
 	 * <em>locatorType</em><strong>=</strong><em>argument</em>
 	 * </blockquote>
-	 * 
+	 *
 	 * <p>
 	 * We support the following strategies for locating elements:
 	 * </p>
@@ -40,7 +42,7 @@ function Selenium(browserbot) {
 	 * (This is normally the default; see below.)</dd>
 	 * <dt><strong>id</strong>=<em>id</em></dt>
 	 * <dd>Select the element with the specified &#64;id attribute.</dd>
-	 * 
+	 *
 	 * <dt><strong>name</strong>=<em>name</em></dt>
 	 * <dd>Select the first element with the specified &#64;name attribute.</dd>
 	 * <dd><ul class="first last simple">
@@ -49,15 +51,15 @@ function Selenium(browserbot) {
 	 * </ul>
 	 * </dd>
 	 * <dd>The name may optionally be followed by one or more <em>element-filters</em>, separated from the name by whitespace.  If the <em>filterType</em> is not specified, <strong>value</strong> is assumed.</dd>
-	 * 
+	 *
 	 * <dd><ul class="first last simple">
 	 * <li>name=flavour value=chocolate</li>
 	 * </ul>
 	 * </dd>
 	 * <dt><strong>dom</strong>=<em>javascriptExpression</em></dt>
-	 * 
+	 *
 	 * <dd>
-	 * 
+	 *
 	 * <dd>Find an element using JavaScript traversal of the HTML Document Object
 	 * Model. DOM locators <em>must</em> begin with &quot;document.&quot;.
 	 * <ul class="first last simple">
@@ -65,15 +67,15 @@ function Selenium(browserbot) {
 	 * <li>dom=document.images[56]</li>
 	 * </ul>
 	 * </dd>
-	 * 
+	 *
 	 * </dd>
-	 * 
+	 *
 	 * <dt><strong>xpath</strong>=<em>xpathExpression</em></dt>
 	 * <dd>Locate an element using an XPath expression.
 	 * <ul class="first last simple">
 	 * <li>xpath=//img[&#64;alt='The image alt text']</li>
 	 * <li>xpath=//table[&#64;id='table1']//tr[4]/td[2]</li>
-	 * 
+	 *
 	 * </ul>
 	 * </dd>
 	 * <dt><strong>link</strong>=<em>textPattern</em></dt>
@@ -82,15 +84,24 @@ function Selenium(browserbot) {
 	 * <ul class="first last simple">
 	 * <li>link=The link text</li>
 	 * </ul>
-	 * 
+	 *
+	 * </dd>
+	 *
+	 * <dt><strong>css</strong>=<em>cssSelectorSyntax</em></dt>
+	 * <dd>Select the element using css selectors. Please refer to <a href="http://www.w3.org/TR/REC-CSS2/selector.html">CSS2 selectors</a>, <a href="http://www.w3.org/TR/2001/CR-css3-selectors-20011113/">CSS3 selectors</a> for more information. You can also check the TestCssLocators test in the selenium test suite for an example of usage, which is included in the downloaded selenium core package.
+	 * <ul class="first last simple">
+	 * <li>css=a[href="#id3"]</li>
+	 * <li>css=span#firstChild + span</li>
+	 * </ul>
 	 * </dd>
+	 * <dd>Currently the css selector locator supports all css1, css2 and css3 selectors except namespace in css3, some pseudo classes(:nth-of-type, :nth-last-of-type, :first-of-type, :last-of-type, :only-of-type, :visited, :hover, :active, :focus, :indeterminate) and pseudo elements(::first-line, ::first-letter, ::selection, ::before, ::after). </dd>
 	 * </dl>
 	 * </blockquote>
 	 * <p>
 	 * Without an explicit locator prefix, Selenium uses the following default
 	 * strategies:
 	 * </p>
-	 * 
+	 *
 	 * <ul class="simple">
 	 * <li><strong>dom</strong>, for locators starting with &quot;document.&quot;</li>
 	 * <li><strong>xpath</strong>, for locators starting with &quot;//&quot;</li>
@@ -103,7 +114,7 @@ function Selenium(browserbot) {
 	 * <p>Filters look much like locators, ie.</p>
 	 * <blockquote>
 	 * <em>filterType</em><strong>=</strong><em>argument</em></blockquote>
-	 * 
+	 *
 	 * <p>Supported element-filters are:</p>
 	 * <p><strong>value=</strong><em>valuePattern</em></p>
 	 * <blockquote>
@@ -114,7 +125,7 @@ function Selenium(browserbot) {
 	 * </blockquote>
 	 *
 	 * <h3><a name="patterns"></a>String-match Patterns</h3>
-	 * 
+	 *
 	 * <p>
 	 * Various Pattern syntaxes are available for matching string values:
 	 * </p>
@@ -130,7 +141,7 @@ function Selenium(browserbot) {
 	 * <dd>Match a string using a regular-expression. The full power of JavaScript
 	 * regular-expressions is available.</dd>
 	 * <dt><strong>exact:</strong><em>string</em></dt>
-	 * 
+	 *
 	 * <dd>Match a string exactly, verbatim, without any of that fancy wildcard
 	 * stuff.</dd>
 	 * </dl>
@@ -145,18 +156,23 @@ function Selenium(browserbot) {
     this.page = function() {
         return browserbot.getCurrentPage();
     };
+    this.defaultTimeout = Selenium.DEFAULT_TIMEOUT;
 }
 
-Selenium.createForFrame = function(frame) {
-    return new Selenium(BrowserBot.createForFrame(frame));
+Selenium.DEFAULT_TIMEOUT = 30 * 1000;
+
+Selenium.createForWindow = function(window) {
+    if (!window.location) {
+        throw "error: not a window!";
+    }
+    return new Selenium(BrowserBot.createForWindow(window));
 };
 
 Selenium.prototype.reset = function() {
-	/**
-   * Clear out all stored variables and select the null (starting) window
-   */
-    storedVars = new Object();
+    this.defaultTimeout = Selenium.DEFAULT_TIMEOUT;
+    // todo: this.browserbot.reset()
     this.browserbot.selectWindow("null");
+    this.browserbot.resetPopups();
 };
 
 Selenium.prototype.doClick = function(locator) {
@@ -164,12 +180,31 @@ Selenium.prototype.doClick = function(locator) {
    * Clicks on a link, button, checkbox or radio button. If the click action
    * causes a new page to load (like a link usually does), call
    * waitForPageToLoad.
-   * 
+   *
+   * @param locator an element locator
+   *
+   */
+   var element = this.page().findElement(locator);
+   this.page().clickElement(element);
+};
+
+Selenium.prototype.doClickAt = function(locator, coordString) {
+	/**
+   * Clicks on a link, button, checkbox or radio button. If the click action
+   * causes a new page to load (like a link usually does), call
+   * waitForPageToLoad.
+   *
+   * Beware of http://jira.openqa.org/browse/SEL-280, which will lead some event handlers to
+   * get null event arguments.  Read the bug for more details, including a workaround.
+   *
    * @param locator an element locator
-   * 
+   * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
+   *      event relative to the element returned by the locator.
+   *
    */
     var element = this.page().findElement(locator);
-    this.page().clickElement(element);
+    var clientXY = getClientXY(element, coordString)
+    this.page().clickElement(element, clientXY[0], clientXY[1]);
 };
 
 Selenium.prototype.doFireEvent = function(locator, eventName) {
@@ -184,70 +219,179 @@ Selenium.prototype.doFireEvent = function(locator, eventName) {
     triggerEvent(element, eventName, false);
 };
 
-Selenium.prototype.doKeyPress = function(locator, keycode) {
+Selenium.prototype.doKeyPress = function(locator, keySequence) {
 	/**
    * Simulates a user pressing and releasing a key.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
-   * @param keycode the numeric keycode of the key to be pressed, normally the
-   *            ASCII value of that key.
+   * @param keySequence Either be a string("\" followed by the numeric keycode
+   *  of the key to be pressed, normally the ASCII value of that key), or a single
+   *  character. For example: "w", "\119".
    */
     var element = this.page().findElement(locator);
-    triggerKeyEvent(element, 'keypress', keycode, true);
+    triggerKeyEvent(element, 'keypress', keySequence, true);
 };
 
-Selenium.prototype.doKeyDown = function(locator, keycode) {
+Selenium.prototype.doKeyDown = function(locator, keySequence) {
 	/**
    * Simulates a user pressing a key (without releasing it yet).
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
-   * @param keycode the numeric keycode of the key to be pressed, normally the
-   *            ASCII value of that key.
+   * @param keySequence Either be a string("\" followed by the numeric keycode
+   *  of the key to be pressed, normally the ASCII value of that key), or a single
+   *  character. For example: "w", "\119".
    */
     var element = this.page().findElement(locator);
-    triggerKeyEvent(element, 'keydown', keycode, true);
+    triggerKeyEvent(element, 'keydown', keySequence, true);
 };
 
-Selenium.prototype.doKeyUp = function(locator, keycode) {
+Selenium.prototype.doKeyUp = function(locator, keySequence) {
 	/**
    * Simulates a user releasing a key.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
-   * @param keycode the numeric keycode of the key to be released, normally the
-   *            ASCII value of that key.
+   * @param keySequence Either be a string("\" followed by the numeric keycode
+   *  of the key to be pressed, normally the ASCII value of that key), or a single
+   *  character. For example: "w", "\119".
    */
     var element = this.page().findElement(locator);
-    triggerKeyEvent(element, 'keyup', keycode, true);
+    triggerKeyEvent(element, 'keyup', keySequence, true);
 };
 
+function getClientXY(element, coordString) {
+   // Parse coordString
+   var coords = null;
+   var x;
+   var y;
+   if (coordString) {
+      coords = coordString.split(/,/);
+      x = Number(coords[0]);
+      y = Number(coords[1]);
+   }
+   else {
+      x = y = 0;
+   }
+
+   // Get position of element,
+   // Return 2 item array with clientX and clientY
+   return [Selenium.prototype.getElementPositionLeft(element) + x, Selenium.prototype.getElementPositionTop(element) + y];
+}
+
 Selenium.prototype.doMouseOver = function(locator) {
 	/**
    * Simulates a user hovering a mouse over the specified element.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
    */
     var element = this.page().findElement(locator);
     triggerMouseEvent(element, 'mouseover', true);
 };
 
+Selenium.prototype.doMouseOut = function(locator) {
+   /**
+   * Simulates a user moving the mouse pointer away from the specified element.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   */
+    var element = this.page().findElement(locator);
+    triggerMouseEvent(element, 'mouseout', true);
+};
+
 Selenium.prototype.doMouseDown = function(locator) {
 	/**
    * Simulates a user pressing the mouse button (without releasing it yet) on
    * the specified element.
-   * 
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   */
+   var element = this.page().findElement(locator);
+   triggerMouseEvent(element, 'mousedown', true);
+};
+
+Selenium.prototype.doMouseDownAt = function(locator, coordString) {
+	/**
+   * Simulates a user pressing the mouse button (without releasing it yet) on
+   * the specified element.
+   *
+   * Beware of http://jira.openqa.org/browse/SEL-280, which will lead some event handlers to
+   * get null event arguments.  Read the bug for more details, including a workaround.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
+   *      event relative to the element returned by the locator.
+   */
+    var element = this.page().findElement(locator);
+    var clientXY = getClientXY(element, coordString)
+
+    triggerMouseEvent(element, 'mousedown', true, clientXY[0], clientXY[1]);
+};
+
+Selenium.prototype.doMouseUp = function(locator) {
+	/**
+   * Simulates a user pressing the mouse button (without releasing it yet) on
+   * the specified element.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   */
+   var element = this.page().findElement(locator);
+   triggerMouseEvent(element, 'mouseup', true);
+};
+
+Selenium.prototype.doMouseUpAt = function(locator, coordString) {
+	/**
+   * Simulates a user pressing the mouse button (without releasing it yet) on
+   * the specified element.
+   *
+   * Beware of http://jira.openqa.org/browse/SEL-280, which will lead some event handlers to
+   * get null event arguments.  Read the bug for more details, including a workaround.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
+   *      event relative to the element returned by the locator.
+   */
+    var element = this.page().findElement(locator);
+    var clientXY = getClientXY(element, coordString)
+
+    triggerMouseEvent(element, 'mouseup', true, clientXY[0], clientXY[1]);
+};
+
+Selenium.prototype.doMouseMove = function(locator) {
+	/**
+   * Simulates a user pressing the mouse button (without releasing it yet) on
+   * the specified element.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   */
+   var element = this.page().findElement(locator);
+   triggerMouseEvent(element, 'mousemove', true);
+};
+
+Selenium.prototype.doMouseMoveAt = function(locator, coordString) {
+	/**
+   * Simulates a user pressing the mouse button (without releasing it yet) on
+   * the specified element.
+   *
+   * Beware of http://jira.openqa.org/browse/SEL-280, which will lead some event handlers to
+   * get null event arguments.  Read the bug for more details, including a workaround.
+   *
    * @param locator an <a href="#locators">element locator</a>
+   * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
+   *      event relative to the element returned by the locator.
    */
+
     var element = this.page().findElement(locator);
-    triggerMouseEvent(element, 'mousedown', true);
+    var clientXY = getClientXY(element, coordString)
+
+    triggerMouseEvent(element, 'mousemove', true, clientXY[0], clientXY[1]);
 };
 
 Selenium.prototype.doType = function(locator, value) {
 	/**
    * Sets the value of an input field, as though you typed it in.
-   * 
+   *
    * <p>Can also be used to set the value of combo boxes, check boxes, etc. In these cases,
    * value should be the value of the option selected, not the visible text.</p>
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
    * @param value the value to type
    */
@@ -267,7 +411,7 @@ Selenium.prototype.findToggleButton = function(locator) {
 Selenium.prototype.doCheck = function(locator) {
 	/**
    * Check a toggle-button (checkbox/radio)
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
    */
     this.findToggleButton(locator).checked = true;
@@ -276,7 +420,7 @@ Selenium.prototype.doCheck = function(locator) {
 Selenium.prototype.doUncheck = function(locator) {
 	/**
    * Uncheck a toggle-button (checkbox/radio)
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
    */
     this.findToggleButton(locator).checked = false;
@@ -285,7 +429,7 @@ Selenium.prototype.doUncheck = function(locator) {
 Selenium.prototype.doSelect = function(selectLocator, optionLocator) {
 	/**
    * Select an option from a drop-down using an option locator.
-   * 
+   *
    * <p>
    * Option locators provide different ways of specifying options of an HTML
    * Select element (e.g. for selecting a specific option, or for asserting
@@ -305,11 +449,11 @@ Selenium.prototype.doSelect = function(selectLocator, optionLocator) {
    * <ul class="first last simple">
    * <li>value=other</li>
    * </ul>
-   * 
-   * 
+   *
+   *
    * </dd>
    * <dt><strong>id</strong>=<em>id</em></dt>
-   * 
+   *
    * <dd>matches options based on their ids.
    * <ul class="first last simple">
    * <li>id=option1</li>
@@ -318,7 +462,7 @@ Selenium.prototype.doSelect = function(selectLocator, optionLocator) {
    * <dt><strong>index</strong>=<em>index</em></dt>
    * <dd>matches an option based on its index (offset from zero).
    * <ul class="first last simple">
-   * 
+   *
    * <li>index=2</li>
    * </ul>
    * </dd>
@@ -326,8 +470,8 @@ Selenium.prototype.doSelect = function(selectLocator, optionLocator) {
    * <p>
    * If no option locator prefix is provided, the default behaviour is to match on <strong>label</strong>.
    * </p>
-   * 
-   * 
+   *
+   *
    * @param selectLocator an <a href="#locators">element locator</a> identifying a drop-down menu
    * @param optionLocator an option locator (a label by default)
    */
@@ -381,26 +525,47 @@ Selenium.prototype.doSubmit = function(formLocator) {
 	/**
    * Submit the specified form. This is particularly useful for forms without
    * submit buttons, e.g. single-input "Search" forms.
-   * 
+   *
    * @param formLocator an <a href="#locators">element locator</a> for the form you want to submit
    */
     var form = this.page().findElement(formLocator);
     var actuallySubmit = true;
     if (form.onsubmit) {
-    	// apply this to the correct window so alerts are properly handled, even in IE HTA mode
-    	actuallySubmit = form.onsubmit.apply(this.browserbot.getContentWindow());
+    	if (browserVersion.isHTA) {
+	    	// run the code in the correct window so alerts are handled correctly even in HTA mode
+	    	var win = this.browserbot.getCurrentWindow();
+	    	var now = new Date().getTime();
+	    	var marker = 'marker' + now;
+	    	win[marker] = form;
+	    	win.setTimeout("var actuallySubmit = "+marker+".onsubmit(); if (actuallySubmit) { "+marker+".submit(); };", 0);
+	    	// pause for at least 20ms for this command to run
+	    	testLoop.waitForCondition = function () {
+	    		return new Date().getTime() > (now + 20);
+	    	}
+	    } else {
+	    	actuallySubmit = form.onsubmit();
+	    	if (actuallySubmit) {
+	    		form.submit();
+	    	}
+	    }
+    } else {
+    	form.submit();
     }
-    if (actuallySubmit) {
-        form.submit();
+
+};
+
+Selenium.prototype.makePageLoadCondition = function(timeout) {
+    if (timeout == null) {
+        timeout = this.defaultTimeout;
     }
-    
+    return decorateFunctionWithTimeout(this._isNewPageLoaded.bind(this), timeout);
 };
 
 Selenium.prototype.doOpen = function(url) {
 	/**
    * Opens an URL in the test frame. This accepts both relative and absolute
    * URLs.
-   * 
+   *
    * The &quot;open&quot; command waits for the page to load before proceeding,
    * ie. the &quot;AndWait&quot; suffix is implicit.
    *
@@ -408,11 +573,11 @@ Selenium.prototype.doOpen = function(url) {
    * due to security restrictions in the browser (Same Origin Policy). If you
    * need to open an URL on another domain, use the Selenium Server to start a
    * new browser session on that domain.
-   * 
+   *
    * @param url the URL to open; may be relative or absolute
    */
     this.browserbot.openLocation(url);
-    return SELENIUM_PROCESS_WAIT;
+    return this.makePageLoadCondition();
 };
 
 Selenium.prototype.doSelectWindow = function(windowID) {
@@ -420,12 +585,99 @@ Selenium.prototype.doSelectWindow = function(windowID) {
    * Selects a popup window; once a popup window has been selected, all
    * commands go to that window. To select the main window again, use "null"
    * as the target.
-   * 
+   *
    * @param windowID the JavaScript window ID of the window to select
    */
     this.browserbot.selectWindow(windowID);
 };
 
+Selenium.prototype.doSelectFrame = function(locator) {
+	/**
+	* Selects a frame within the current window.  (You may invoke this command
+	* multiple times to select nested frames.)  To select the parent frame, use
+	* "relative=parent" as a locator; to select the top frame, use "relative=top".
+	*
+	* <p>You may also use a DOM expression to identify the frame you want directly,
+	* like this: <code>dom=frames["main"].frames["subframe"]</code></p>
+	*
+	* @param locator an <a href="#locators">element locator</a> identifying a frame or iframe
+	*/
+        this.browserbot.selectFrame(locator);
+};
+
+Selenium.prototype.getLogMessages = function() {
+	/**
+        * Return the contents of the log.
+	*
+        * <p>This is a placeholder intended to make the code generator make this API
+        * available to clients.  The selenium server will intercept this call, however,
+        * and return its recordkeeping of log messages since the last call to this API.
+        * Thus this code in JavaScript will never be called.</p>
+        *
+        * <p>The reason I opted for a servercentric solution is to be able to support
+        * multiple frames served from different domains, which would break a
+        * centralized JavaScript logging mechanism under some conditions.</p>
+	*
+        * @return string all log messages seen since the last call to this API
+	*/
+        return "getLogMessages should be implemented in the selenium server";
+};
+
+
+Selenium.prototype.getWhetherThisFrameMatchFrameExpression = function(currentFrameString, target) {
+    /**
+     * Determine whether current/locator identify the frame containing this running code.
+     *
+     * <p>This is useful in proxy injection mode, where this code runs in every
+     * browser frame and window, and sometimes the selenium server needs to identify
+     * the "current" frame.  In this case, when the test calls selectFrame, this
+     * routine is called for each frame to figure out which one has been selected.
+     * The selected frame will return true, while all others will return false.</p>
+     *
+     * @param currentFrameString starting frame
+     * @param target new frame (which might be relative to the current one)
+     * @return boolean true if the new frame is this code's window
+     */
+    var isDom = false;
+    if (target.indexOf("dom=") == 0) {
+        target = target.substr(4);
+        isDom = true;
+    }
+    var t;
+    try {
+        eval("t=" + currentFrameString + "." + target);
+    } catch (e) {
+    }
+    var autWindow = this.browserbot.getCurrentWindow();
+    if (t != null) {
+        if (t.window == autWindow) {
+            return true;
+        }
+        return false;
+    }
+    if (isDom) {
+        return false;
+    }
+    var currentFrame;
+    eval("currentFrame=" + currentFrameString);
+    if (target == "relative=up") {
+        if (currentFrame.window.parent == autWindow) {
+            return true;
+        }
+        return false;
+    }
+    if (target == "relative=top") {
+        if (currentFrame.window.top == autWindow) {
+            return true;
+        }
+        return false;
+    }
+    if (autWindow.name == target && currentFrame.window == autWindow.parent) {
+        return true;
+    }
+    return false;
+};
+
 Selenium.prototype.doWaitForPopUp = function(windowID, timeout) {
 	/**
 	* Waits for a popup window to appear and load up.
@@ -436,21 +688,36 @@ Selenium.prototype.doWaitForPopUp = function(windowID, timeout) {
 	if (isNaN(timeout)) {
     	throw new SeleniumError("Timeout is not a number: " + timeout);
     }
-    
-    testLoop.waitForCondition = function () {
-        var targetWindow = selenium.browserbot.getTargetWindow(windowID);
+
+    var popupLoadedPredicate = function () {
+        var targetWindow = selenium.browserbot.getWindowByName(windowID, true);
         if (!targetWindow) return false;
         if (!targetWindow.location) return false;
         if ("about:blank" == targetWindow.location) return false;
+        if (browserVersion.isKonqueror) {
+        	if ("/" == targetWindow.location.href) {
+        		// apparently Konqueror uses this as the temporary location, instead of about:blank
+        		return false;
+        	}
+        }
+        if (browserVersion.isSafari) {
+        	if(targetWindow.location.href == selenium.browserbot.buttonWindow.location.href) {
+        		// Apparently Safari uses this as the temporary location, instead of about:blank
+        		// what a world!
+        		LOG.debug("DGF what a world!");
+        		return false;
+        	}
+        }
         if (!targetWindow.document) return false;
-        if (!targetWindow.document.readyState) return true;
+        if (!selenium.browserbot.getCurrentWindow().document.readyState) {
+    		// This is Firefox, with no readyState extension
+    		return true;
+    	}
         if ('complete' != targetWindow.document.readyState) return false;
         return true;
     };
-    
-    testLoop.waitForConditionStart = new Date().getTime();
-    testLoop.waitForConditionTimeout = timeout;
-	
+
+    return decorateFunctionWithTimeout(popupLoadedPredicate, timeout);
 }
 
 Selenium.prototype.doWaitForPopUp.dontCheckAlertsAndConfirms = true;
@@ -461,7 +728,7 @@ Selenium.prototype.doChooseCancelOnNextConfirmation = function() {
    * return true, as if the user had manually clicked OK.  After running
    * this command, the next call to confirm() will return false, as if
    * the user had clicked Cancel.
-   * 
+   *
    */
     this.browserbot.cancelNextConfirmation();
 };
@@ -471,8 +738,8 @@ Selenium.prototype.doAnswerOnNextPrompt = function(answer) {
 	/**
    * Instructs Selenium to return the specified answer string in response to
    * the next JavaScript prompt [window.prompt()].
-   * 
-   * 
+   *
+   *
    * @param answer the answer to give in response to the prompt pop-up
    */
     this.browserbot.setNextPromptResult(answer);
@@ -481,7 +748,7 @@ Selenium.prototype.doAnswerOnNextPrompt = function(answer) {
 Selenium.prototype.doGoBack = function() {
     /**
      * Simulates the user clicking the "back" button on their browser.
-     * 
+     *
      */
     this.page().goBack();
 };
@@ -489,23 +756,32 @@ Selenium.prototype.doGoBack = function() {
 Selenium.prototype.doRefresh = function() {
     /**
      * Simulates the user clicking the "Refresh" button on their browser.
-     * 
+     *
      */
     this.page().refresh();
 };
 
 Selenium.prototype.doClose = function() {
-	/**
-   * Simulates the user clicking the "close" button in the titlebar of a popup
-   * window or tab.
-   */
+    /**
+     * Simulates the user clicking the "close" button in the titlebar of a popup
+     * window or tab.
+     */
     this.page().close();
 };
 
+Selenium.prototype.ensureNoUnhandledPopups = function() {
+    if (this.browserbot.hasAlerts()) {
+        throw new SeleniumError("There was an unexpected Alert! [" + this.browserbot.getNextAlert() + "]");
+    }
+    if ( this.browserbot.hasConfirmations() ) {
+        throw new SeleniumError("There was an unexpected Confirmation! [" + this.browserbot.getNextConfirmation() + "]");
+    }
+};
+
 Selenium.prototype.isAlertPresent = function() {
    /**
    * Has an alert occurred?
-   * 
+   *
    * <p>
    * This function never throws an exception
    * </p>
@@ -513,10 +789,11 @@ Selenium.prototype.isAlertPresent = function() {
    */
     return this.browserbot.hasAlerts();
 };
+
 Selenium.prototype.isPromptPresent = function() {
    /**
    * Has a prompt occurred?
-   * 
+   *
    * <p>
    * This function never throws an exception
    * </p>
@@ -524,10 +801,11 @@ Selenium.prototype.isPromptPresent = function() {
    */
     return this.browserbot.hasPrompts();
 };
+
 Selenium.prototype.isConfirmationPresent = function() {
    /**
    * Has confirm() been called?
-   * 
+   *
    * <p>
    * This function never throws an exception
    * </p>
@@ -538,14 +816,14 @@ Selenium.prototype.isConfirmationPresent = function() {
 Selenium.prototype.getAlert = function() {
 	/**
    * Retrieves the message of a JavaScript alert generated during the previous action, or fail if there were no alerts.
-   * 
+   *
    * <p>Getting an alert has the same effect as manually clicking OK. If an
    * alert is generated but you do not get/verify it, the next Selenium action
    * will fail.</p>
-   * 
+   *
    * <p>NOTE: under Selenium, JavaScript alerts will NOT pop up a visible alert
    * dialog.</p>
-   * 
+   *
    * <p>NOTE: Selenium does NOT support JavaScript alerts that are generated in a
    * page's onload() event handler. In this case a visible dialog WILL be
    * generated and Selenium will hang until someone manually clicks OK.</p>
@@ -562,26 +840,26 @@ Selenium.prototype.getConfirmation = function() {
 	/**
    * Retrieves the message of a JavaScript confirmation dialog generated during
    * the previous action.
-   * 
+   *
    * <p>
    * By default, the confirm function will return true, having the same effect
    * as manually clicking OK. This can be changed by prior execution of the
    * chooseCancelOnNextConfirmation command. If an confirmation is generated
    * but you do not get/verify it, the next Selenium action will fail.
    * </p>
-   * 
+   *
    * <p>
    * NOTE: under Selenium, JavaScript confirmations will NOT pop up a visible
    * dialog.
    * </p>
-   * 
+   *
    * <p>
    * NOTE: Selenium does NOT support JavaScript confirmations that are
    * generated in a page's onload() event handler. In this case a visible
    * dialog WILL be generated and Selenium will hang until you manually click
    * OK.
    * </p>
-   * 
+   *
    * @return string the message of the most recent JavaScript confirmation dialog
    */
     if (!this.browserbot.hasConfirmations()) {
@@ -590,19 +868,19 @@ Selenium.prototype.getConfirmation = function() {
     return this.browserbot.getNextConfirmation();
 };
 Selenium.prototype.getConfirmation.dontCheckAlertsAndConfirms = true;
- 
+
 Selenium.prototype.getPrompt = function() {
 	/**
    * Retrieves the message of a JavaScript question prompt dialog generated during
    * the previous action.
-   * 
+   *
    * <p>Successful handling of the prompt requires prior execution of the
    * answerOnNextPrompt command. If a prompt is generated but you
    * do not get/verify it, the next Selenium action will fail.</p>
-   * 
+   *
    * <p>NOTE: under Selenium, JavaScript prompts will NOT pop up a visible
    * dialog.</p>
-   * 
+   *
    * <p>NOTE: Selenium does NOT support JavaScript prompts that are generated in a
    * page's onload() event handler. In this case a visible dialog WILL be
    * generated and Selenium will hang until someone manually clicks OK.</p>
@@ -616,18 +894,18 @@ Selenium.prototype.getPrompt = function() {
 
 Selenium.prototype.getLocation = function() {
 	/** Gets the absolute URL of the current page.
-   * 
+   *
    * @return string the absolute URL of the current page
    */
-    return this.page().location;
+    return this.page().getCurrentWindow().location;
 };
 
 Selenium.prototype.getTitle = function() {
 	/** Gets the title of the current page.
-   * 
+   *
    * @return string the title of the current page
    */
-    return this.page().title();
+    return this.page().getTitle();
 };
 
 
@@ -645,7 +923,7 @@ Selenium.prototype.getValue = function(locator) {
    * Gets the (whitespace-trimmed) value of an input field (or anything else with a value parameter).
    * For checkbox/radio elements, the value will be "on" or "off" depending on
    * whether the element is checked or not.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
    * @return string the element value, or "on/off" for checkbox/radio elements
    */
@@ -659,7 +937,7 @@ Selenium.prototype.getText = function(locator) {
    * text. This command uses either the textContent (Mozilla-like browsers) or
    * the innerText (IE-like browsers) of the element, which is the rendered
    * text shown to the user.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
    * @return string the text of the element
    */
@@ -668,9 +946,9 @@ Selenium.prototype.getText = function(locator) {
 };
 
 Selenium.prototype.getEval = function(script) {
-	/** Gets the result of evaluating the specified JavaScript snippet.  The snippet may 
+	/** Gets the result of evaluating the specified JavaScript snippet.  The snippet may
    * have multiple lines, but only the result of the last line will be returned.
-   * 
+   *
    * <p>Note that, by default, the snippet will run in the context of the "selenium"
    * object itself, so <code>this</code> will refer to the Selenium object, and <code>window</code> will
    * refer to the top-level runner test window, not the window of your application.</p>
@@ -679,7 +957,7 @@ Selenium.prototype.getEval = function(script) {
    * to <code>this.browserbot.getCurrentWindow()</code> and if you need to use
    * a locator to refer to a single element in your application page, you can
    * use <code>this.page().findElement("foo")</code> where "foo" is your locator.</p>
-   * 
+   *
    * @param script the JavaScript snippet to run
    * @return string the results of evaluating the snippet
    */
@@ -697,7 +975,7 @@ Selenium.prototype.isChecked = function(locator) {
 	/**
    * Gets whether a toggle-button (checkbox/radio) is checked.  Fails if the specified element doesn't exist or isn't a toggle-button.
    * @param locator an <a href="#locators">element locator</a> pointing to a checkbox or radio button
-   * @return string either "true" or "false" depending on whether the checkbox is checked
+   * @return boolean true if the checkbox is checked, false otherwise
    */
     var element = this.page().findElement(locator);
     if (element.checked == null) {
@@ -710,7 +988,7 @@ Selenium.prototype.getTable = function(tableCellAddress) {
 	/**
    * Gets the text from a cell of a table. The cellAddress syntax
    * tableLocator.row.column, where row and column start at 0.
-   * 
+   *
    * @param tableCellAddress a cell address, e.g. "foo.1.4"
    * @return string the text from the specified cell
    */
@@ -742,24 +1020,6 @@ Selenium.prototype.getTable = function(tableCellAddress) {
 	return null;
 };
 
-Selenium.prototype.assertSelected = function(selectLocator, optionLocator) {
-	/**
-   * Verifies that the selected option of a drop-down satisfies the optionSpecifier.
-   * 
-   * <p>See the select command for more information about option locators.</p>
-   * 
-   * @param selectLocator an <a href="#locators">element locator</a> identifying a drop-down menu
-   * @param optionLocator an option locator, typically just an option label (e.g. "John Smith")
-   */
-    var element = this.page().findElement(selectLocator);
-    var locator = this.optionLocatorFactory.fromLocatorString(optionLocator);
-    if (element.selectedIndex == -1)
-    {
-        Assert.fail("No option selected");
-    }
-    locator.assertSelected(element);
-};
-
 Selenium.prototype.getSelectedLabels = function(selectLocator) {
     /** Gets all option labels (visible text) for selected options in the specified select or multi-select element.
    *
@@ -842,9 +1102,9 @@ Selenium.prototype.isSomethingSelected = function(selectLocator) {
     if (!("options" in element)) {
         throw new SeleniumError("Specified element is not a Select (has no options)");
     }
-    
+
     var selectedOptions = [];
-    
+
     for (var i = 0; i < element.options.length; i++) {
         if (element.options[i].selected)
         {
@@ -886,7 +1146,7 @@ Selenium.prototype.findSelectedOptionProperty = function(locator, property) {
 
 Selenium.prototype.getSelectOptions = function(selectLocator) {
 	/** Gets all option labels in the specified select drop-down.
-   * 
+   *
    * @param selectLocator an <a href="#locators">element locator</a> identifying a drop-down menu
    * @return string[] an array of all option labels in the specified select drop-down
    */
@@ -898,7 +1158,7 @@ Selenium.prototype.getSelectOptions = function(selectLocator) {
     	var option = element.options[i].text.replace(/,/g, "\\,");
         selectOptions.push(option);
     }
-    
+
     return selectOptions.join(",");
 };
 
@@ -906,6 +1166,10 @@ Selenium.prototype.getSelectOptions = function(selectLocator) {
 Selenium.prototype.getAttribute = function(attributeLocator) {
 	/**
    * Gets the value of an element attribute.
+   *
+   * Beware of http://jira.openqa.org/browse/SEL-280, which will lead some event handlers to
+   * get null event arguments.  Read the bug for more details, including a workaround.
+   *
    * @param attributeLocator an element locator followed by an @ sign and then the name of the attribute, e.g. "foo@bar"
    * @return string the value of the specified attribute
    */
@@ -924,15 +1188,15 @@ Selenium.prototype.isTextPresent = function(pattern) {
    */
     var allText = this.page().bodyText();
 
-    if(allText == "") {
-        Assert.fail("Page text not found");
-    } else {
-    	var patternMatcher = new PatternMatcher(pattern);
-        if (patternMatcher.strategy == PatternMatcher.strategies.glob) {
-    		patternMatcher.matcher = new PatternMatcher.strategies.globContains(pattern);
-    	}
-    	return patternMatcher.matches(allText);
+    var patternMatcher = new PatternMatcher(pattern);
+    if (patternMatcher.strategy == PatternMatcher.strategies.glob) {
+		patternMatcher.matcher = new PatternMatcher.strategies.globContains(pattern);
+    }
+    else if (patternMatcher.strategy == PatternMatcher.strategies.exact) {
+	            pattern = pattern.substring("exact:".length); // strip off "exact:"
+		return allText.indexOf(pattern) != -1;
     }
+    return patternMatcher.matches(allText);
 };
 
 Selenium.prototype.isElementPresent = function(locator) {
@@ -956,19 +1220,14 @@ Selenium.prototype.isVisible = function(locator) {
    * property to "hidden", or the "display" property to "none", either for the
    * element itself or one if its ancestors.  This method will fail if
    * the element is not present.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
    * @return boolean true if the specified element is visible, false otherwise
    */
     var element;
-    element = this.page().findElement(locator); 
-
-	if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-		var visibility = element.style["visibility"];
-	else
-    	var visibility = this.findEffectiveStyleProperty(element, "visibility");
-
-   	var _isDisplayed = this._isDisplayed(element);
+    element = this.page().findElement(locator);
+    var visibility = this.findEffectiveStyleProperty(element, "visibility");
+    var _isDisplayed = this._isDisplayed(element);
     return (visibility != "hidden" && _isDisplayed);
 };
 
@@ -982,10 +1241,7 @@ Selenium.prototype.findEffectiveStyleProperty = function(element, property) {
 };
 
 Selenium.prototype._isDisplayed = function(element) {
-    if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-		var display = element.style["display"];
-	else
-		var display = this.findEffectiveStyleProperty(element, "display");
+    var display = this.findEffectiveStyleProperty(element, "display");
     if (display == "none") return false;
     if (element.parentNode.style) {
         return this._isDisplayed(element.parentNode);
@@ -997,8 +1253,8 @@ Selenium.prototype.findEffectiveStyle = function(element) {
     if (element.style == undefined) {
         return undefined; // not a styled element
     }
-    var window = this.browserbot.getContentWindow();
-    if (window.getComputedStyle) { 
+    var window = this.browserbot.getCurrentWindow();
+    if (window.getComputedStyle) {
         // DOM-Level-2-CSS
         return window.getComputedStyle(element, null);
     }
@@ -1016,7 +1272,7 @@ Selenium.prototype.isEditable = function(locator) {
 	/**
    * Determines whether the specified input element is editable, ie hasn't been disabled.
    * This method will fail if the specified element isn't an input element.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a>
    * @return boolean true if the input element is editable, false otherwise
    */
@@ -1029,9 +1285,9 @@ Selenium.prototype.isEditable = function(locator) {
 
 Selenium.prototype.getAllButtons = function() {
 	/** Returns the IDs of all buttons on the page.
-   * 
+   *
    * <p>If a given button has no ID, it will appear as "" in this array.</p>
-   * 
+   *
    * @return string[] the IDs of all buttons on the page
    */
    return this.page().getAllButtons();
@@ -1039,9 +1295,9 @@ Selenium.prototype.getAllButtons = function() {
 
 Selenium.prototype.getAllLinks = function() {
 	/** Returns the IDs of all links on the page.
-   * 
+   *
    * <p>If a given link has no ID, it will appear as "" in this array.</p>
-   * 
+   *
    * @return string[] the IDs of all links on the page
    */
    return this.page().getAllLinks();
@@ -1049,28 +1305,175 @@ Selenium.prototype.getAllLinks = function() {
 
 Selenium.prototype.getAllFields = function() {
 	/** Returns the IDs of all input fields on the page.
-   * 
+   *
    * <p>If a given field has no ID, it will appear as "" in this array.</p>
-   * 
+   *
    * @return string[] the IDs of all field on the page
    */
    return this.page().getAllFields();
 };
 
+Selenium.prototype._getTestAppParentOfAllWindows = function() {
+  /** Returns the IDs of all input fields on the page.
+   *
+   * <p>If a given field has no ID, it will appear as "" in this array.</p>
+   *
+   * @return string[] the IDs of all field on the page
+   */
+   if (this.browserbot.getCurrentWindow().opener!=null) {
+   	return this.browserbot.getCurrentWindow().opener;
+   }
+   if (this.browserbot.buttonWindow!=null) {
+   	return this.browserbot.buttonWindow;
+   }
+   return top; // apparently we are in proxy injection mode
+};
+
+Selenium.prototype.getAttributeFromAllWindows = function(attributeName) {
+  /** Returns every instance of some attribute from all known windows.
+   *
+   * @param attributeName name of an attribute on the windows
+   * @return string[] the set of values of this attribute from all known windows.
+   */
+   var attributes = new Array();
+   var testAppParentOfAllWindows = this._getTestAppParentOfAllWindows();
+   attributes.push(eval("testAppParentOfAllWindows." + attributeName));
+   var selenium = testAppParentOfAllWindows.selenium==null ? testAppParentOfAllWindows.parent.selenium : testAppParentOfAllWindows.selenium;
+   for (windowName in selenium.browserbot.openedWindows)
+   {
+       attributes.push(eval("selenium.browserbot.openedWindows[windowName]." + attributeName));
+   }
+   return attributes;
+};
+
+Selenium.prototype.findWindow = function(soughtAfterWindowPropertyValue) {
+   var testAppParentOfAllWindows = this._getTestAppParentOfAllWindows();
+   var targetPropertyName = "name";
+   if (soughtAfterWindowPropertyValue.match("^title=")) {
+   	targetPropertyName = "document.title";
+        soughtAfterWindowPropertyValue = soughtAfterWindowPropertyValue.replace(/^title=/, "");
+   }
+   else {
+   	// matching "name":
+   	// If we are not in proxy injection mode, then the top-level test window will be named myiframe.
+        // But as far as the interface goes, we are expected to match a blank string to this window, if
+        // we are searching with respect to the widow name.
+        // So make a special case so that this logic will work:
+        if (PatternMatcher.matches(soughtAfterWindowPropertyValue, "")) {
+   		return this.browserbot.getCurrentWindow();
+        }
+   }
+
+   if (PatternMatcher.matches(soughtAfterWindowPropertyValue, eval("testAppParentOfAllWindows." + targetPropertyName))) {
+   	return testAppParentOfAllWindows;
+   }
+   for (windowName in selenium.browserbot.openedWindows) {
+   	var openedWindow = selenium.browserbot.openedWindows[windowName];
+   	if (PatternMatcher.matches(soughtAfterWindowPropertyValue, eval("openedWindow." + targetPropertyName))) {
+        	return openedWindow;
+        }
+   }
+   throw new SeleniumError("could not find window with property " + targetPropertyName + " matching " + soughtAfterWindowPropertyValue);
+};
+
+Selenium.prototype.doDragdrop = function(locator, movementsString) {
+   /** Drags an element a certain distance and then drops it
+   * Beware of http://jira.openqa.org/browse/SEL-280, which will lead some event handlers to
+   * get null event arguments.  Read the bug for more details, including a workaround.
+   *
+   * @param movementsString offset in pixels from the current location to which the element should be moved, e.g., "+70,-300"
+   * @param locator an element locator
+   */
+   var element = this.page().findElement(locator);
+   var clientStartXY = getClientXY(element)
+   var clientStartX = clientStartXY[0];
+   var clientStartY = clientStartXY[1];
+
+   var movements = movementsString.split(/,/);
+   var movementX = Number(movements[0]);
+   var movementY = Number(movements[1]);
+
+   var clientFinishX = ((clientStartX + movementX) < 0) ? 0 : (clientStartX + movementX);
+   var clientFinishY = ((clientStartY + movementY) < 0) ? 0 : (clientStartY + movementY);
+
+   var movementXincrement = (movementX > 0) ? 1 : -1;
+   var movementYincrement = (movementY > 0) ? 1 : -1;
+
+   triggerMouseEvent(element, 'mousedown', true, clientStartX, clientStartY);
+   var clientX = clientStartX;
+   var clientY = clientStartY;
+   while ((clientX != clientFinishX) || (clientY != clientFinishY)) {
+   	if (clientX != clientFinishX) {
+   		clientX += movementXincrement;
+        }
+   	if (clientY != clientFinishY) {
+   		clientY += movementYincrement;
+        }
+        triggerMouseEvent(element, 'mousemove', true, clientX, clientY);
+    }
+    triggerMouseEvent(element, 'mouseup',   true, clientFinishX, clientFinishY);
+};
+
+Selenium.prototype.doWindowFocus = function(windowName) {
+/** Gives focus to a window
+   *
+   * @param windowName name of the window to be given focus
+   */
+   this.findWindow(windowName).focus();
+};
+
+
+Selenium.prototype.doWindowMaximize = function(windowName) {
+/** Resize window to take up the entire screen
+   *
+   * @param windowName name of the window to be enlarged
+   */
+   var window = this.findWindow(windowName);
+   if (window!=null && window.screen) {
+   	window.moveTo(0,0);
+        window.outerHeight = screen.availHeight;
+        window.outerWidth = screen.availWidth;
+   }
+};
+
+Selenium.prototype.getAllWindowIds = function() {
+  /** Returns the IDs of all windows that the browser knows about.
+   *
+   * @return string[] the IDs of all windows that the browser knows about.
+   */
+   return this.getAttributeFromAllWindows("id");
+};
+
+Selenium.prototype.getAllWindowNames = function() {
+  /** Returns the names of all windows that the browser knows about.
+   *
+   * @return string[] the names of all windows that the browser knows about.
+   */
+   return this.getAttributeFromAllWindows("name");
+};
+
+Selenium.prototype.getAllWindowTitles = function() {
+  /** Returns the titles of all windows that the browser knows about.
+   *
+   * @return string[] the titles of all windows that the browser knows about.
+   */
+   return this.getAttributeFromAllWindows("document.title");
+};
+
 Selenium.prototype.getHtmlSource = function() {
 	/** Returns the entire HTML source between the opening and
    * closing "html" tags.
    *
    * @return string the entire HTML source
    */
-	return this.page().currentDocument.getElementsByTagName("html")[0].innerHTML;
+	return this.page().document().getElementsByTagName("html")[0].innerHTML;
 };
 
 Selenium.prototype.doSetCursorPosition = function(locator, position) {
 	/**
    * Moves the text cursor to the specified position in the given input element or textarea.
    * This method will fail if the specified element isn't an input element or textarea.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a> pointing to an input element or textarea
    * @param position the numerical position of the cursor in the field; position should be 0 to move the position to the beginning of the field.  You can also set the cursor to -1 to move it to the end of the field.
    */
@@ -1081,13 +1484,13 @@ Selenium.prototype.doSetCursorPosition = function(locator, position) {
     if (position == -1) {
     	position = element.value.length;
     }
-    
+
    if( element.setSelectionRange && !browserVersion.isOpera) {
    	element.focus();
-     element.setSelectionRange(/*start*/position,/*end*/position);
-   } 
+        element.setSelectionRange(/*start*/position,/*end*/position);
+   }
    else if( element.createTextRange ) {
-   		triggerEvent(element, 'focus', false);
+      triggerEvent(element, 'focus', false);
       var range = element.createTextRange();
       range.collapse(true);
       range.moveEnd('character',position);
@@ -1096,22 +1499,205 @@ Selenium.prototype.doSetCursorPosition = function(locator, position) {
    }
 }
 
+Selenium.prototype.getElementIndex = function(locator) {
+    /**
+     * Get the relative index of an element to its parent (starting from 0). The comment node and empty text node
+     * will be ignored.
+     *
+     * @param locator an <a href="#locators">element locator</a> pointing to an element
+     * @return number of relative index of the element to its parent (starting from 0)
+     */
+    var element = this.page().findElement(locator);
+    var previousSibling;
+    var index = 0;
+    while ((previousSibling = element.previousSibling) != null) {
+        if (!this._isCommentOrEmptyTextNode(previousSibling)) {
+            index++;
+        }
+        element = previousSibling;
+    }
+    return index;
+}
+
+Selenium.prototype.isOrdered = function(locator1, locator2) {
+    /**
+     * Check if these two elements have same parent and are ordered. Two same elements will
+     * not be considered ordered.
+     *
+     * @param locator1 an <a href="#locators">element locator</a> pointing to the first element
+     * @param locator2 an <a href="#locators">element locator</a> pointing to the second element
+     * @return boolean true if two elements are ordered and have same parent, false otherwise
+     */
+    var element1 = this.page().findElement(locator1);
+    var element2 = this.page().findElement(locator2);
+    if (element1 === element2) return false;
+
+    var previousSibling;
+    while ((previousSibling = element2.previousSibling) != null) {
+        if (previousSibling === element1) {
+            return true;
+        }
+        element2 = previousSibling;
+    }
+    return false;
+}
+
+Selenium.prototype._isCommentOrEmptyTextNode = function(node) {
+    return node.nodeType == 8 || ((node.nodeType == 3) && !(/[^\t\n\r ]/.test(node.data)));
+}
+
+Selenium.prototype.getElementPositionLeft = function(locator) {
+   /**
+   * Retrieves the horizontal position of an element
+   *
+   * @param locator an <a href="#locators">element locator</a> pointing to an element OR an element itself
+   * @return number of pixels from the edge of the frame.
+   */
+   	var element;
+        if ("string"==typeof locator) {
+        	element = this.page().findElement(locator);
+        }
+        else {
+        	element = locator;
+        }
+	var x = element.offsetLeft;
+	var elementParent = element.offsetParent;
+
+	while (elementParent != null)
+	{
+		if(document.all)
+		{
+			if( (elementParent.tagName != "TABLE") && (elementParent.tagName != "BODY") )
+			{
+				x += elementParent.clientLeft;
+			}
+		}
+		else // Netscape/DOM
+		{
+			if(elementParent.tagName == "TABLE")
+			{
+				var parentBorder = parseInt(elementParent.border);
+				if(isNaN(parentBorder))
+				{
+					var parentFrame = elementParent.getAttribute('frame');
+					if(parentFrame != null)
+					{
+						x += 1;
+					}
+				}
+				else if(parentBorder > 0)
+				{
+					x += parentBorder;
+				}
+			}
+		}
+		x += elementParent.offsetLeft;
+		elementParent = elementParent.offsetParent;
+	}
+	return x;
+};
+
+Selenium.prototype.getElementPositionTop = function(locator) {
+   /**
+   * Retrieves the vertical position of an element
+   *
+   * @param locator an <a href="#locators">element locator</a> pointing to an element OR an element itself
+   * @return number of pixels from the edge of the frame.
+   */
+   	var element;
+        if ("string"==typeof locator) {
+        	element = this.page().findElement(locator);
+        }
+        else {
+        	element = locator;
+        }
+
+   	var y = 0;
+
+   	while (element != null)
+	{
+		if(document.all)
+		{
+			if( (element.tagName != "TABLE") && (element.tagName != "BODY") )
+			{
+			y += element.clientTop;
+			}
+		}
+		else // Netscape/DOM
+		{
+			if(element.tagName == "TABLE")
+			{
+			var parentBorder = parseInt(element.border);
+			if(isNaN(parentBorder))
+			{
+				var parentFrame = element.getAttribute('frame');
+				if(parentFrame != null)
+				{
+					y += 1;
+				}
+			}
+			else if(parentBorder > 0)
+			{
+				y += parentBorder;
+			}
+			}
+		}
+		y += element.offsetTop;
+
+			// Netscape can get confused in some cases, such that the height of the parent is smaller
+			// than that of the element (which it shouldn't really be). If this is the case, we need to
+			// exclude this element, since it will result in too large a 'top' return value.
+			if (element.offsetParent && element.offsetParent.offsetHeight && element.offsetParent.offsetHeight < element.offsetHeight)
+			{
+				// skip the parent that's too small
+				element = element.offsetParent.offsetParent;
+			}
+			else
+			{
+			// Next up...
+			element = element.offsetParent;
+		}
+   	}
+	return y;
+};
+
+Selenium.prototype.getElementWidth = function(locator) {
+   /**
+   * Retrieves the width of an element
+   *
+   * @param locator an <a href="#locators">element locator</a> pointing to an element
+   * @return number width of an element in pixels
+   */
+   var element = this.page().findElement(locator);
+   return element.offsetWidth;
+};
+
+Selenium.prototype.getElementHeight = function(locator) {
+   /**
+   * Retrieves the height of an element
+   *
+   * @param locator an <a href="#locators">element locator</a> pointing to an element
+   * @return number height of an element in pixels
+   */
+   var element = this.page().findElement(locator);
+   return element.offsetHeight;
+};
+
 Selenium.prototype.getCursorPosition = function(locator) {
 	/**
    * Retrieves the text cursor position in the given input element or textarea; beware, this may not work perfectly on all browsers.
-   * 
+   *
    * <p>Specifically, if the cursor/selection has been cleared by JavaScript, this command will tend to
    * return the position of the last location of the cursor, even though the cursor is now gone from the page.  This is filed as <a href="http://jira.openqa.org/browse/SEL-243">SEL-243</a>.</p>
    * This method will fail if the specified element isn't an input element or textarea, or there is no cursor in the element.
-   * 
+   *
    * @param locator an <a href="#locators">element locator</a> pointing to an input element or textarea
    * @return number the numerical position of the cursor in the field
    */
    var element = this.page().findElement(locator);
-   var doc = this.page().currentDocument;
+   var doc = this.page().getDocument();
    var win = this.browserbot.getCurrentWindow();
 	if( doc.selection && !browserVersion.isOpera){
-		
 		var selectRange = doc.selection.createRange().duplicate();
 		var elementRange = element.createTextRange();
 		selectRange.move("character",0);
@@ -1126,28 +1712,28 @@ Selenium.prototype.getCursorPosition = function(locator) {
 		var answer = String(elementRange.text).replace(/\r/g,"").length;
 		return answer;
 	} else {
-		if (typeof(element.selectionStart) != undefined) {
+		if (typeof(element.selectionStart) != "undefined") {
 			if (win.getSelection && typeof(win.getSelection().rangeCount) != undefined && win.getSelection().rangeCount == 0) {
 				Assert.fail("There is no cursor on this page!");
 			}
 			return element.selectionStart;
-		} 
+		}
 	}
 	throw new Error("Couldn't detect cursor position on this browser!");
 }
-   
+
 
 Selenium.prototype.doSetContext = function(context, logLevelThreshold) {
 	/**
    * Writes a message to the status bar and adds a note to the browser-side
    * log.
-   * 
+   *
    * <p>If logLevelThreshold is specified, set the threshold for logging
    * to that level (debug, info, warn, error).</p>
-   * 
+   *
    * <p>(Note that the browser-side logs will <i>not</i> be sent back to the
    * server, and are invisible to the Client Driver.)</p>
-   * 
+   *
    * @param context
    *            the message to be sent to the browser
    * @param logLevelThreshold one of "debug", "info", "warn", "error", sets the threshold for browser-side logging
@@ -1163,8 +1749,8 @@ Selenium.prototype.getExpression = function(expression) {
 	 * Returns the specified expression.
 	 *
 	 * <p>This is useful because of JavaScript preprocessing.
-	 * It is used to generate commands like assertExpression and storeExpression.</p>
-	 * 
+	 * It is used to generate commands like assertExpression and waitForExpression.</p>
+	 *
 	 * @param expression the value to return
 	 * @return string the value passed in
 	 */
@@ -1176,7 +1762,7 @@ Selenium.prototype.doWaitForCondition = function(script, timeout) {
    * Runs the specified JavaScript snippet repeatedly until it evaluates to "true".
    * The snippet may have multiple lines, but only the result of the last line
    * will be considered.
-   * 
+   *
    * <p>Note that, by default, the snippet will be run in the runner's test window, not in the window
    * of your application.  To get the window of your application, you can use
    * the JavaScript snippet <code>selenium.browserbot.getCurrentWindow()</code>, and then
@@ -1187,13 +1773,9 @@ Selenium.prototype.doWaitForCondition = function(script, timeout) {
     if (isNaN(timeout)) {
     	throw new SeleniumError("Timeout is not a number: " + timeout);
     }
-    
-    testLoop.waitForCondition = function () {
+    return decorateFunctionWithTimeout(function () {
         return eval(script);
-    };
-    
-    testLoop.waitForConditionStart = new Date().getTime();
-    testLoop.waitForConditionTimeout = timeout;
+    }, timeout);
 };
 
 Selenium.prototype.doWaitForCondition.dontCheckAlertsAndConfirms = true;
@@ -1206,23 +1788,33 @@ Selenium.prototype.doSetTimeout = function(timeout) {
 	 * The default timeout is 30 seconds.
 	 * @param timeout a timeout in milliseconds, after which the action will return with an error
 	 */
-	testLoop.waitForConditionTimeout = timeout;
+	this.defaultTimeout = parseInt(timeout);
 }
 
 Selenium.prototype.doWaitForPageToLoad = function(timeout) {
 	/**
    * Waits for a new page to load.
-   * 
+   *
    * <p>You can use this command instead of the "AndWait" suffixes, "clickAndWait", "selectAndWait", "typeAndWait" etc.
    * (which are only available in the JS API).</p>
-   * 
+   *
    * <p>Selenium constantly keeps track of new pages loading, and sets a "newPageLoaded"
    * flag when it first notices a page load.  Running any other Selenium command after
    * turns the flag to false.  Hence, if you want to wait for a page to load, you must
    * wait immediately after a Selenium command that caused a page-load.</p>
    * @param timeout a timeout in milliseconds, after which this command will return with an error
    */
-    this.doWaitForCondition("selenium.browserbot.isNewPageLoaded()", timeout);
+    if (isNaN(timeout)) {
+        throw new SeleniumError("Timeout is not a number: " + timeout);
+    }
+    // in pi-mode, the test and the harness share the window; thus if we are executing this code, then we have loaded
+    if (window["proxyInjectionMode"] == null || !window["proxyInjectionMode"]) {
+        return this.makePageLoadCondition(timeout);
+    }
+};
+
+Selenium.prototype._isNewPageLoaded = function() {
+    return this.browserbot.isNewPageLoaded();
 };
 
 Selenium.prototype.doWaitForPageToLoad.dontCheckAlertsAndConfirms = true;
@@ -1264,6 +1856,55 @@ Selenium.prototype.replaceVariables = function(str) {
     return stringResult;
 };
 
+Selenium.prototype.getCookie = function() {
+    /**
+     * Return all cookies of the current page under test.
+     *
+     * @return string all cookies of the current page under test
+     */
+    var doc = this.page().document();
+    return doc.cookie;
+};
+
+Selenium.prototype.doCreateCookie = function(nameValuePair, optionsString) {
+    /**
+     * Create a new cookie whose path and domain are same with those of current page
+     * under test, unless you specified a path for this cookie explicitly.
+     *
+     * @param nameValuePair name and value of the cookie in a format "name=value"
+     * @param optionsString options for the cookie. Currently supported options include 'path' and 'max_age'.
+     *      the optionsString's format is "path=/path/, max_age=60". The order of options are irrelevant, the unit
+     *      of the value of 'max_age' is second.
+     */
+    var results = /[^\s=\[\]\(\),"\/\?@:;]+=[^\s=\[\]\(\),"\/\?@:;]*/.test(nameValuePair);
+    if (!results) {
+        throw new SeleniumError("Invalid parameter.");
+    }
+    var cookie = nameValuePair.trim();
+    results = /max_age=(\d+)/.exec(optionsString);
+    if (results) {
+        var expireDateInMilliseconds = (new Date()).getTime() + results[1] * 1000;
+        cookie += "; expires=" + new Date(expireDateInMilliseconds).toGMTString();
+    }
+    results = /path=([^\s,]+)[,]?/.exec(optionsString);
+    if (results) {
+        cookie += "; path=" + results[1];
+    }
+    this.page().document().cookie = cookie;
+}
+
+Selenium.prototype.doDeleteCookie = function(name,path) {
+    /**
+     * Delete a named cookie with specified path.
+     *
+     * @param name the name of the cookie to be deleted
+     * @param path the path property of the cookie to be deleted
+     */
+    // set the expire time of the cookie to be deleted to one minute before now.
+    var expireDateInMilliseconds = (new Date()).getTime() + (-1 * 1000);
+    this.page().document().cookie = name.trim() + "=deleted; path=" + path.trim() + "; expires=" + new Date(expireDateInMilliseconds).toGMTString();
+}
+
 
 /**
  *  Factory for creating "Option Locators".
@@ -1398,5 +2039,3 @@ OptionLocatorFactory.prototype.OptionLocatorById = function(id) {
         Assert.matches(this.id, selectedId)
     };
 };
-
-