Changeset 75232 in webkit

Timestamp:

Jan 6, 2011 11:07:32 PM (13 years ago)

Author:

kinuko@chromium.org

Message:

2011-01-06 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by David Levin.

Add layout tests for Entry.getMetadata (FileSystem API)
​https://bugs.webkit.org/show_bug.cgi?id=47311

• fast/filesystem/op-get-metadata-expected.txt: Added.
• fast/filesystem/op-get-metadata.html: Added.
• fast/filesystem/resources/op-get-metadata.js: Added.
• fast/filesystem/resources/op-tests-helper.js: Updated getMetadata implementation.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/filesystem/op-get-metadata-expected.txt (added)
• fast/filesystem/op-get-metadata.html (added)
• fast/filesystem/resources/op-get-metadata.js (added)
• fast/filesystem/resources/op-tests-helper.js (modified) (9 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-06  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Reviewed by David Levin.
+
+        Add layout tests for Entry.getMetadata (FileSystem API)
+        https://bugs.webkit.org/show_bug.cgi?id=47311
+
+        * fast/filesystem/op-get-metadata-expected.txt: Added.
+        * fast/filesystem/op-get-metadata.html: Added.
+        * fast/filesystem/resources/op-get-metadata.js: Added.
+        * fast/filesystem/resources/op-tests-helper.js: Updated getMetadata
+        implementation.
+
 2011-01-06  Mihai Parparita  <mihaip@chromium.org>
 

trunk/LayoutTests/fast/filesystem/resources/op-tests-helper.js

@@ -142 +142 @@
         this.readEntries = [];
 
+        this.getSymbolString = function(symbol)
+        {
+            return 'this.environment["' + symbol + '"]';
+        };
+
         this.testSuccessCallback = function()
         {
@@ -147 +152 @@
                 testPassed('Succeeded: ' + this.stage);
                 this.runNextTest();
-            } else {
-                testFailed('Unexpectedly succeeded while ' + this.stage);
-                this.errorCallback();
-            }
+            } else
+                testFailed('Unexpectedly succeeded while ' + this.stage);
         };
 
@@ -163 +166 @@
                 shouldBe.apply(this, ['this.environment[this.entry.fullPath].isDirectory + ""', '"' + entry.isDirectory + '"']);
                 this.runNextTest();
-            } else {
-                testFailed('Unexpectedly succeeded while ' + this.stage);
-                this.errorCallback(error);
-            }
+            } else
+                testFailed('Unexpectedly succeeded while ' + this.stage);
         };
 
@@ -175 +176 @@
                 this.environment[entry.fullPath] = entry;
                 this.runNextTest();
-            } else {
-                testFailed('Unexpectedly succeeded while ' + this.stage);
-                this.errorCallback();
-            }
+            } else
+                testFailed('Unexpectedly succeeded while ' + this.stage);
         };
 
@@ -187 +186 @@
                 debug('Parent entry: ' + toString(entry));
                 this.runNextTest();
-            } else {
-                testFailed('Unexpectedly succeeded while ' + this.stage);
-                this.errorCallback();
-            }
+            } else
+                testFailed('Unexpectedly succeeded while ' + this.stage);
         };
 
         this.testReadEntriesSuccessCallback = function(entries)
         {
-            if (this.expectedErrorCode) {
-                testFailed('Unexpectedly succeeded while ' + this.stage);
-                this.errorCallback(error);
-                return;
-            }
+            if (this.expectedErrorCode)
+                testFailed('Unexpectedly succeeded while ' + this.stage);
 
             for (var i = 0; i < entries.length; ++i)
@@ -214 +208 @@
         };
 
+        this.testMetadataSuccessCallback = function(metadata, entry)
+        {
+            if (!this.expectedErrorCode) {
+                testPassed('Succeeded: ' + this.stage);
+                var symbol = entry + '.modificationTime';
+                this.environment[symbol] = metadata.modificationTime;
+
+                var entryMetadataString = this.getSymbolString(symbol);
+                if (entry != '/')
+                    shouldBeGreaterThanOrEqual.apply(this, [entryMetadataString, 'this.roundedStartDate']);
+                shouldBeGreaterThanOrEqual.apply(this, ['new Date()', entryMetadataString]);
+                this.runNextTest();
+            } else
+                testFailed('Unexpectedly succeeded while ' + this.stage);
+        };
+
         this.testErrorCallback = function(error)
         {
@@ -254 +264 @@
             this.expectedErrorCode = expectedErrorCode;
             this.stage = '"' + entry + '".getMetadata()';
-            this.environment[entry].getMetadata(bindCallback(this, this.testSuccessCallback), bindCallback(this, this.testErrorCallback));
+            this.environment[entry].getMetadata(bindCallback(this, this.testMetadataSuccessCallback, entry), bindCallback(this, this.testErrorCallback));
         };
 
@@ -294 +304 @@
         };
 
+        this.shouldBe = function(symbol1, symbol2)
+        {
+            shouldBe.apply(this, [this.getSymbolString(symbol1), this.getSymbolString(symbol2)]);
+            this.runNextTest();
+        };
+
+        this.shouldBeGreaterThanOrEqual = function(symbol1, symbol2)
+        {
+            shouldBeGreaterThanOrEqual.apply(this, [this.getSymbolString(symbol1), this.getSymbolString(symbol2)]);
+            this.runNextTest();
+        };
+
         //---------------------------------------------------------------
         this.start = function()
@@ -299 +321 @@
             this.expectedErrorCode = '';
             this.stage = 'resetting filesystem';
+            // Record rounded start date (current time minus 999 msec) here for the comparison. Entry.getMetadata() may return the last mod time in seconds accuracy while new Date() is milliseconds accuracy.
+            this.roundedStartDate = new Date((new Date()).getTime() - 999);
             removeAllInDirectory(this.fileSystem.root, bindCallback(this, this.setUp), bindCallback(this, this.testErrorCallback));
         };