[HtmlUnit] SVN: [7956] trunk/htmlunit/src

[<mgu...@us...>]

Revision: 7956
          http://sourceforge.net/p/htmlunit/code/7956
Author:   mguillem
Date:     2013-01-08 09:04:33 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
implement Range.equivalentValues allowing SelectionTest.aLittleBitOfEverything_removeRange to work for FF10+

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Range.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SelectionTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Range.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Range.java	2013-01-08 09:03:12 UTC (rev 7955)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Range.java	2013-01-08 09:04:33 UTC (rev 7956)
@@ -481,4 +481,16 @@
     public String toString() {
         return toW3C().toString();
     }
+
+    @Override
+    protected Object equivalentValues(final Object value) {
+        if (!(value instanceof Range)) {
+            return false;
+        }
+        final Range other = (Range) value;
+        return startContainer_ == other.startContainer_
+                && endContainer_ == other.endContainer_
+                && startOffset_ == other.startOffset_
+                && endOffset_ == other.endOffset_;
+    }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SelectionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SelectionTest.java	2013-01-08 09:03:12 UTC (rev 7955)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SelectionTest.java	2013-01-08 09:04:33 UTC (rev 7956)
@@ -22,6 +22,7 @@
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
+import com.gargoylesoftware.htmlunit.BrowserRunner.Browser;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers;
 import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
@@ -141,15 +142,15 @@
      */
     @Test
     @Browsers(FF)
-    @NotYetImplemented
     @Alerts(FF3_6 = {
             "1:[object Text]/1/[object Text]/2/false/undefined/1/yzfo/yzfo",
             "2:[object Text]/1/[object Text]/2/true/undefined/0/",
             "false", "true" },
-            FF10 = {
+            FF = {
             "1:[object Text]/1/[object Text]/2/false/undefined/1/yzfo/yzfo",
             "2:null/0/null/0/true/undefined/0/",
             "false", "true" })
+    @NotYetImplemented(Browser.FF3_6)
     public void aLittleBitOfEverything_removeRange() throws Exception {
         final String jsSnippet = ""
             + "    var range = document.createRange();\n"