Changeset 235140 in webkit

Timestamp:

Aug 21, 2018, 2:17:25 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Translate WebKit.LimitTitleSize API test into ObjC
​https://bugs.webkit.org/show_bug.cgi?id=188810

Reviewed by Andy Estes.

It uses WKPageLoaderClient.didReceiveTitleForFrame which has been replaced by KVO.
I'm translating the test into ObjC rather than introducing a new callback to WKPageNavigationClient.

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp: Removed.
• TestWebKitAPI/Tests/mac/LimitTitleSize.mm:

(TEST):
(-[LimitTitleSizeTestObserver observeValueForKeyPath:ofObject:change:context:]):
(TestWebKitAPI::TEST): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp (deleted)
• TestWebKitAPI/Tests/mac/LimitTitleSize.mm (modified) (2 diffs)

trunk/Tools/ChangeLog ¶

@@ +1 @@
+2018-08-21  Alex Christensen  <achristensen@webkit.org>
+
+        Translate WebKit.LimitTitleSize API test into ObjC
+        https://bugs.webkit.org/show_bug.cgi?id=188810
+
+        Reviewed by Andy Estes.
+
+        It uses WKPageLoaderClient.didReceiveTitleForFrame which has been replaced by KVO.
+        I'm translating the test into ObjC rather than introducing a new callback to WKPageNavigationClient.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp: Removed.
+        * TestWebKitAPI/Tests/mac/LimitTitleSize.mm:
+        (TEST):
+        (-[LimitTitleSizeTestObserver observeValueForKeyPath:ofObject:change:context:]):
+        (TestWebKitAPI::TEST): Deleted.
+
 2018-08-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj ¶

@@ -314 +314 @@
                 7A1458FC1AD5C07000E06772 /* mouse-button-listener.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7A1458FB1AD5C03500E06772 /* mouse-button-listener.html */; };
                 7A32D74A1F02151500162C44 /* FileMonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A32D7491F02151500162C44 /* FileMonitor.cpp */; };
-                7A66BDB61EAF14EF00CCC924 /* LimitTitleSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A66BDB51EAF14D000CCC924 /* LimitTitleSize.cpp */; };
                 7A66BDB81EAF18D500CCC924 /* set-long-title.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7A66BDB71EAF150100CCC924 /* set-long-title.html */; };
                 7A6A2C701DCCFA8C00C0D085 /* LocalStorageQuirkTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7A6A2C6F1DCCF87B00C0D085 /* LocalStorageQuirkTest.mm */; };
@@ -1608 +1607 @@
                 7A38D7E51C752D5F004F157D /* HashCountedSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HashCountedSet.cpp; sourceTree = "<group>"; };
                 7A5623101AD5AF3E0096B920 /* MenuTypesForMouseEvents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MenuTypesForMouseEvents.cpp; sourceTree = "<group>"; };
-                7A66BDB51EAF14D000CCC924 /* LimitTitleSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LimitTitleSize.cpp; sourceTree = "<group>"; };
                 7A66BDB71EAF150100CCC924 /* set-long-title.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "set-long-title.html"; sourceTree = "<group>"; };
                 7A6A2C6F1DCCF87B00C0D085 /* LocalStorageQuirkTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalStorageQuirkTest.mm; sourceTree = "<group>"; };
@@ -2893 +2891 @@
                                 4135FB832011FAA300332139 /* InjectInternals_Bundle.cpp */,
                                 93D3D19D17B1A84200C7C415 /* LayoutMilestonesWithAllContentInFrame.cpp */,
-                                7A66BDB51EAF14D000CCC924 /* LimitTitleSize.cpp */,
                                 52CB47401448FB9300873995 /* LoadAlternateHTMLStringWithNonDirectoryURL.cpp */,
                                 33DC8910141953A300747EF7 /* LoadCanceledNoServerRedirectCallback.cpp */,
@@ -3830 +3827 @@
                                 7CCE7EDF1A411A9200447C4C /* LayoutUnit.cpp in Sources */,
                                 F4BFA68E1E4AD08000154298 /* LegacyDragAndDropTests.mm in Sources */,
-                                7A66BDB61EAF14EF00CCC924 /* LimitTitleSize.cpp in Sources */,
                                 7A7B0E7F1EAFE4C3006AB8AE /* LimitTitleSize.mm in Sources */,
                                 C25CCA061E51380B0026CB8A /* LineBreaking.mm in Sources */,

trunk/Tools/TestWebKitAPI/Tests/mac/LimitTitleSize.mm ¶

@@ -57 +57 @@
 @end
 
-namespace TestWebKitAPI {
-
 TEST(WebKitLegacy, LimitTitleSize)
 {
@@ -68 +66 @@
         URLForResource:@"set-long-title" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
 
-    Util::run(&didFinishLoad);
+    TestWebKitAPI::Util::run(&didFinishLoad);
 }
 
-} // namespace TestWebKitAPI
+#if WK_API_ENABLED
+
+@interface LimitTitleSizeTestObserver : NSObject
+@end
+
+@implementation LimitTitleSizeTestObserver
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void*)context
+{
+    if ([[object title] isEqualToString:@"Original Short Title"])
+        return;
+    EXPECT_LE([object title].length, maxTitleLength);
+    waitUntilLongTitleReceived = true;
+}
+
+@end
+
+TEST(WebKit, LimitTitleSize)
+{
+    auto webView = adoptNS([[WKWebView alloc] init]);
+    [webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"set-long-title" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
+    
+    auto observer = adoptNS([LimitTitleSizeTestObserver new]);
+    [webView addObserver:observer.get() forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:nil];
+    
+    TestWebKitAPI::Util::run(&waitUntilLongTitleReceived);
+}
+
+#endif // WK_API_ENABLED