summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 20:30:05 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 20:30:05 +0000
commit3083a622a26104514d1db147194cc8d9fa7c8752 (patch)
tree46085618ec8c9453924b1d1820e095cad243b97b
parent5d8fb1ae538ccca3468c338e7c8f5ad06f8b944e (diff)
downloadchromium_src-3083a622a26104514d1db147194cc8d9fa7c8752.zip
chromium_src-3083a622a26104514d1db147194cc8d9fa7c8752.tar.gz
chromium_src-3083a622a26104514d1db147194cc8d9fa7c8752.tar.bz2
Fixing chrome/fast/dom/java-applet-calls.html
I don't understand how the test could have worked because if you don't specify a CODEBASE for the Java Applet the default is the url. In the Java console I was seeing it try to load the class by appending the TestApplet to the path to the html file (the layout test file). By specifying "." as the CODEBASE it is able to find and load the class that resides in the same directory and all is well. Review URL: http://codereview.chromium.org/48148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12005 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/chrome/fast/dom/java-applet-calls.html15
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt1
2 files changed, 7 insertions, 9 deletions
diff --git a/webkit/data/layout_tests/chrome/fast/dom/java-applet-calls.html b/webkit/data/layout_tests/chrome/fast/dom/java-applet-calls.html
index d951d85..c169218 100644
--- a/webkit/data/layout_tests/chrome/fast/dom/java-applet-calls.html
+++ b/webkit/data/layout_tests/chrome/fast/dom/java-applet-calls.html
@@ -5,13 +5,12 @@
if (window.layoutTestController)
layoutTestController.dumpAsText();
function runTest() {
-try {
- document.testapplet.setString("abcdefg");
- if (document.testapplet.getString() == "abcdefg")
- document.getElementById("result").innerHTML = "TEST PASSED!";
-} catch (e) {
-}
-
+ try {
+ document.testapplet.setString("abcdefg");
+ if (document.testapplet.getString() == "abcdefg")
+ document.getElementById("result").innerHTML = "TEST PASSED!";
+ } catch (e) {
+ }
}
</script>
@@ -20,7 +19,7 @@ try {
Requires Java plugin been installed.<br>
This tests that calling functions on Java Applet works.<br>
<div id="result">FAIL</div>
-<APPLET CODE=TestApplet WIDTH=1 HEIGHT=1 NAME="testapplet">
+<APPLET CODEBASE="." CODE="TestApplet.class" WIDTH=1 HEIGHT=1 NAME="testapplet">
</APPLET>
</BODY>
</HTML>
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 6047bb8d..6c772b0 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1751,7 +1751,6 @@ LINUX: LayoutTests/fast/compact/001.html = CRASH PASS
// Regressions from merge 41559:41588
// This one probably just needs a new baseline:
LINUX : LayoutTests/fast/inline/long-wrapped-line.html = FAIL
-WIN : chrome/fast/dom/java-applet-calls.html = FAIL
LINUX : LayoutTests/editing/execCommand/selectAll.html = FAIL
LINUX : LayoutTests/fast/text/trailing-white-space.html = FAIL
LINUX : LayoutTests/fast/text/trailing-white-space-2.html = FAIL