[webkit-changes] [204990] trunk/Tools

Thu, 25 Aug 2016 15:02:13 -0700

Title: [204990] trunk/Tools
Revision
204990
Author
[email protected]
Date
2016-08-25 15:02:08 -0700 (Thu, 25 Aug 2016)

Log Message

Fix URLParserTest with GuardMalloc
https://bugs.webkit.org/show_bug.cgi?id=161214
rdar://problem/28014390

Reviewed by Tim Horton.

The CString returned by String::utf8 was going out of scope before we were doing a string comparison on its data.
This just does the comparison of the CStrings instead to keep them in scope during the comparison.

* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::eq):
(TestWebKitAPI::checkURL):
(TestWebKitAPI::checkURLDifferences):
(TestWebKitAPI::s): Deleted.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (204989 => 204990)


--- trunk/Tools/ChangeLog	2016-08-25 22:01:07 UTC (rev 204989)
+++ trunk/Tools/ChangeLog	2016-08-25 22:02:08 UTC (rev 204990)
@@ -1,3 +1,20 @@
+2016-08-25  Alex Christensen  <[email protected]>
+
+        Fix URLParserTest with GuardMalloc
+        https://bugs.webkit.org/show_bug.cgi?id=161214
+        rdar://problem/28014390
+
+        Reviewed by Tim Horton.
+
+        The CString returned by String::utf8 was going out of scope before we were doing a string comparison on its data.
+        This just does the comparison of the CStrings instead to keep them in scope during the comparison.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::eq):
+        (TestWebKitAPI::checkURL):
+        (TestWebKitAPI::checkURLDifferences):
+        (TestWebKitAPI::s): Deleted.
+
 2016-08-25  Wenson Hsieh  <[email protected]>
 
         Dragging against the end of the inline media scrubber causes the media scrubber to hide

Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (204989 => 204990)


--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp	2016-08-25 22:01:07 UTC (rev 204989)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp	2016-08-25 22:02:08 UTC (rev 204990)
@@ -50,31 +50,31 @@
     String string;
 };
 
-static const char* s(const String& s) { return s.utf8().data(); }
+static bool eq(const String& s1, const String& s2) { return s1.utf8() == s2.utf8(); }
 static void checkURL(const String& urlString, const ExpectedParts& parts)
 {
     URLParser parser;
     auto url = ""
-    EXPECT_STREQ(s(parts.protocol), s(url->protocol()));
-    EXPECT_STREQ(s(parts.user), s(url->user()));
-    EXPECT_STREQ(s(parts.password), s(url->pass()));
-    EXPECT_STREQ(s(parts.host), s(url->host()));
+    EXPECT_TRUE(eq(parts.protocol, url->protocol()));
+    EXPECT_TRUE(eq(parts.user, url->user()));
+    EXPECT_TRUE(eq(parts.password, url->pass()));
+    EXPECT_TRUE(eq(parts.host, url->host()));
     EXPECT_EQ(parts.port, url->port());
-    EXPECT_STREQ(s(parts.path), s(url->path()));
-    EXPECT_STREQ(s(parts.query), s(url->query()));
-    EXPECT_STREQ(s(parts.fragment), s(url->fragmentIdentifier()));
-    EXPECT_STREQ(s(parts.string), s(url->string()));
+    EXPECT_TRUE(eq(parts.path, url->path()));
+    EXPECT_TRUE(eq(parts.query, url->query()));
+    EXPECT_TRUE(eq(parts.fragment, url->fragmentIdentifier()));
+    EXPECT_TRUE(eq(parts.string, url->string()));
     
     auto oldURL = URL(URL(), urlString);
-    EXPECT_STREQ(s(parts.protocol), s(oldURL.protocol()));
-    EXPECT_STREQ(s(parts.user), s(oldURL.user()));
-    EXPECT_STREQ(s(parts.password), s(oldURL.pass()));
-    EXPECT_STREQ(s(parts.host), s(oldURL.host()));
+    EXPECT_TRUE(eq(parts.protocol, oldURL.protocol()));
+    EXPECT_TRUE(eq(parts.user, oldURL.user()));
+    EXPECT_TRUE(eq(parts.password, oldURL.pass()));
+    EXPECT_TRUE(eq(parts.host, oldURL.host()));
     EXPECT_EQ(parts.port, oldURL.port());
-    EXPECT_STREQ(s(parts.path), s(oldURL.path()));
-    EXPECT_STREQ(s(parts.query), s(oldURL.query()));
-    EXPECT_STREQ(s(parts.fragment), s(oldURL.fragmentIdentifier()));
-    EXPECT_STREQ(s(parts.string), s(oldURL.string()));
+    EXPECT_TRUE(eq(parts.path, oldURL.path()));
+    EXPECT_TRUE(eq(parts.query, oldURL.query()));
+    EXPECT_TRUE(eq(parts.fragment, oldURL.fragmentIdentifier()));
+    EXPECT_TRUE(eq(parts.string, oldURL.string()));
     
     EXPECT_TRUE(URLParser::allValuesEqual(url.value(), oldURL));
 }
