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

[<rb...@us...>]

Revision: 8246
          http://sourceforge.net/p/htmlunit/code/8246
Author:   rbri
Date:     2013-04-28 16:33:25 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
IE8 is different when doctype is defined

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2013-04-28 09:08:31 UTC (rev 8245)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2013-04-28 16:33:25 UTC (rev 8246)
@@ -607,8 +607,8 @@
     HTMLINPUT_SET_CHECKED_TO_DEFAULT_WHEN_ADDED,
 
     /** Set this checked state to false when added to page (IE). */
-    @BrowserFeature(@WebBrowser(value = IE, minVersion = 8))
-    HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED,
+    @BrowserFeature(@WebBrowser(value = IE))
+    HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_CLONE,
 
     /**
      * Set this property if the browser does NOT

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput.java	2013-04-28 09:08:31 UTC (rev 8245)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput.java	2013-04-28 16:33:25 UTC (rev 8246)
@@ -16,8 +16,7 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_ONCHANGE_LOSING_FOCUS;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_DEFAULT_IS_CHECKED;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_SET_CHECKED_TO_DEFAULT_WHEN_ADDED;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_CLONE;
 
 import java.io.IOException;
 import java.util.Map;
@@ -190,17 +189,10 @@
     protected void onAddedToPage() {
         super.onAddedToPage();
 
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_DEFAULT_WHEN_ADDED)) {
+        if (forceChecked_) {
             reset();
+            forceChecked_ = wasCreatedByJavascript();
         }
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED)) {
-            if (wasCreatedByJavascript()) {
-                removeAttribute("checked");
-            }
-            else if (forceChecked_) {
-                setAttribute("checked", "checked");
-            }
-        }
     }
 
     /**
@@ -210,17 +202,10 @@
     protected void onAddedToDocumentFragment() {
         super.onAddedToDocumentFragment();
 
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_DEFAULT_WHEN_ADDED)) {
+        if (forceChecked_) {
             reset();
+            forceChecked_ = false;
         }
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED)) {
-            if (wasCreatedByJavascript()) {
-                removeAttribute("checked");
-            }
-            else if (forceChecked_) {
-                setAttribute("checked", "checked");
-            }
-        }
     }
 
     /**
@@ -229,13 +214,10 @@
     @Override
     public DomNode cloneNode(final boolean deep) {
         final HtmlCheckBoxInput clone = (HtmlCheckBoxInput) super.cloneNode(deep);
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED)) {
+        if (wasCreatedByJavascript() && hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_CLONE)) {
             clone.removeAttribute("checked");
             clone.forceChecked_ = isDefaultChecked();
         }
-        if (wasCreatedByJavascript()) {
-            clone.markAsCreatedByJavascript();
-        }
         return clone;
     }
 

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput.java	2013-04-28 09:08:31 UTC (rev 8245)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput.java	2013-04-28 16:33:25 UTC (rev 8246)
@@ -16,8 +16,7 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_ONCHANGE_LOSING_FOCUS;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_DEFAULT_IS_CHECKED;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_SET_CHECKED_TO_DEFAULT_WHEN_ADDED;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_CLONE;
 
 import java.io.IOException;
 import java.util.List;
@@ -223,8 +222,12 @@
     public void setDefaultChecked(final boolean defaultChecked) {
         defaultCheckedState_ = defaultChecked;
         if (hasFeature(HTMLINPUT_DEFAULT_IS_CHECKED)) {
-            setChecked(defaultChecked);
+            setChecked(isDefaultChecked());
         }
+        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_CLONE)) {
+            reset();
+            forceChecked_ = true;
+        }
     }
 
     /**
@@ -251,22 +254,9 @@
     protected void onAddedToPage() {
         super.onAddedToPage();
 
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_DEFAULT_WHEN_ADDED)) {
-            reset();
+        if (forceChecked_) {
+            return;
         }
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED)) {
-            if (wasCreatedByJavascript()) {
-                removeAttribute("checked");
-            }
-            else {
-                if (forceChecked_) {
-                    setAttribute("checked", "checked");
-                }
-                else {
-                    return;
-                }
-            }
-        }
         setChecked(isChecked());
     }
 
@@ -276,23 +266,7 @@
     @Override
     protected void onAddedToDocumentFragment() {
         super.onAddedToPage();
-
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_DEFAULT_WHEN_ADDED)) {
-            reset();
-        }
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED)) {
-            if (wasCreatedByJavascript()) {
-                removeAttribute("checked");
-            }
-            else {
-                if (forceChecked_) {
-                    setAttribute("checked", "checked");
-                    forceChecked_ = false;
-                }
-                return;
-            }
-        }
-        setChecked(isChecked());
+        forceChecked_ = true;
     }
 
     /**
@@ -301,13 +275,11 @@
     @Override
     public DomNode cloneNode(final boolean deep) {
         final HtmlRadioButtonInput clone = (HtmlRadioButtonInput) super.cloneNode(deep);
-        if (hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_ADDED)) {
+        clone.forceChecked_ = false;
+        if (wasCreatedByJavascript() && hasFeature(HTMLINPUT_SET_CHECKED_TO_FALSE_WHEN_CLONE)) {
             clone.removeAttribute("checked");
-            clone.forceChecked_ = isDefaultChecked();
+            clone.forceChecked_ = true;
         }
-        if (wasCreatedByJavascript()) {
-            clone.markAsCreatedByJavascript();
-        }
         return clone;
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java	2013-04-28 09:08:31 UTC (rev 8245)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java	2013-04-28 16:33:25 UTC (rev 8246)
@@ -18,6 +18,7 @@
 
 import java.util.Arrays;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
@@ -40,12 +41,21 @@
 @RunWith(BrowserRunner.class)
 public class HtmlCheckBoxInput2Test extends WebDriverTestCase {
 
+	@After
+	public void after() {
+		try {
+			shutDownAll();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
     /**
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true", "true" },
-            IE = { "true", "false", "false" })
+    @Alerts(DEFAULT = { "true", "true", "true" })
     public void checked_appendChild_docFragment() throws Exception {
         performTest(true, true, false, true, false);
     }
@@ -63,8 +73,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true", "true" },
-            IE = { "true", "false", "false" })
+    @Alerts(DEFAULT = { "true", "true", "true" })
     public void checked_insertBefore_docFragment() throws Exception {
         performTest(true, false, false, true, false);
     }
@@ -119,7 +128,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true", "true" },
-            IE = { "true", "false", "false" })
+            IE = { "true", "true", "false" })
     public void checked_appendChild_docFragment_cloneNode() throws Exception {
         performTest(true, true, false, true, true);
     }
@@ -138,7 +147,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true", "true" },
-            IE = { "true", "false", "false" })
+            IE = { "true", "true", "false" })
     public void checked_insertBefore_docFragment_cloneNode() throws Exception {
         performTest(true, false, false, true, true);
     }
@@ -192,9 +201,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" },
-            IE = { "true", "false", "false", "false", "false", "false" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" })
     public void checked_appendChild() throws Exception {
         performTest(true, true, false, false, false);
     }
@@ -203,9 +210,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" })
     public void notchecked_appendChild() throws Exception {
         performTest(false, true, false, false, false);
     }
@@ -214,9 +219,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" },
-            IE = { "true", "false", "false", "false", "false", "false" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" })
     public void checked_insertBefore() throws Exception {
         performTest(true, false, false, false, false);
     }
@@ -225,9 +228,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" })
     public void notchecked_insertBefore() throws Exception {
         performTest(false, false, false, false, false);
     }
@@ -245,9 +246,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" })
     public void notchecked_appendChild_fromHtml() throws Exception {
         performTest(false, true, true, false, false);
     }
@@ -265,9 +264,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" })
     public void notchecked_insertBefore_fromHtml() throws Exception {
         performTest(false, false, true, false, false);
     }
@@ -277,8 +274,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+            IE = { "false", "false", "false", "true", "true", "true" })
     public void checked_appendChild_cloneNode() throws Exception {
         performTest(true, true, false, false, true);
     }
@@ -287,9 +283,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" })
     public void notchecked_appendChild_cloneNode() throws Exception {
         performTest(false, true, false, false, true);
     }
@@ -299,8 +293,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false", "false", "true", "true", "true" })
     public void checked_insertBefore_cloneNode() throws Exception {
         performTest(true, false, false, false, true);
     }
@@ -309,9 +302,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" })
     public void notchecked_insertBefore_cloneNode() throws Exception {
         performTest(false, false, false, false, true);
     }
@@ -320,8 +311,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" },
-            IE = { "false", "true", "true", "true", "true", "true" })
+    @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" })
     public void checked_appendChild_fromHtml_cloneNode() throws Exception {
         performTest(true, true, true, false, true);
     }
@@ -330,9 +320,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" })
     public void notchecked_appendChild_fromHtml_cloneNode() throws Exception {
         performTest(false, true, true, false, true);
     }
@@ -341,9 +329,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" },
-            IE = { "false", "true", "true", "true", "true", "true" })
-    public void checked_cloneNode_insertBefore_fromHtml() throws Exception {
+    @Alerts(DEFAULT = { "true", "true", "true", "true", "true", "true" })
+    public void checked_insertBefore_fromHtml_cloneNode() throws Exception {
         performTest(true, false, true, false, true);
     }
 
@@ -351,9 +338,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" },
-            IE = { "false", "false", "false", "false", "false", "false" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "false", "false", "false", "true", "true", "true" })
     public void notchecked_insertBefore_fromHtml_cloneNode() throws Exception {
         performTest(false, false, true, false, true);
     }
@@ -363,7 +348,7 @@
             final boolean fromHtml,
             final boolean useFragment,
             boolean cloneNode) throws Exception {
-        String html = "<html>\n"
+        String html = "<!DOCTYPE HTML>\n<html>\n"
             + "<head>\n"
             + "  <script>\n"
             + "    function test() {\n";

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java	2013-04-28 09:08:31 UTC (rev 8245)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java	2013-04-28 16:33:25 UTC (rev 8246)
@@ -16,6 +16,7 @@
 
 import java.util.Arrays;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
@@ -38,13 +39,22 @@
 @RunWith(BrowserRunner.class)
 public class HtmlRadioButtonInput2Test extends WebDriverTestCase {
 
+	@After
+	public void after() {
+		try {
+			shutDownAll();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
     /**
      * @throws Exception if the test fails
      */
     @Test
     @Alerts(DEFAULT = { "true", "true-true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "true", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+            IE = { "true", "true-true", "true-true", "true-true", "true-true", "true-true", "true-true" })
     public void checked_appendChild_docFragment() throws Exception {
         performTest(true, true, false, true, false);
     }
@@ -54,8 +64,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_appendChild_docFragment() throws Exception {
         performTest(false, true, false, true, false);
     }
@@ -65,8 +74,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true-true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "true", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+            IE = { "true", "true-true", "true-true", "true-true", "true-true", "true-true", "true-true" })
     public void checked_insertBefore_docFragment() throws Exception {
         performTest(true, false, false, true, false);
     }
@@ -76,8 +84,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_insertBefore_docFragment() throws Exception {
         performTest(false, false, false, true, false);
     }
@@ -98,8 +105,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_appendChild_fromHtml_docFragment() throws Exception {
         performTest(false, true, true, true, false);
     }
@@ -119,8 +125,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_insertBefore_fromHtml_docFragment() throws Exception {
         performTest(false, false, true, true, false);
     }
@@ -131,8 +136,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true-true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "true", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+            IE = { "true", "true-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void checked_appendChild_docFragment_cloneNode() throws Exception {
         performTest(true, true, false, true, true);
     }
@@ -142,8 +146,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_appendChild_docFragment_cloneNode() throws Exception {
         performTest(false, true, false, true, true);
     }
@@ -153,8 +156,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true-true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "true", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "true", "true-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void checked_insertBefore_docFragment_cloneNode() throws Exception {
         performTest(true, false, false, true, true);
     }
