Title: [125875] trunk/LayoutTests
Revision
125875
Author
commit-qu...@webkit.org
Date
2012-08-17 02:50:41 -0700 (Fri, 17 Aug 2012)

Log Message

Fixed fast/forms/file/selected-files-from-history-state.html on Windows
https://bugs.webkit.org/show_bug.cgi?id=94278

Patch by Marja Hölttä <ma...@chromium.org> on 2012-08-17
Reviewed by Jochen Eisinger.

* fast/forms/file/selected-files-from-history-state.html: Fixed the test.
* platform/chromium/TestExpectations: Removed the expectation to fail.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (125874 => 125875)


--- trunk/LayoutTests/ChangeLog	2012-08-17 09:44:39 UTC (rev 125874)
+++ trunk/LayoutTests/ChangeLog	2012-08-17 09:50:41 UTC (rev 125875)
@@ -1,3 +1,13 @@
+2012-08-17  Marja Hölttä  <ma...@chromium.org>
+
+        Fixed fast/forms/file/selected-files-from-history-state.html on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=94278
+
+        Reviewed by Jochen Eisinger.
+
+        * fast/forms/file/selected-files-from-history-state.html: Fixed the test.
+        * platform/chromium/TestExpectations: Removed the expectation to fail.
+
 2012-08-16  Pavel Feldman  <pfeld...@chromium.org>
 
         Web Inspector: build Elements, Resources, Timeline, Audits and Console panels lazily.

Modified: trunk/LayoutTests/fast/forms/file/selected-files-from-history-state.html (125874 => 125875)


--- trunk/LayoutTests/fast/forms/file/selected-files-from-history-state.html	2012-08-17 09:44:39 UTC (rev 125874)
+++ trunk/LayoutTests/fast/forms/file/selected-files-from-history-state.html	2012-08-17 09:50:41 UTC (rev 125875)
@@ -24,13 +24,13 @@
         ++onChangeFired;
     };
 
-    eventSender.beginDragWithFiles(['/home/user/testfile.txt']);
+    eventSender.beginDragWithFiles(['testpath1/testfile1.txt']);
     var centerX = input1.offsetLeft + input1.offsetWidth / 2;
     var centerY = input1.offsetTop + input1.offsetHeight / 2;
     eventSender.mouseMoveTo(centerX, centerY);
     eventSender.mouseUp();
 
-    eventSender.beginDragWithFiles(['/home/user/testfile2.txt']);
+    eventSender.beginDragWithFiles(['testpath2/testfile2.txt']);
     centerX = input2.offsetLeft + input2.offsetWidth / 2;
     centerY = input2.offsetTop + input2.offsetHeight / 2;
     eventSender.mouseMoveTo(centerX, centerY);
@@ -41,9 +41,12 @@
     }
 
     var files = internals.getReferencedFilePaths();
+    files.sort();
     if (files.length == 2 &&
-        ((files[0] == '/home/user/testfile.txt' && files[1] == '/home/user/testfile2.txt') ||
-         (files[1] == '/home/user/testfile.txt' && files[0] == '/home/user/testfile2.txt'))) {
+        files[0].indexOf('testfile1.txt') != -1 &&
+        files[0].indexOf('testpath1') != -1 &&
+        files[1].indexOf('testfile2.txt') != -1 &&
+        files[1].indexOf('testpath2') != -1) {
         testPassed('');
     } else {
         testFailed('Unexpected files: ' + files);

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (125874 => 125875)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-08-17 09:44:39 UTC (rev 125874)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-08-17 09:50:41 UTC (rev 125875)
@@ -3523,5 +3523,3 @@
 BUGWK94256 DEBUG : fast/block/inline-children-root-linebox-crash.html = PASS CRASH
 
 BUGWK94261 DEBUG : http/tests/inspector/indexeddb/resources-panel.html = PASS CRASH
-
-BUGWK94278 WIN : fast/forms/file/selected-files-from-history-state.html = TEXT
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to