@@ -95,26 +95,26 @@
 {
     URLParser parser;
     auto url = ""
-    EXPECT_STREQ(s(partsNew.protocol), s(url->protocol()));
-    EXPECT_STREQ(s(partsNew.user), s(url->user()));
-    EXPECT_STREQ(s(partsNew.password), s(url->pass()));
-    EXPECT_STREQ(s(partsNew.host), s(url->host()));
+    EXPECT_TRUE(eq(partsNew.protocol, url->protocol()));
+    EXPECT_TRUE(eq(partsNew.user, url->user()));
+    EXPECT_TRUE(eq(partsNew.password, url->pass()));
+    EXPECT_TRUE(eq(partsNew.host, url->host()));
     EXPECT_EQ(partsNew.port, url->port());
-    EXPECT_STREQ(s(partsNew.path), s(url->path()));
-    EXPECT_STREQ(s(partsNew.query), s(url->query()));
-    EXPECT_STREQ(s(partsNew.fragment), s(url->fragmentIdentifier()));
-    EXPECT_STREQ(s(partsNew.string), s(url->string()));
+    EXPECT_TRUE(eq(partsNew.path, url->path()));
+    EXPECT_TRUE(eq(partsNew.query, url->query()));
+    EXPECT_TRUE(eq(partsNew.fragment, url->fragmentIdentifier()));
+    EXPECT_TRUE(eq(partsNew.string, url->string()));
     
     auto oldURL = URL(URL(), urlString);
-    EXPECT_STREQ(s(partsOld.protocol), s(oldURL.protocol()));
-    EXPECT_STREQ(s(partsOld.user), s(oldURL.user()));
-    EXPECT_STREQ(s(partsOld.password), s(oldURL.pass()));
-    EXPECT_STREQ(s(partsOld.host), s(oldURL.host()));
+    EXPECT_TRUE(eq(partsOld.protocol, oldURL.protocol()));
+    EXPECT_TRUE(eq(partsOld.user, oldURL.user()));
+    EXPECT_TRUE(eq(partsOld.password, oldURL.pass()));
+    EXPECT_TRUE(eq(partsOld.host, oldURL.host()));
     EXPECT_EQ(partsOld.port, oldURL.port());
-    EXPECT_STREQ(s(partsOld.path), s(oldURL.path()));
-    EXPECT_STREQ(s(partsOld.query), s(oldURL.query()));
-    EXPECT_STREQ(s(partsOld.fragment), s(oldURL.fragmentIdentifier()));
-    EXPECT_STREQ(s(partsOld.string), s(oldURL.string()));
+    EXPECT_TRUE(eq(partsOld.path, oldURL.path()));
+    EXPECT_TRUE(eq(partsOld.query, oldURL.query()));
+    EXPECT_TRUE(eq(partsOld.fragment, oldURL.fragmentIdentifier()));
+    EXPECT_TRUE(eq(partsOld.string, oldURL.string()));
     
     EXPECT_FALSE(URLParser::allValuesEqual(url.value(), oldURL));
 }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to