@@ -164,8 +166,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_insertBefore_docFragment_cloneNode() throws Exception {
         performTest(false, false, false, true, true);
     }
@@ -186,8 +187,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_appendChild_fromHtml_docFragment_cloneNode() throws Exception {
         performTest(false, true, true, true, true);
     }
@@ -207,8 +207,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_insertBefore_fromHtml_docFragment_cloneNode() throws Exception {
         performTest(false, false, true, true, true);
     }
@@ -217,9 +216,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" })
     public void checked_appendChild() throws Exception {
         performTest(true, true, false, false, false);
     }
@@ -229,8 +226,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_appendChild() throws Exception {
         performTest(false, true, false, false, false);
     }
@@ -239,9 +235,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "true", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+    @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" })
     public void checked_insertBefore() throws Exception {
         performTest(true, false, false, false, false);
     }
@@ -251,8 +245,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_insertBefore() throws Exception {
         performTest(false, false, false, false, false);
     }
@@ -273,8 +266,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_appendChild_fromHtml() throws Exception {
         performTest(false, true, true, false, false);
     }
@@ -294,8 +286,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_insertBefore_fromHtml() throws Exception {
         performTest(false, false, true, false, false);
     }
@@ -306,8 +297,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "true", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void checked_appendChild_cloneNode() throws Exception {
         performTest(true, true, false, false, true);
     }
