<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167491] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167491">167491</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 10:08:07 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] AttributedStringTest API tests fail with async text input
https://bugs.webkit.org/show_bug.cgi?id=131833
Reviewed by Enrica Casucci.
Don't run sync NSTextInputClient tests where we don't implement these calls.
* TestWebKitAPI/Tests/mac/AttributedString.mm:
(TestWebKitAPI::AttributedStringTest_CustomFont::didLoadURL):
(TestWebKitAPI::AttributedStringTest_CustomFont::runSyncTest):
(TestWebKitAPI::AttributedStringTest_Strikethrough::didLoadURL):
(TestWebKitAPI::AttributedStringTest_Strikethrough::runSyncTest):
(TestWebKitAPI::AttributedStringTest_CustomFont::runTest): Deleted.
(TestWebKitAPI::AttributedStringTest_Strikethrough::runTest): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacAttributedStringmm">trunk/Tools/TestWebKitAPI/Tests/mac/AttributedString.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167490 => 167491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-18 13:48:16 UTC (rev 167490)
+++ trunk/Tools/ChangeLog 2014-04-18 17:08:07 UTC (rev 167491)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-17 Alexey Proskuryakov <ap@apple.com>
+
+ [Mac] AttributedStringTest API tests fail with async text input
+ https://bugs.webkit.org/show_bug.cgi?id=131833
+
+ Reviewed by Enrica Casucci.
+
+ Don't run sync NSTextInputClient tests where we don't implement these calls.
+
+ * TestWebKitAPI/Tests/mac/AttributedString.mm:
+ (TestWebKitAPI::AttributedStringTest_CustomFont::didLoadURL):
+ (TestWebKitAPI::AttributedStringTest_CustomFont::runSyncTest):
+ (TestWebKitAPI::AttributedStringTest_Strikethrough::didLoadURL):
+ (TestWebKitAPI::AttributedStringTest_Strikethrough::runSyncTest):
+ (TestWebKitAPI::AttributedStringTest_CustomFont::runTest): Deleted.
+ (TestWebKitAPI::AttributedStringTest_Strikethrough::runTest): Deleted.
+
</ins><span class="cx"> 2014-04-18 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> Remove NETWORK_INFO support
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacAttributedStringmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/AttributedString.mm (167490 => 167491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/AttributedString.mm 2014-04-18 13:48:16 UTC (rev 167490)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/AttributedString.mm 2014-04-18 17:08:07 UTC (rev 167491)
</span><span class="lines">@@ -38,26 +38,32 @@
</span><span class="cx"> return [(NSView <NSTextInput> *)[[[webView mainFrame] frameView] documentView] attributedSubstringFromRange:range];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</ins><span class="cx"> static NSAttributedString *attributedString(WKView *wkView, NSRange range)
</span><span class="cx"> {
</span><span class="cx"> NSRange actualRange;
</span><span class="cx"> return [wkView attributedSubstringForProposedRange:range actualRange:&actualRange];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><del>-
</del><span class="cx"> class AttributedStringTest_CustomFont : public WebKitAgnosticTest {
</span><span class="cx"> public:
</span><del>- template <typename View> void runTest(View);
</del><ins>+ template <typename View> void runSyncTest(View);
</ins><span class="cx">
</span><span class="cx"> // WebKitAgnosticTest
</span><del>- virtual void didLoadURL(WebView *webView) { runTest(webView); }
- virtual void didLoadURL(WKView *wkView) { runTest(wkView); }
</del><ins>+ virtual void didLoadURL(WebView *webView) { runSyncTest(webView); }
+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
+ virtual void didLoadURL(WKView *wkView) { runSyncTest(wkView); }
+#else
+ // FIXME: Reimplement the test using async NSTextInputClient interface.
+ virtual void didLoadURL(WKView *wkView) { }
+#endif
</ins><span class="cx">
</span><span class="cx"> virtual NSURL *url() const { return [[NSBundle mainBundle] URLForResource:@"attributedStringCustomFont" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]; }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename View>
</span><del>-void AttributedStringTest_CustomFont::runTest(View view)
</del><ins>+void AttributedStringTest_CustomFont::runSyncTest(View view)
</ins><span class="cx"> {
</span><span class="cx"> NSAttributedString *attrString = attributedString(view, NSMakeRange(0, 5));
</span><span class="cx"> EXPECT_WK_STREQ("Lorem", [attrString string]);
</span><span class="lines">@@ -68,24 +74,31 @@
</span><span class="cx"> runWebKit1Test();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</ins><span class="cx"> TEST_F(AttributedStringTest_CustomFont, WebKit2)
</span><span class="cx"> {
</span><span class="cx"> runWebKit2Test();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> class AttributedStringTest_Strikethrough : public WebKitAgnosticTest {
</span><span class="cx"> public:
</span><del>- template <typename View> void runTest(View);
</del><ins>+ template <typename View> void runSyncTest(View);
</ins><span class="cx">
</span><span class="cx"> // WebKitAgnosticTest
</span><del>- virtual void didLoadURL(WebView *webView) { runTest(webView); }
- virtual void didLoadURL(WKView *wkView) { runTest(wkView); }
</del><ins>+ virtual void didLoadURL(WebView *webView) { runSyncTest(webView); }
+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
+ virtual void didLoadURL(WKView *wkView) { runSyncTest(wkView); }
+#else
+ // FIXME: Reimplement the test using async NSTextInputClient interface.
+ virtual void didLoadURL(WKView *wkView) { }
+#endif
</ins><span class="cx">
</span><span class="cx"> virtual NSURL *url() const { return [[NSBundle mainBundle] URLForResource:@"attributedStringStrikethrough" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]; }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename View>
</span><del>-void AttributedStringTest_Strikethrough::runTest(View view)
</del><ins>+void AttributedStringTest_Strikethrough::runSyncTest(View view)
</ins><span class="cx"> {
</span><span class="cx"> NSAttributedString *attrString = attributedString(view, NSMakeRange(0, 5));
</span><span class="cx">
</span><span class="lines">@@ -102,9 +115,11 @@
</span><span class="cx"> runWebKit1Test();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</ins><span class="cx"> TEST_F(AttributedStringTest_Strikethrough, WebKit2)
</span><span class="cx"> {
</span><span class="cx"> runWebKit2Test();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>