Consolidate entries-api tests under entries-api/ folders
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Sep 2017 21:49:16 +0000 (21:49 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Sep 2017 21:49:16 +0000 (21:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=176315

Reviewed by Darin Adler.

Consolidate entries-api tests under entries-api/ folders, for clarity.
Also drop an older test for directory upload which did not pass because
it was missing its resources. We now have good coverage for this feature
so this test is not needed.

* editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-error-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-error-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-error.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-error.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-root-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-root-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-root.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-root.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-fileEntry-file-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-fileEntry-file-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-fileEntry-file.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-fileEntry-file.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-getAsEntry-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getAsEntry-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-getAsEntry.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getAsEntry.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-getDirectory-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getDirectory-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-getDirectory.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getDirectory.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-getFile-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getFile-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-getFile.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getFile.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-getParent-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-getParent-root-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-root-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-getParent-root.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-root.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-getParent.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent.html.
* editing/pasteboard/enties-api/datatransfer-items-drop-getParent2-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent2-expected.txt.
* editing/pasteboard/enties-api/datatransfer-items-drop-getParent2.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent2.html.
* fast/forms/file/entries-api/resources/testFiles/file1.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/file1.txt.
* fast/forms/file/entries-api/resources/testFiles/file2.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/file2.txt.
* fast/forms/file/entries-api/resources/testFiles/subfolder1/file3.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/subfolder1/file3.txt.
* fast/forms/file/entries-api/resources/testFiles/subfolder2/file4.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/subfolder2/file4.txt.
* fast/forms/file/entries-api/resources/testFiles/subfolder2/subfolder2a/file5.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/subfolder2/subfolder2a/file5.txt.
* fast/forms/file/entries-api/webkitdirectory-drag-folder-expected.txt: Renamed from LayoutTests/fast/forms/file/webkitdirectory-drag-folder-expected.txt.
* fast/forms/file/entries-api/webkitdirectory-drag-folder.html: Renamed from LayoutTests/fast/forms/file/webkitdirectory-drag-folder.html.
* fast/forms/file/entries-api/webkitdirectory-open-panel-expected.txt: Renamed from LayoutTests/fast/forms/file/webkitdirectory-open-panel-expected.txt.
* fast/forms/file/entries-api/webkitdirectory-open-panel.html: Renamed from LayoutTests/fast/forms/file/webkitdirectory-open-panel.html.
* fast/forms/file/input-file-directory-upload-expected.txt: Removed.
* fast/forms/file/input-file-directory-upload.html: Removed.
* platform/ios/TestExpectations:
* platform/mac-wk1/fast/forms/file/entries-api/webkitdirectory-open-panel-expected.txt: Renamed from LayoutTests/platform/mac-wk1/fast/forms/file/webkitdirectory-open-panel-expected.txt.
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
* platform/wk2/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221556 268f45cc-cd09-0410-ab3c-d52691b4dbfc

38 files changed:
LayoutTests/ChangeLog
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-error-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-error-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-error.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-error.html with 83% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-root-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-root-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-root.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-root.html with 91% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader.html with 95% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-fileEntry-file-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-fileEntry-file-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-fileEntry-file.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-fileEntry-file.html with 93% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getAsEntry-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getAsEntry-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getAsEntry.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getAsEntry.html with 90% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getDirectory-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getDirectory-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getDirectory.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getDirectory.html with 97% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getFile-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getFile-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getFile.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getFile.html with 97% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getParent-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getParent-root-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-root-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getParent-root.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-root.html with 85% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getParent.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent.html with 87% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getParent2-expected.txt [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent2-expected.txt with 100% similarity]
LayoutTests/editing/pasteboard/enties-api/datatransfer-items-drop-getParent2.html [moved from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent2.html with 88% similarity]
LayoutTests/fast/forms/file/entries-api/resources/testFiles/file1.txt [moved from LayoutTests/fast/forms/file/resources/testFiles/file1.txt with 100% similarity]
LayoutTests/fast/forms/file/entries-api/resources/testFiles/file2.txt [moved from LayoutTests/fast/forms/file/resources/testFiles/file2.txt with 100% similarity]
LayoutTests/fast/forms/file/entries-api/resources/testFiles/subfolder1/file3.txt [moved from LayoutTests/fast/forms/file/resources/testFiles/subfolder1/file3.txt with 100% similarity]
LayoutTests/fast/forms/file/entries-api/resources/testFiles/subfolder2/file4.txt [moved from LayoutTests/fast/forms/file/resources/testFiles/subfolder2/file4.txt with 100% similarity]
LayoutTests/fast/forms/file/entries-api/resources/testFiles/subfolder2/subfolder2a/file5.txt [moved from LayoutTests/fast/forms/file/resources/testFiles/subfolder2/subfolder2a/file5.txt with 100% similarity]
LayoutTests/fast/forms/file/entries-api/webkitdirectory-drag-folder-expected.txt [moved from LayoutTests/fast/forms/file/webkitdirectory-drag-folder-expected.txt with 100% similarity]
LayoutTests/fast/forms/file/entries-api/webkitdirectory-drag-folder.html [moved from LayoutTests/fast/forms/file/webkitdirectory-drag-folder.html with 93% similarity]
LayoutTests/fast/forms/file/entries-api/webkitdirectory-open-panel-expected.txt [moved from LayoutTests/fast/forms/file/webkitdirectory-open-panel-expected.txt with 100% similarity]
LayoutTests/fast/forms/file/entries-api/webkitdirectory-open-panel.html [moved from LayoutTests/fast/forms/file/webkitdirectory-open-panel.html with 92% similarity]
LayoutTests/fast/forms/file/input-file-directory-upload-expected.txt [deleted file]
LayoutTests/fast/forms/file/input-file-directory-upload.html [deleted file]
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/ios/TestExpectations
LayoutTests/platform/mac-wk1/fast/forms/file/entries-api/webkitdirectory-open-panel-expected.txt [moved from LayoutTests/platform/mac-wk1/fast/forms/file/webkitdirectory-open-panel-expected.txt with 100% similarity]
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/wk2/TestExpectations

index 4de7f99..44ba039 100644 (file)
@@ -1,3 +1,52 @@
+2017-09-03  Chris Dumez  <cdumez@apple.com>
+
+        Consolidate entries-api tests under entries-api/ folders
+        https://bugs.webkit.org/show_bug.cgi?id=176315
+
+        Reviewed by Darin Adler.
+
+        Consolidate entries-api tests under entries-api/ folders, for clarity.
+        Also drop an older test for directory upload which did not pass because
+        it was missing its resources. We now have good coverage for this feature
+        so this test is not needed.
+
+        * editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-error-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-error-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-error.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-error.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-root-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-root-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader-root.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader-root.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-directoryReader.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-directoryReader.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-fileEntry-file-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-fileEntry-file-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-fileEntry-file.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-fileEntry-file.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getAsEntry-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getAsEntry-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getAsEntry.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getAsEntry.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getDirectory-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getDirectory-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getDirectory.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getDirectory.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getFile-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getFile-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getFile.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getFile.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getParent-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getParent-root-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-root-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getParent-root.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent-root.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getParent.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent.html.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getParent2-expected.txt: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent2-expected.txt.
+        * editing/pasteboard/enties-api/datatransfer-items-drop-getParent2.html: Renamed from LayoutTests/editing/pasteboard/datatransfer-items-drop-getParent2.html.
+        * fast/forms/file/entries-api/resources/testFiles/file1.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/file1.txt.
+        * fast/forms/file/entries-api/resources/testFiles/file2.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/file2.txt.
+        * fast/forms/file/entries-api/resources/testFiles/subfolder1/file3.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/subfolder1/file3.txt.
+        * fast/forms/file/entries-api/resources/testFiles/subfolder2/file4.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/subfolder2/file4.txt.
+        * fast/forms/file/entries-api/resources/testFiles/subfolder2/subfolder2a/file5.txt: Renamed from LayoutTests/fast/forms/file/resources/testFiles/subfolder2/subfolder2a/file5.txt.
+        * fast/forms/file/entries-api/webkitdirectory-drag-folder-expected.txt: Renamed from LayoutTests/fast/forms/file/webkitdirectory-drag-folder-expected.txt.
+        * fast/forms/file/entries-api/webkitdirectory-drag-folder.html: Renamed from LayoutTests/fast/forms/file/webkitdirectory-drag-folder.html.
+        * fast/forms/file/entries-api/webkitdirectory-open-panel-expected.txt: Renamed from LayoutTests/fast/forms/file/webkitdirectory-open-panel-expected.txt.
+        * fast/forms/file/entries-api/webkitdirectory-open-panel.html: Renamed from LayoutTests/fast/forms/file/webkitdirectory-open-panel.html.
+        * fast/forms/file/input-file-directory-upload-expected.txt: Removed.
+        * fast/forms/file/input-file-directory-upload.html: Removed.
+        * platform/ios/TestExpectations:
+        * platform/mac-wk1/fast/forms/file/entries-api/webkitdirectory-open-panel-expected.txt: Renamed from LayoutTests/platform/mac-wk1/fast/forms/file/webkitdirectory-open-panel-expected.txt.
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+        * platform/wk2/TestExpectations:
+
 2017-09-02  Chris Dumez  <cdumez@apple.com>
 
         Implement FileSystemFileEntry.file()
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -35,7 +35,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -81,7 +81,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/resources/test.txt', '../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/resources/test.txt', '../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -108,7 +108,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -107,7 +107,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/resources/test.txt', '../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/resources/test.txt', '../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -60,7 +60,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/resources/test.txt', '../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/resources/test.txt', '../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -190,7 +190,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -188,7 +188,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -37,7 +37,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/resources/test.txt']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/resources/test.txt']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -52,7 +52,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/resources/test.txt', '../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/resources/test.txt', '../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../resources/js-test.js"></script>
-<script src="../editing.js"></script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../../editing.js"></script>
 </head>
 <body>
 <div id="dropzone" style="width: 200px; height: 200px; background-color: grey;"></div>
@@ -46,7 +46,7 @@ dropzone.ondragover = function(ev) {
 }
 
 onload = function() {
-    dragFilesOntoElement(dropzone, ['../../fast/forms/file/resources/testFiles']);
+    dragFilesOntoElement(dropzone, ['../../../fast/forms/file/entries-api/resources/testFiles']);
 }
 </script>
 </body>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../../resources/js-test.js"></script>
-<script src="../../../resources/ui-helper.js"></script>
+<script src="../../../../resources/js-test.js"></script>
+<script src="../../../../resources/ui-helper.js"></script>
 </head>
 <body>
 <input type="file" onchange="changed(event)" webkitdirectory></input>
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../../resources/js-test.js"></script>
-<script src="../../../resources/ui-helper.js"></script>
+<script src="../../../../resources/js-test.js"></script>
+<script src="../../../../resources/ui-helper.js"></script>
 </head>
 <body>
 <input type="file" onchange="changed(event)" webkitdirectory></input>
diff --git a/LayoutTests/fast/forms/file/input-file-directory-upload-expected.txt b/LayoutTests/fast/forms/file/input-file-directory-upload-expected.txt
deleted file mode 100644 (file)
index eeb91fa..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-PASS: name is file1; path is dirupload/path1/file1
-PASS: name is file2; path is dirupload/path1/file2
-PASS: name is file1; path is dirupload/path1/subpath1/file1
-PASS: name is file1; path is dirupload/path2/file1
-PASS: name is file1; path is dirupload/path2/subpath1/subpath2/file1
-PASS: name is file2; path is dirupload/path2/file2
-PASS: name is file1; path is dirupload/path3/file1
-PASS: name is file1; path is dirupload/file1
-
-PASS: name is file1; path is path1/file1
-PASS: name is file2; path is path1/file2
-
-PASS: name is file1; path is dirupload/path1/file1
-PASS: name is file1; path is dirupload/path2/file1
-
-PASS: name is file1; path is path1/file1
-PASS: name is file1; path is path1/subpath1/file1
-
diff --git a/LayoutTests/fast/forms/file/input-file-directory-upload.html b/LayoutTests/fast/forms/file/input-file-directory-upload.html
deleted file mode 100644 (file)
index 7f7af0d..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<input type="file" name="files" id="files" webkitdirectory>
-<pre id='output'></pre>
-
-<script>
-var testFileList1 = [
-    {'path': 'resources/dirupload/path1/file1',                   'expect-relpath': 'dirupload/path1/file1'},
-    {'path': 'resources/dirupload/path1/file2',                   'expect-relpath': 'dirupload/path1/file2' },
-    {'path': 'resources/dirupload/path1/subpath1/file1',          'expect-relpath': 'dirupload/path1/subpath1/file1'},
-    {'path': 'resources/dirupload/path2/file1',                   'expect-relpath': 'dirupload/path2/file1'},
-    {'path': 'resources/dirupload/path2/subpath1/subpath2/file1', 'expect-relpath': 'dirupload/path2/subpath1/subpath2/file1'},
-    {'path': 'resources/dirupload/path2/file2',                   'expect-relpath': 'dirupload/path2/file2'},
-    {'path': 'resources/dirupload/path3/file1',                   'expect-relpath': 'dirupload/path3/file1'},
-    {'path': 'resources/dirupload/file1',                         'expect-relpath': 'dirupload/file1'},
-];
-
-var testFileList2 = [
-    {'path': 'resources/dirupload/path1/file1',                   'expect-relpath': 'path1/file1'},
-    {'path': 'resources/dirupload/path1/file2',                   'expect-relpath': 'path1/file2' },
-];
-
-var testFileList3 = [
-    {'path': 'resources/dirupload/path1/file1',                   'expect-relpath': 'dirupload/path1/file1'},
-    {'path': 'resources/dirupload/path2/file1',                   'expect-relpath': 'dirupload/path2/file1' },
-];
-
-var testFileList4 = [
-    {'path': 'resources/dirupload/path1/file1',                   'expect-relpath': 'path1/file1'},
-    {'path': 'resources/dirupload/path1/subpath1/file1',          'expect-relpath': 'path1/subpath1/file1' },
-];
-
-var testFileList5 = [
-    {'path': '/foo/baz',                                          'expect-relpath': 'foo/baz'},
-    {'path': '/foo/bar/baz',                                      'expect-relpath': 'foo/bar/baz'},
-    {'path': '/foo2/baz',                                         'expect-relpath': 'foo2/baz'},
-];
-
-function log(message)
-{
-    document.getElementById('output').appendChild(document.createTextNode(message + "\n"));
-}
-
-function onInputFileChange(currentFileList, lastTest)
-{
-    var files = document.getElementById("files").files;
-    for (var i = 0; i < files.length; i++) {
-        if (files[i].webkitRelativePath != currentFileList[i]['expect-relpath'])
-            log("FAIL: name is " + files[i].name + "; path is " + files[i].webkitRelativePath + " but should be " + currentFileList[i]['expect-relpath']);
-        else
-            log("PASS: name is " + files[i].name + "; path is " + files[i].webkitRelativePath);
-    }
-
-   if (lastTest && testRunner)
-        testRunner.notifyDone();
-   else
-        log("");
-}
-
-function doTest(fileList, last)
-{
-    var pathsOnly = fileList.map(function(item) { return item['path'];});
-    var f = function() { onInputFileChange(fileList, last); };
-    document.getElementById("files").onchange = f;
-    eventSender.beginDragWithFiles(pathsOnly);
-    eventSender.mouseMoveTo(10, 10);
-    eventSender.mouseUp();
-}
-
-if (testRunner) {
-    testRunner.dumpAsText();
-    testRunner.waitUntilDone();
-}
-
-if (window.eventSender) {
-    doTest(testFileList1);
-    doTest(testFileList2);
-    doTest(testFileList3);
-    doTest(testFileList4);
-    doTest(testFileList5, true);
-}
-</script>
-</body>
-</html>
index 33bc12f..9f1a8d3 100644 (file)
@@ -3374,7 +3374,7 @@ webkit.org/b/175932 http/tests/media/hls/video-cookie.html [ Failure ]
 
 webkit.org/b/176021 fast/events/overflow-viewport-renderer-deleted.html [ Missing ]
 
-webkit.org/b/176024 fast/forms/file/webkitdirectory-open-panel.html [ Failure ]
+webkit.org/b/176024 fast/forms/file/entries-api/webkitdirectory-open-panel.html [ Failure ]
 
 webkit.org/b/176025 inspector/canvas/recording-webgl-snapshots.html [ Failure ]
 webkit.org/b/176025 inspector/canvas/recording-webgl.html [ Failure ]
index a65dedb..2ea44fc 100644 (file)
@@ -1942,7 +1942,6 @@ fast/files/workers/worker-read-blob-sync.html
 fast/files/workers/worker-read-file-async.html
 fast/files/workers/worker-read-file-sync.html
 fast/forms/file/get-file-upload.html
-fast/forms/file/input-file-directory-upload.html
 fast/forms/file/input-file-re-render.html
 fast/forms/file/recover-file-input-in-unposted-form.html
 fast/forms/file/selected-files-from-history-state.html
index e7a4118..bf920a5 100644 (file)
@@ -153,9 +153,6 @@ fast/mediastream/RTCPeerConnection-stats.html [ Skip ]
 # Asserts in debug.
 [ Debug ] fast/images/large-size-image-crash.html [ Skip ]
 
-# Directory upload is not enabled.
-fast/forms/file/input-file-directory-upload.html
-
 # Perf tests are very flaky, because they run in parallel with other tests.
 perf
 
index e7ac579..5208d23 100644 (file)
@@ -179,9 +179,6 @@ http/tests/local/blob/send-sliced-data-blob.html [ Skip ]
 # TODO BlodBuilder is not enabled
 http/tests/local/blob/send-data-blob.html [ Skip ]
 
-# Directory upload is not enabled.
-fast/forms/file/input-file-directory-upload.html [ Skip ]
-
 # TODO A test that failed because eventSender cannot send function-key events.
 fast/events/keydown-function-keys.html [ Skip ]
 
index 8346551..a554d99 100644 (file)
@@ -563,17 +563,8 @@ platform/mac/fast/events/objc-event-api.html
 
 # WebKitTestRunner needs an implementation of eventSender.beginDragWithFiles
 # https://bugs.webkit.org/show_bug.cgi?id=64285
-editing/pasteboard/datatransfer-items-drop-directoryReader.html
-editing/pasteboard/datatransfer-items-drop-directoryReader-error.html
-editing/pasteboard/datatransfer-items-drop-directoryReader-root.html
-editing/pasteboard/datatransfer-items-drop-fileEntry-file.html
-editing/pasteboard/datatransfer-items-drop-getAsEntry.html
-editing/pasteboard/datatransfer-items-drop-getDirectory.html
-editing/pasteboard/datatransfer-items-drop-getFile.html
-editing/pasteboard/datatransfer-items-drop-getParent-root.html
-editing/pasteboard/datatransfer-items-drop-getParent.html
-editing/pasteboard/datatransfer-items-drop-getParent2.html
 editing/pasteboard/datatransfer-items-drop-plaintext-file.html
+editing/pasteboard/enties-api
 editing/pasteboard/file-drag-to-editable.html [ Skip ]
 editing/pasteboard/file-input-files-access.html
 fast/dom/FileList-iterator.html
@@ -605,15 +596,14 @@ fast/files/workers/worker-read-blob-async.html
 fast/files/workers/worker-read-blob-sync.html
 fast/files/workers/worker-read-file-async.html
 fast/files/workers/worker-read-file-sync.html
+fast/forms/file/entries-api/webkitdirectory-drag-folder.html
 fast/forms/file/file-input-change-event.html
 fast/forms/file/file-input-reset.html
 fast/forms/file/get-file-upload.html
-fast/forms/file/input-file-directory-upload.html
 fast/forms/file/input-file-re-render.html
 fast/forms/file/input-file-write-files.html
 fast/forms/file/recover-file-input-in-unposted-form.html
 fast/forms/file/selected-files-from-history-state.html
-fast/forms/file/webkitdirectory-drag-folder.html
 fast/history/page-cache-createObjectURL.html
 fast/workers/worker-copy-shared-blob-url.html
 http/tests/local/blob/send-hybrid-blob.html