[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jianli at chromium.org
jianli at chromium.org
Wed Dec 22 16:08:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7a064a562e9b28cd6dc6adbf67ce35900a8f8c64
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 18 23:33:54 2010 +0000
Move fileapi test files under http/tests/local to a new subdirectory under it
https://bugs.webkit.org/show_bug.cgi?id=49709
Reviewed by David Levin.
* http/tests/local/fileapi/resources/setup-file-input-element-for-drag.js: Renamed from LayoutTests/http/tests/local/resources/setup-file-input-element-for-drag.js.
* http/tests/local/fileapi/script-tests/TEMPLATE.html: Added.
* http/tests/local/fileapi/script-tests/send-dragged-file.js: Renamed from LayoutTests/http/tests/local/resources/send-dragged-file.js.
* http/tests/local/fileapi/script-tests/send-sliced-dragged-file.js: Renamed from LayoutTests/http/tests/local/resources/send-sliced-dragged-file.js.
* http/tests/local/fileapi/send-dragged-file-expected.txt: Renamed from LayoutTests/http/tests/local/send-dragged-file-expected.txt.
* http/tests/local/fileapi/send-dragged-file.html: Renamed from LayoutTests/http/tests/local/send-dragged-file.html.
* http/tests/local/fileapi/send-sliced-dragged-file-expected.txt: Renamed from LayoutTests/http/tests/local/send-sliced-dragged-file-expected.txt.
* http/tests/local/fileapi/send-sliced-dragged-file.html: Renamed from LayoutTests/http/tests/local/send-sliced-dragged-file.html.
* platform/gtk/Skipped:
* platform/mac-tiger/Skipped:
* platform/mac-wk2/Skipped:
* platform/qt-wk2/Skipped:
* platform/qt/Skipped:
* platform/win/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72340 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1835134..038cdee 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2010-11-18 Jian Li <jianli at chromium.org>
+
+ Reviewed by David Levin.
+
+ Move fileapi test files under http/tests/local to a new subdirectory under it
+ https://bugs.webkit.org/show_bug.cgi?id=49709
+
+ * http/tests/local/fileapi/resources/setup-file-input-element-for-drag.js: Renamed from LayoutTests/http/tests/local/resources/setup-file-input-element-for-drag.js.
+ * http/tests/local/fileapi/script-tests/TEMPLATE.html: Added.
+ * http/tests/local/fileapi/script-tests/send-dragged-file.js: Renamed from LayoutTests/http/tests/local/resources/send-dragged-file.js.
+ * http/tests/local/fileapi/script-tests/send-sliced-dragged-file.js: Renamed from LayoutTests/http/tests/local/resources/send-sliced-dragged-file.js.
+ * http/tests/local/fileapi/send-dragged-file-expected.txt: Renamed from LayoutTests/http/tests/local/send-dragged-file-expected.txt.
+ * http/tests/local/fileapi/send-dragged-file.html: Renamed from LayoutTests/http/tests/local/send-dragged-file.html.
+ * http/tests/local/fileapi/send-sliced-dragged-file-expected.txt: Renamed from LayoutTests/http/tests/local/send-sliced-dragged-file-expected.txt.
+ * http/tests/local/fileapi/send-sliced-dragged-file.html: Renamed from LayoutTests/http/tests/local/send-sliced-dragged-file.html.
+ * platform/gtk/Skipped:
+ * platform/mac-tiger/Skipped:
+ * platform/mac-wk2/Skipped:
+ * platform/qt-wk2/Skipped:
+ * platform/qt/Skipped:
+ * platform/win/Skipped:
+
2010-11-18 David Levin <levin at chromium.org>
[chromium] Add test expectations for failing tests.
diff --git a/LayoutTests/http/tests/local/resources/setup-file-input-element-for-drag.js b/LayoutTests/http/tests/local/fileapi/resources/setup-file-input-element-for-drag.js
similarity index 100%
rename from LayoutTests/http/tests/local/resources/setup-file-input-element-for-drag.js
rename to LayoutTests/http/tests/local/fileapi/resources/setup-file-input-element-for-drag.js
diff --git a/LayoutTests/http/tests/local/fileapi/script-tests/TEMPLATE.html b/LayoutTests/http/tests/local/fileapi/script-tests/TEMPLATE.html
new file mode 100644
index 0000000..a7a538b
--- /dev/null
+++ b/LayoutTests/http/tests/local/fileapi/script-tests/TEMPLATE.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../../../fast/js/resources/js-test-style.css">
+<script src="../../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="resources/setup-file-input-element-for-drag.js"></script>
+<script src="YOUR_JS_FILE_HERE"></script>
+<script src="../../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/http/tests/local/fileapi/script-tests/send-dragged-file.js b/LayoutTests/http/tests/local/fileapi/script-tests/send-dragged-file.js
new file mode 100644
index 0000000..4b3f028
--- /dev/null
+++ b/LayoutTests/http/tests/local/fileapi/script-tests/send-dragged-file.js
@@ -0,0 +1,32 @@
+description("Test for sending a dragged file via XMLHttpRequest.");
+
+function onFileDrop(file)
+{
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", "http://127.0.0.1:8000/xmlhttprequest/resources/post-echo.cgi", false);
+ xhr.send(file);
+ if (xhr.responseText == "1234567890")
+ testPassed("Expected response data received.");
+ else
+ testFailed("Unexpected response data received: " + xhr.responseText);
+
+ event.preventDefault();
+}
+
+function runTest()
+{
+ setFileInputDropCallback(onFileDrop);
+ eventSender.beginDragWithFiles(["../resources/file-for-drag-to-send.txt"]);
+ moveMouseToCenterOfElement(fileInput);
+ eventSender.mouseUp();
+}
+
+if (window.eventSender) {
+ runTest();
+ // Clean up after ourselves
+ removeFileInputElement();
+} else {
+ testFailed("This test is not interactive, please run using DumpRenderTree");
+}
+
+var successfullyParsed = true;
diff --git a/LayoutTests/http/tests/local/fileapi/script-tests/send-sliced-dragged-file.js b/LayoutTests/http/tests/local/fileapi/script-tests/send-sliced-dragged-file.js
new file mode 100644
index 0000000..1c14f62
--- /dev/null
+++ b/LayoutTests/http/tests/local/fileapi/script-tests/send-sliced-dragged-file.js
@@ -0,0 +1,168 @@
+description("Test for slicing a dragged file and sending it via XMLHttpRequest.");
+
+var tempFileContent = "1234567890";
+var tempFileName = "send-slice-dragged-file.tmp";
+var subfile;
+
+function uploadFile(file, filePath, start, length, expectedException)
+{
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", "http://127.0.0.1:8000/resources/post-and-verify.cgi?path=" + filePath + "&start=" + start + "&length=" + length, false);
+
+ var passed;
+ var message;
+ try {
+ xhr.send(file);
+ if (expectedException) {
+ passed = false;
+ message = "Unexpected response data received: " + xhr.responseText + ". Expecting exception thrown";
+ } else {
+ if (xhr.responseText == "OK") {
+ passed = true;
+ message = "Expected response data received: " + xhr.responseText;
+ } else {
+ passed = false;
+ message = "Unexpected response data received: " + xhr.responseText;
+ }
+ }
+ } catch (ex) {
+ if (expectedException) {
+ passed = true;
+ message = "Expected exception thrown: " + ex;
+ } else {
+ passed = false;
+ message = "Unexpected exception thrown: " + ex;
+ }
+ }
+
+ if (passed)
+ testPassed(message);
+ else
+ testFailed(message);
+}
+
+function createTempFile(fileData)
+{
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", "http://127.0.0.1:8000/resources/write-temp-file.php?filename=" + tempFileName + "&data=" + fileData, false);
+ xhr.send();
+ if (xhr.status != 200) {
+ testFailed("Unexpected response status received: " + xhr.status);
+ return;
+ }
+
+ var values = xhr.responseText.split('\n');
+ if (xhr.responseText.indexOf("FAIL") == 0) {
+ testFailed("Unexpected response text received: " + xhr.responseText);
+ return;
+ }
+
+ return xhr.responseText;
+}
+
+function touchTempFile()
+{
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", "http://127.0.0.1:8000/resources/touch-temp-file.php?filename=" + tempFileName, false);
+ xhr.send();
+}
+
+function removeTempFile()
+{
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", "http://127.0.0.1:8000/resources/reset-temp-file.php?filename=" + tempFileName, false);
+ xhr.send();
+}
+
+function computeExpectedLength(fileLength, start, length)
+{
+ var expectedLength = length;
+ if (start + length > fileLength) {
+ if (start >= fileLength)
+ expectedLength = 0;
+ else
+ expectedLength = fileLength - start;
+ }
+ return expectedLength;
+}
+
+function onStableFileDrop(file, filePath, fileLength, start, length, contentType)
+{
+ // Slice the file.
+ subfile = file.slice(start, length, contentType);
+ shouldEvaluateTo("subfile.size", computeExpectedLength(fileLength, start, length));
+ shouldBe("subfile.type", (contentType != undefined && contentType != null) ? '"' + contentType + '"' : '""');
+
+ // Upload the sliced file.
+ uploadFile(subfile, filePath, start, length, false);
+}
+
+function dragAndSliceStableFile(filePath, fileLength, start, length, contentType)
+{
+ setFileInputDropCallback(function(file) { onStableFileDrop(file, "../local/fileapi/" + filePath, fileLength, start, length, contentType); });
+ eventSender.beginDragWithFiles([filePath]);
+ moveMouseToCenterOfElement(fileInput);
+ eventSender.mouseUp();
+}
+
+function onUnstableFileDrop(file, filePath, fileLength, start, length, contentType)
+{
+ // Slice the file.
+ subfile = file.slice(start, length, contentType);
+ shouldEvaluateTo("subfile.size", computeExpectedLength(fileLength, start, length));
+ shouldBe("subfile.type", (contentType != undefined && contentType != null) ? '"' + contentType + '"' : '""');
+
+ // Upload the sliced file.
+ uploadFile(subfile, filePath, start, length, false);
+
+ // Touch the underlying temp file.
+ touchTempFile();
+
+ // Upload the sliced file. We should receive an exception since the file has been changed.
+ uploadFile(subfile, filePath, start, length, true);
+
+ // Remove the temp file.
+ removeTempFile();
+}
+
+function dragAndSliceUnstableFile(start, length, contentType)
+{
+ var tempFilePath = createTempFile(tempFileContent);
+ if (tempFilePath.length == 0)
+ return;
+
+ setFileInputDropCallback(function(file) { onUnstableFileDrop(file, tempFilePath, tempFileContent.length, start, length, contentType); });
+ eventSender.beginDragWithFiles([tempFilePath]);
+ moveMouseToCenterOfElement(fileInput);
+ eventSender.mouseUp();
+}
+
+function runTest()
+{
+ debug("Test slicing and sending an empty file.");
+ dragAndSliceStableFile("../resources/empty.txt", 0, 0, 10);
+
+ debug("Test slicing and sending a small file.");
+ dragAndSliceStableFile("../resources/file-for-drag-to-send.txt", 10, 2, 4, null);
+ dragAndSliceStableFile("../resources/file-for-drag-to-send.txt", 10, 2, 20, "type/foo");
+ dragAndSliceStableFile("../resources/file-for-drag-to-send.txt", 10, 15, 20, "type/bar");
+
+ // This is to test a file that exceeds the read buffer limit (2K in Mac).
+ debug("Test slicing and sending a big file.");
+ dragAndSliceStableFile("../resources/abe.png", 12242, 10, 40);
+ dragAndSliceStableFile("../resources/abe.png", 12242, 10, 3000);
+ dragAndSliceStableFile("../resources/abe.png", 12242, 3000, 15000);
+
+ debug("Test slicing and sending a file that has been changed right before sending.");
+ dragAndSliceUnstableFile(3, 5);
+}
+
+if (window.eventSender) {
+ runTest();
+ // Clean up after ourselves
+ removeFileInputElement();
+} else {
+ testFailed("This test is not interactive, please run using DumpRenderTree");
+}
+
+var successfullyParsed = true;
diff --git a/LayoutTests/http/tests/local/send-dragged-file-expected.txt b/LayoutTests/http/tests/local/fileapi/send-dragged-file-expected.txt
similarity index 100%
rename from LayoutTests/http/tests/local/send-dragged-file-expected.txt
rename to LayoutTests/http/tests/local/fileapi/send-dragged-file-expected.txt
diff --git a/LayoutTests/http/tests/local/fileapi/send-dragged-file.html b/LayoutTests/http/tests/local/fileapi/send-dragged-file.html
new file mode 100644
index 0000000..3a175d9
--- /dev/null
+++ b/LayoutTests/http/tests/local/fileapi/send-dragged-file.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../../../fast/js/resources/js-test-style.css">
+<script src="../../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="resources/setup-file-input-element-for-drag.js"></script>
+<script src="script-tests/send-dragged-file.js"></script>
+<script src="../../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/http/tests/local/send-sliced-dragged-file-expected.txt b/LayoutTests/http/tests/local/fileapi/send-sliced-dragged-file-expected.txt
similarity index 100%
rename from LayoutTests/http/tests/local/send-sliced-dragged-file-expected.txt
rename to LayoutTests/http/tests/local/fileapi/send-sliced-dragged-file-expected.txt
diff --git a/LayoutTests/http/tests/local/fileapi/send-sliced-dragged-file.html b/LayoutTests/http/tests/local/fileapi/send-sliced-dragged-file.html
new file mode 100644
index 0000000..0b64685
--- /dev/null
+++ b/LayoutTests/http/tests/local/fileapi/send-sliced-dragged-file.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../../../fast/js/resources/js-test-style.css">
+<script src="../../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="resources/setup-file-input-element-for-drag.js"></script>
+<script src="script-tests/send-sliced-dragged-file.js"></script>
+<script src="../../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/http/tests/local/resources/send-dragged-file.js b/LayoutTests/http/tests/local/resources/send-dragged-file.js
deleted file mode 100644
index efc1124..0000000
--- a/LayoutTests/http/tests/local/resources/send-dragged-file.js
+++ /dev/null
@@ -1,32 +0,0 @@
-description("Test for sending a dragged file via XMLHttpRequest.");
-
-function onFileDrop(file)
-{
- var xhr = new XMLHttpRequest();
- xhr.open("POST", "http://127.0.0.1:8000/xmlhttprequest/resources/post-echo.cgi", false);
- xhr.send(file);
- if (xhr.responseText == "1234567890")
- testPassed("Expected response data received.");
- else
- testFailed("Unexpected response data received: " + xhr.responseText);
-
- event.preventDefault();
-}
-
-function runTest()
-{
- setFileInputDropCallback(onFileDrop);
- eventSender.beginDragWithFiles(["resources/file-for-drag-to-send.txt"]);
- moveMouseToCenterOfElement(fileInput);
- eventSender.mouseUp();
-}
-
-if (window.eventSender) {
- runTest();
- // Clean up after ourselves
- removeFileInputElement();
-} else {
- testFailed("This test is not interactive, please run using DumpRenderTree");
-}
-
-var successfullyParsed = true;
diff --git a/LayoutTests/http/tests/local/resources/send-sliced-dragged-file.js b/LayoutTests/http/tests/local/resources/send-sliced-dragged-file.js
deleted file mode 100644
index 8bbfb2d..0000000
--- a/LayoutTests/http/tests/local/resources/send-sliced-dragged-file.js
+++ /dev/null
@@ -1,168 +0,0 @@
-description("Test for slicing a dragged file and sending it via XMLHttpRequest.");
-
-var tempFileContent = "1234567890";
-var tempFileName = "send-slice-dragged-file.tmp";
-var subfile;
-
-function uploadFile(file, filePath, start, length, expectedException)
-{
- var xhr = new XMLHttpRequest();
- xhr.open("POST", "http://127.0.0.1:8000/resources/post-and-verify.cgi?path=" + filePath + "&start=" + start + "&length=" + length, false);
-
- var passed;
- var message;
- try {
- xhr.send(file);
- if (expectedException) {
- passed = false;
- message = "Unexpected response data received: " + xhr.responseText + ". Expecting exception thrown";
- } else {
- if (xhr.responseText == "OK") {
- passed = true;
- message = "Expected response data received: " + xhr.responseText;
- } else {
- passed = false;
- message = "Unexpected response data received: " + xhr.responseText;
- }
- }
- } catch (ex) {
- if (expectedException) {
- passed = true;
- message = "Expected exception thrown: " + ex;
- } else {
- passed = false;
- message = "Unexpected exception thrown: " + ex;
- }
- }
-
- if (passed)
- testPassed(message);
- else
- testFailed(message);
-}
-
-function createTempFile(fileData)
-{
- var xhr = new XMLHttpRequest();
- xhr.open("POST", "http://127.0.0.1:8000/resources/write-temp-file.php?filename=" + tempFileName + "&data=" + fileData, false);
- xhr.send();
- if (xhr.status != 200) {
- testFailed("Unexpected response status received: " + xhr.status);
- return;
- }
-
- var values = xhr.responseText.split('\n');
- if (xhr.responseText.indexOf("FAIL") == 0) {
- testFailed("Unexpected response text received: " + xhr.responseText);
- return;
- }
-
- return xhr.responseText;
-}
-
-function touchTempFile()
-{
- var xhr = new XMLHttpRequest();
- xhr.open("POST", "http://127.0.0.1:8000/resources/touch-temp-file.php?filename=" + tempFileName, false);
- xhr.send();
-}
-
-function removeTempFile()
-{
- var xhr = new XMLHttpRequest();
- xhr.open("POST", "http://127.0.0.1:8000/resources/reset-temp-file.php?filename=" + tempFileName, false);
- xhr.send();
-}
-
-function computeExpectedLength(fileLength, start, length)
-{
- var expectedLength = length;
- if (start + length > fileLength) {
- if (start >= fileLength)
- expectedLength = 0;
- else
- expectedLength = fileLength - start;
- }
- return expectedLength;
-}
-
-function onStableFileDrop(file, filePath, fileLength, start, length, contentType)
-{
- // Slice the file.
- subfile = file.slice(start, length, contentType);
- shouldEvaluateTo("subfile.size", computeExpectedLength(fileLength, start, length));
- shouldBe("subfile.type", (contentType != undefined && contentType != null) ? '"' + contentType + '"' : '""');
-
- // Upload the sliced file.
- uploadFile(subfile, filePath, start, length, false);
-}
-
-function dragAndSliceStableFile(filePath, fileLength, start, length, contentType)
-{
- setFileInputDropCallback(function(file) { onStableFileDrop(file, "../local/" + filePath, fileLength, start, length, contentType); });
- eventSender.beginDragWithFiles([filePath]);
- moveMouseToCenterOfElement(fileInput);
- eventSender.mouseUp();
-}
-
-function onUnstableFileDrop(file, filePath, fileLength, start, length, contentType)
-{
- // Slice the file.
- subfile = file.slice(start, length, contentType);
- shouldEvaluateTo("subfile.size", computeExpectedLength(fileLength, start, length));
- shouldBe("subfile.type", (contentType != undefined && contentType != null) ? '"' + contentType + '"' : '""');
-
- // Upload the sliced file.
- uploadFile(subfile, filePath, start, length, false);
-
- // Touch the underlying temp file.
- touchTempFile();
-
- // Upload the sliced file. We should receive an exception since the file has been changed.
- uploadFile(subfile, filePath, start, length, true);
-
- // Remove the temp file.
- removeTempFile();
-}
-
-function dragAndSliceUnstableFile(start, length, contentType)
-{
- var tempFilePath = createTempFile(tempFileContent);
- if (tempFilePath.length == 0)
- return;
-
- setFileInputDropCallback(function(file) { onUnstableFileDrop(file, tempFilePath, tempFileContent.length, start, length, contentType); });
- eventSender.beginDragWithFiles([tempFilePath]);
- moveMouseToCenterOfElement(fileInput);
- eventSender.mouseUp();
-}
-
-function runTest()
-{
- debug("Test slicing and sending an empty file.");
- dragAndSliceStableFile("resources/empty.txt", 0, 0, 10);
-
- debug("Test slicing and sending a small file.");
- dragAndSliceStableFile("resources/file-for-drag-to-send.txt", 10, 2, 4, null);
- dragAndSliceStableFile("resources/file-for-drag-to-send.txt", 10, 2, 20, "type/foo");
- dragAndSliceStableFile("resources/file-for-drag-to-send.txt", 10, 15, 20, "type/bar");
-
- // This is to test a file that exceeds the read buffer limit (2K in Mac).
- debug("Test slicing and sending a big file.");
- dragAndSliceStableFile("resources/abe.png", 12242, 10, 40);
- dragAndSliceStableFile("resources/abe.png", 12242, 10, 3000);
- dragAndSliceStableFile("resources/abe.png", 12242, 3000, 15000);
-
- debug("Test slicing and sending a file that has been changed right before sending.");
- dragAndSliceUnstableFile(3, 5);
-}
-
-if (window.eventSender) {
- runTest();
- // Clean up after ourselves
- removeFileInputElement();
-} else {
- testFailed("This test is not interactive, please run using DumpRenderTree");
-}
-
-var successfullyParsed = true;
diff --git a/LayoutTests/http/tests/local/send-dragged-file.html b/LayoutTests/http/tests/local/send-dragged-file.html
deleted file mode 100644
index f5280f4..0000000
--- a/LayoutTests/http/tests/local/send-dragged-file.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
-<script src="../../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="resources/setup-file-input-element-for-drag.js"></script>
-<script src="resources/send-dragged-file.js"></script>
-<script src="../../../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/local/send-sliced-dragged-file.html b/LayoutTests/http/tests/local/send-sliced-dragged-file.html
deleted file mode 100644
index c041b1f..0000000
--- a/LayoutTests/http/tests/local/send-sliced-dragged-file.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
-<script src="../../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="resources/setup-file-input-element-for-drag.js"></script>
-<script src="resources/send-sliced-dragged-file.js"></script>
-<script src="../../../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index b6db47c..c70a6f7 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5468,8 +5468,7 @@ fast/events/drag-to-navigate.html
fast/events/prevent-drag-to-navigate.html
fast/forms/input-file-re-render.html
http/tests/local/formdata
-http/tests/local/send-dragged-file.html
-http/tests/local/send-sliced-dragged-file.html
+http/tests/local/fileapi
http/tests/security/clipboard/clipboard-file-access.html
# Still failing, looks like a bug in the EventSender drag-and-drop
diff --git a/LayoutTests/platform/mac-tiger/Skipped b/LayoutTests/platform/mac-tiger/Skipped
index b3f2c48..9a742f9 100644
--- a/LayoutTests/platform/mac-tiger/Skipped
+++ b/LayoutTests/platform/mac-tiger/Skipped
@@ -129,7 +129,7 @@ fast/events/continuous-platform-wheelevent-in-scrolling-div.html
# Intermittently times out on Tiger bot.
# https://bugs.webkit.org/show_bug.cgi?id=36039
-http/tests/local/send-sliced-dragged-file.html
+http/tests/local/fileapi/send-sliced-dragged-file.html
# Times out on Tiger bot.
# https://bugs.webkit.org/show_bug.cgi?id=36382
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index e9fc5ce..10faaf3 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -461,8 +461,7 @@ http/tests/local/blob/send-hybrid-blob.html
http/tests/local/blob/send-sliced-data-blob.html
http/tests/local/drag-over-remote-content.html
http/tests/local/formdata
-http/tests/local/send-dragged-file.html
-http/tests/local/send-sliced-dragged-file.html
+http/tests/local/fileapi
http/tests/misc/bubble-drag-events.html
http/tests/misc/drag-over-iframe-invalid-source-crash.html
http/tests/misc/isindex-with-no-form.html
diff --git a/LayoutTests/platform/qt-wk2/Skipped b/LayoutTests/platform/qt-wk2/Skipped
index 03059a3..c608611 100644
--- a/LayoutTests/platform/qt-wk2/Skipped
+++ b/LayoutTests/platform/qt-wk2/Skipped
@@ -507,8 +507,7 @@ http/tests/local/drag-over-remote-content.html
http/tests/local/formdata/send-form-data-with-sliced-file.html
http/tests/local/formdata/send-form-data.html
http/tests/local/formdata/upload-events.html
-http/tests/local/send-dragged-file.html
-http/tests/local/send-sliced-dragged-file.html
+http/tests/local/fileapi
http/tests/misc/bubble-drag-events.html
http/tests/misc/drag-over-iframe-invalid-source-crash.html
http/tests/misc/isindex-with-no-form.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 1bd7cbf..5f8efe9 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -188,8 +188,7 @@ http/tests/loading/text-content-type-with-binary-extension.html
# drag n drop support again
http/tests/local/drag-over-remote-content.html
-http/tests/local/send-dragged-file.html
-http/tests/local/send-sliced-dragged-file.html
+http/tests/local/fileapi
# CONSOLE MESSAGE: line 72: TypeError: Result of expression 'eventSender.beginDragWithFiles' [undefined] is not a function.
http/tests/local/blob/send-hybrid-blob.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 02a1b9c..3936b21 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -745,8 +745,7 @@ editing/pasteboard/files-during-page-drags.html
fast/forms/input-selectedoption.html
# <https://bugs.webkit.org/show_bug.cgi?id=29287>
-http/tests/local/send-dragged-file.html
-http/tests/local/send-sliced-dragged-file.html
+http/tests/local/fileapi
http/tests/local/blob/send-hybrid-blob.html
http/tests/local/formdata
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list