Changeset 156299 in webkit

Timestamp:

Sep 23, 2013 3:07:49 PM (11 years ago)

Author:

ap@apple.com

Message:

Delete TestWebKitAPI domain or some keys before running TestWebKitAPI
​https://bugs.webkit.org/show_bug.cgi?id=121715 & <rdar://problem/14269434>

Patch by Benjamin Poulain <​benjamin@webkit.org> on 2013-09-23
Reviewed by Alexey Proskuryakov.

Previously, initalizing a WebPreference would change the cache model
to WebCacheModelDocumentBrowser. That behavior was due to a stale
preference file on disk.

This patch fixes the tests by resetting the default, and using the proper
default values after initializing WebPreference.

• TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm:

(TestWebKitAPI::TEST): Use the proper initial value, unrelated
to the previous runs.

• TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm:

(TestWebKitAPI::TEST): This test needs b/f cache to be enabled, so change
cache model to the one required.

• TestWebKitAPI/ios/mainIOS.mm:

(main): Reset the preferences before testing.

• TestWebKitAPI/mac/mainMac.mm:

(main): Ditto.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm (modified) (3 diffs)
• TestWebKitAPI/Tests/mac/WebViewDidCreateJavaScriptContext.mm (modified) (1 diff)
• TestWebKitAPI/ios/mainIOS.mm (modified) (1 diff)
• TestWebKitAPI/mac/mainMac.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-23  Benjamin Poulain  <benjamin@webkit.org>
+
+        Delete TestWebKitAPI domain or some keys before running TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=121715 & <rdar://problem/14269434>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Previously, initalizing a WebPreference would change the cache model
+        to WebCacheModelDocumentBrowser. That behavior was due to a stale
+        preference file on disk.
+
+        This patch fixes the tests by resetting the default, and using the proper
+        default values after initializing WebPreference.
+
+        * TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm:
+        (TestWebKitAPI::TEST): Use the proper initial value, unrelated
+        to the previous runs.
+
+        * TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm:
+        (TestWebKitAPI::TEST): This test needs b/f cache to be enabled, so change
+        cache model to the one required.
+
+        * TestWebKitAPI/ios/mainIOS.mm:
+        (main): Reset the preferences before testing.
+        * TestWebKitAPI/mac/mainMac.mm:
+        (main): Ditto.
+
+2013-09-23  Benjamin Poulain  <benjamin@webkit.org>
+
+        Delete TestWebKitAPI domain or some keys before running TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=121715 & <rdar://problem/14269434>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Previously, initalizing a WebPreference would change the cache model
+        to WebCacheModelDocumentBrowser. That behavior was due to a stale
+        preference file on disk.
+
+        This patch fixes the tests by resetting the default, and using the proper
+        default values after initializing WebPreference.
+
+        * TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm:
+        (TestWebKitAPI::TEST): Use the proper initial value, unrelated
+        to the previous runs.
+
+        * TestWebKitAPI/ios/mainIOS.mm:
+        (main): Reset the preferences before testing.
+        * TestWebKitAPI/mac/mainMac.mm:
+        (main): Ditto.
+
 2013-09-23  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm

@@ -42 +42 @@
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
 
-    EXPECT_EQ((int)WebCacheModelDocumentBrowser, (int)[WebView _cacheModel]);
+    EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
 }
 
@@ -50 +50 @@
 
     WebPreferences *standardPreferences = [WebPreferences standardPreferences];
-    EXPECT_EQ((int)WebCacheModelDocumentBrowser, (int)[WebView _cacheModel]);
+    EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
 
     [standardPreferences setCacheModel:WebCacheModelPrimaryWebBrowser];
@@ -68 +68 @@
 
     // 1) The customPreferences is not set on a view.
-    EXPECT_EQ((int)WebCacheModelDocumentBrowser, (int)[WebView _cacheModel]);
+    EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
 
     [standardPreferences setCacheModel:WebCacheModelPrimaryWebBrowser];

trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidCreateJavaScriptContext.mm

@@ -249 +249 @@
         RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
         RetainPtr<DidCreateJavaScriptContextFrameLoadDelegate> frameLoadDelegate = adoptNS([[DidCreateJavaScriptContextFrameLoadDelegate alloc] init]);
+        [[webView.get() preferences] setCacheModel:WebCacheModelDocumentBrowser];
 
         webView.get().frameLoadDelegate = frameLoadDelegate.get();

trunk/Tools/TestWebKitAPI/ios/mainIOS.mm

@@ -31 +31 @@
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
+    [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:@"TestWebKitAPI"];
     bool passed = TestWebKitAPI::TestsController::shared().run(argc, argv);
 

trunk/Tools/TestWebKitAPI/mac/mainMac.mm

@@ -31 +31 @@
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
+    [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:@"TestWebKitAPI"];
     [NSApplication sharedApplication];