@@ -317,8 +307,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_appendChild_cloneNode() throws Exception {
         performTest(false, true, false, false, true);
     }
@@ -328,8 +317,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void checked_insertBefore_cloneNode() throws Exception {
         performTest(true, false, false, false, true);
     }
@@ -339,8 +327,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_insertBefore_cloneNode() throws Exception {
         performTest(false, false, false, false, true);
     }
@@ -350,8 +337,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "false", "true-false", "true-false", "true-false", "true-false", "true-false" })
+    @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" })
     public void checked_appendChild_fromHtml_cloneNode() throws Exception {
         performTest(true, true, true, false, true);
     }
@@ -361,8 +347,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_appendChild_fromHtml_cloneNode() throws Exception {
         performTest(false, true, true, false, true);
     }
@@ -372,7 +357,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" },
-            IE = { "false", "true-false", "true-false", "true-false", "true-false", "true-false" })
+            IE = { "true", "true-false", "true-false", "true-false", "true-false", "true-false" })
     public void checked_insertBefore_fromHtml_cloneNode() throws Exception {
         performTest(true, false, true, false, true);
     }
@@ -382,8 +367,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "false", "false-true", "false-true", "true-true", "true-false", "true-false" },
-            IE = { "false", "false-true", "false-true", "false-true", "false-true", "false-true" },
-            IE6 = { "false", "false", "false", "false", "true", "true" })
+            IE = { "false", "false-true", "false-true", "true-true", "true-true", "true-true" })
     public void notchecked_insertBefore_fromHtml_cloneNode() throws Exception {
         performTest(false, false, true, false, true);
     }
@@ -393,7 +377,7 @@
             final boolean fromHtml,
             final boolean useFragment,
             boolean cloneNode) throws Exception {
-        String html = "<html>\n"
+        String html = "<!DOCTYPE HTML>\n<html>\n"
             + "<head>\n"
             + "  <script>\n"
             + "    function test() {\n"