4 files changed, 35 insertions, 46 deletions
diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt
new file mode 100644
index 0000000..4d7e1f0
--- /dev/null
+++ b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt
@@ -0,0 +1,8 @@
+
+Tests the keygen element.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.getElementById("keys").options is undefined
+
diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt
deleted file mode 100644
index a6f14fb..0000000
--- a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-This test verifies that list-box-style select form control for keygen works properly when selecting from option element.
-
-You should see the word "SUCCESS" below
-
-SUCCESS
diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html
deleted file mode 100644
index 2667715..0000000
--- a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html><head>
-</head><body>
-<keygen id="keys" />
-
-<p>This test verifies that list-box-style select form control for keygen works properly when selecting from option element.
-</p><p>You should see the word "SUCCESS" below</p>
-
-<div id="result">FAILED</div>
-
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-function test(elementId)
-{
-    var testKeygenElement = document.getElementById(elementId);
-
-    // Add two option elements here in case the webkit port used doesn't implement the WebCore::getSupportedKeySizes() function
-
-    var testOption1 = document.createElement("option");
-    var testOption1Text = document.createTextNode("foo1");
-    testOption1.appendChild(testOption1Text);
-    testKeygenElement.appendChild(testOption1);
-
-    var testOption2 = document.createElement("option");
-    var testOption2Text = document.createTextNode("foo2");
-    testOption2.appendChild(testOption2Text);
-    testKeygenElement.appendChild(testOption2);
-
-    if (testKeygenElement.options[1].index == 1)
-    {
-        var result = document.getElementById("result");
-        result.innerHTML = "SUCCESS";
-    }
-}
-test("keys");
-</script>
-
-
-</body></html>
diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html b/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html
new file mode 100644
index 0000000..59196ac
--- /dev/null
+++ b/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html
@@ -0,0 +1,27 @@
+<html>
+<head>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css">
+<script src="../../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<keygen id="keys" />
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+function test(elementId)
+{
+    description('Tests the keygen element.');
+
+    shouldBe('document.getElementById("keys").options', 'undefined');    
+}
+
+test("keys");
+</script>
+
+</body>
+</html>