Commit 7a064a56 authored by jianli@chromium.org's avatar jianli@chromium.org
Browse files

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
parent adf26a09
2010-11-18 Jian Li <jianli@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@chromium.org>
 
[chromium] Add test expectations for failing tests.
<!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>
<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>
<script src="YOUR_JS_FILE_HERE"></script>
<script src="../../../../fast/js/resources/js-test-post.js"></script>
</body>
</html>
......@@ -16,7 +16,7 @@ function onFileDrop(file)
function runTest()
{
setFileInputDropCallback(onFileDrop);
eventSender.beginDragWithFiles(["resources/file-for-drag-to-send.txt"]);
eventSender.beginDragWithFiles(["../resources/file-for-drag-to-send.txt"]);
moveMouseToCenterOfElement(fileInput);
eventSender.mouseUp();
}
......
......@@ -99,7 +99,7 @@ function onStableFileDrop(file, filePath, fileLength, start, length, contentType
function dragAndSliceStableFile(filePath, fileLength, start, length, contentType)
{
setFileInputDropCallback(function(file) { onStableFileDrop(file, "../local/" + filePath, fileLength, start, length, contentType); });
setFileInputDropCallback(function(file) { onStableFileDrop(file, "../local/fileapi/" + filePath, fileLength, start, length, contentType); });
eventSender.beginDragWithFiles([filePath]);
moveMouseToCenterOfElement(fileInput);
eventSender.mouseUp();
......@@ -140,18 +140,18 @@ function dragAndSliceUnstableFile(start, length, contentType)
function runTest()
{
debug("Test slicing and sending an empty file.");
dragAndSliceStableFile("resources/empty.txt", 0, 0, 10);
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");
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);
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);
......
<!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>
<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>
<script src="script-tests/send-dragged-file.js"></script>
<script src="../../../../fast/js/resources/js-test-post.js"></script>
</body>
</html>
<!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>
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment