Changeset 203436 in webkit

Timestamp:

Jul 19, 2016, 5:29:21 PM (10 years ago)

Author:

achristensen@apple.com

Message:

Fix API test after r203426.
​https://bugs.webkit.org/show_bug.cgi?id=159949

• TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm:

(TEST):
If there is website data already on disk, the initial count after putting the AppCache data in place will not be exactly 1.
This is no problem. We want to verify that it is a nonzero number and that it decrements by one when we remove the 1 AppCache data.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-07-19  Alex Christensen  <achristensen@webkit.org>
+
+        Fix API test after r203426.
+        https://bugs.webkit.org/show_bug.cgi?id=159949
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm:
+        (TEST):
+        If there is website data already on disk, the initial count after putting the AppCache data in place will not be exactly 1.
+        This is no problem.  We want to verify that it is a nonzero number and that it decrements by one when we remove the 1 AppCache data.
+
 2016-07-19  Andy Estes  <aestes@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm

@@ -148 +148 @@
     EXPECT_GT(fileSize(walTargetURL), 0);
 
+    static size_t originalWebsiteDataRecordCount;
+
     // Make sure there is a record in the WKWebsiteDataStore.
     readyToContinue = false;
     [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray<WKWebsiteDataRecord *> *websiteDataRecords)
     {
-        EXPECT_EQ(websiteDataRecords.count, 1ul);
+        EXPECT_GT(websiteDataRecords.count, 0ul);
+        originalWebsiteDataRecordCount = websiteDataRecords.count;
         readyToContinue = true;
     }];
@@ -167 +170 @@
         [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray<WKWebsiteDataRecord *> *websiteDataRecords)
         {
-            EXPECT_EQ(websiteDataRecords.count, 0ul);
+            EXPECT_EQ(websiteDataRecords.count, originalWebsiteDataRecordCount - 1);
             readyToContinue = true;
         }];