[webkit-changes] [242323] trunk/Tools

Sat, 02 Mar 2019 17:04:53 -0800

Title: [242323] trunk/Tools
Revision
242323
Author
[email protected]
Date
2019-03-02 17:03:26 -0800 (Sat, 02 Mar 2019)

Log Message

Unreviewed follow-up to r242292. Keep EXPECT_STREQ in tests per Darin's request.

* TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp:
(TestWebKitAPI::TEST):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (242322 => 242323)


--- trunk/Tools/ChangeLog	2019-03-03 00:18:55 UTC (rev 242322)
+++ trunk/Tools/ChangeLog	2019-03-03 01:03:26 UTC (rev 242323)
@@ -1,3 +1,10 @@
+2019-03-02  Ross Kirsling  <[email protected]>
+
+        Unreviewed follow-up to r242292. Keep EXPECT_STREQ in tests per Darin's request.
+
+        * TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp:
+        (TestWebKitAPI::TEST):
+
 2019-03-01  Darin Adler  <[email protected]>
 
         Finish removing String::format

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp (242322 => 242323)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp	2019-03-03 00:18:55 UTC (rev 242322)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp	2019-03-03 01:03:26 UTC (rev 242323)
@@ -41,43 +41,43 @@
 
 TEST(WebKit, StripEntriesEndingWith)
 {
-    EXPECT_EQ(strip(""), "");
-    EXPECT_EQ(strip(":"), ":");
-    EXPECT_EQ(strip("::"), "::");
-    EXPECT_EQ(strip(":::"), ":::");
-    EXPECT_EQ(strip("::::"), "::::");
-    EXPECT_EQ(strip(":::::"), ":::::");
+    EXPECT_STREQ(strip("").utf8().data(), "");
+    EXPECT_STREQ(strip(":").utf8().data(), ":");
+    EXPECT_STREQ(strip("::").utf8().data(), "::");
+    EXPECT_STREQ(strip(":::").utf8().data(), ":::");
+    EXPECT_STREQ(strip("::::").utf8().data(), "::::");
+    EXPECT_STREQ(strip(":::::").utf8().data(), ":::::");
 
-    EXPECT_EQ(strip(PROCESS_DYLIB), PROCESS_DYLIB);
-    EXPECT_EQ(strip(":" PROCESS_DYLIB), ":" PROCESS_DYLIB);
-    EXPECT_EQ(strip(PROCESS_DYLIB ":"), PROCESS_DYLIB ":");
-    EXPECT_EQ(strip(":" PROCESS_DYLIB ":"), ":" PROCESS_DYLIB ":");
+    EXPECT_STREQ(strip(PROCESS_DYLIB).utf8().data(), PROCESS_DYLIB);
+    EXPECT_STREQ(strip(":" PROCESS_DYLIB).utf8().data(), ":" PROCESS_DYLIB);
+    EXPECT_STREQ(strip(PROCESS_DYLIB ":").utf8().data(), PROCESS_DYLIB ":");
+    EXPECT_STREQ(strip(":" PROCESS_DYLIB ":").utf8().data(), ":" PROCESS_DYLIB ":");
 
-    EXPECT_EQ(strip("/" PROCESS_DYLIB), "");
-    EXPECT_EQ(strip(":/" PROCESS_DYLIB), "");
-    EXPECT_EQ(strip("/" PROCESS_DYLIB ":"), "");
-    EXPECT_EQ(strip(":/" PROCESS_DYLIB ":"), ":");
+    EXPECT_STREQ(strip("/" PROCESS_DYLIB).utf8().data(), "");
+    EXPECT_STREQ(strip(":/" PROCESS_DYLIB).utf8().data(), "");
+    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":").utf8().data(), "");
+    EXPECT_STREQ(strip(":/" PROCESS_DYLIB ":").utf8().data(), ":");
 
-    EXPECT_EQ(strip(PROCESS_DYLIB "/"), PROCESS_DYLIB "/");
-    EXPECT_EQ(strip(":" PROCESS_DYLIB "/"), ":" PROCESS_DYLIB "/");
-    EXPECT_EQ(strip(PROCESS_DYLIB "/:"), PROCESS_DYLIB "/:");
-    EXPECT_EQ(strip(":" PROCESS_DYLIB "/:"), ":" PROCESS_DYLIB "/:");
+    EXPECT_STREQ(strip(PROCESS_DYLIB "/").utf8().data(), PROCESS_DYLIB "/");
+    EXPECT_STREQ(strip(":" PROCESS_DYLIB "/").utf8().data(), ":" PROCESS_DYLIB "/");
+    EXPECT_STREQ(strip(PROCESS_DYLIB "/:").utf8().data(), PROCESS_DYLIB "/:");
+    EXPECT_STREQ(strip(":" PROCESS_DYLIB "/:").utf8().data(), ":" PROCESS_DYLIB "/:");
 
-    EXPECT_EQ(strip("/" PROCESS_DYLIB "/"), "/" PROCESS_DYLIB "/");
-    EXPECT_EQ(strip(":/" PROCESS_DYLIB "/"), ":/" PROCESS_DYLIB "/");
-    EXPECT_EQ(strip("/" PROCESS_DYLIB "/:"), "/" PROCESS_DYLIB "/:");
-    EXPECT_EQ(strip(":/" PROCESS_DYLIB "/:"), ":/" PROCESS_DYLIB "/:");
+    EXPECT_STREQ(strip("/" PROCESS_DYLIB "/").utf8().data(), "/" PROCESS_DYLIB "/");
+    EXPECT_STREQ(strip(":/" PROCESS_DYLIB "/").utf8().data(), ":/" PROCESS_DYLIB "/");
+    EXPECT_STREQ(strip("/" PROCESS_DYLIB "/:").utf8().data(), "/" PROCESS_DYLIB "/:");
+    EXPECT_STREQ(strip(":/" PROCESS_DYLIB "/:").utf8().data(), ":/" PROCESS_DYLIB "/:");
 
-    EXPECT_EQ(strip("/Before.dylib:/" PROCESS_DYLIB), "/Before.dylib");
-    EXPECT_EQ(strip("/" PROCESS_DYLIB ":/After.dylib"), "/After.dylib");
-    EXPECT_EQ(strip("/Before.dylib:/" PROCESS_DYLIB ":/After.dylib"), "/Before.dylib:/After.dylib");
-    EXPECT_EQ(strip("/Before.dylib:/" PROCESS_DYLIB ":/Middle.dylib:/" PROCESS_DYLIB ":/After.dylib"), "/Before.dylib:/Middle.dylib:/After.dylib");
+    EXPECT_STREQ(strip("/Before.dylib:/" PROCESS_DYLIB).utf8().data(), "/Before.dylib");
+    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/After.dylib").utf8().data(), "/After.dylib");
+    EXPECT_STREQ(strip("/Before.dylib:/" PROCESS_DYLIB ":/After.dylib").utf8().data(), "/Before.dylib:/After.dylib");
+    EXPECT_STREQ(strip("/Before.dylib:/" PROCESS_DYLIB ":/Middle.dylib:/" PROCESS_DYLIB ":/After.dylib").utf8().data(), "/Before.dylib:/Middle.dylib:/After.dylib");
 
-    EXPECT_EQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB), "");
-    EXPECT_EQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB ":/" PROCESS_DYLIB), "");
+    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB).utf8().data(), "");
+    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB ":/" PROCESS_DYLIB).utf8().data(), "");
 
-    EXPECT_EQ(strip("/usr/lib/" PROCESS_DYLIB), "");
-    EXPECT_EQ(strip("/" PROCESS_DYLIB "/" PROCESS_DYLIB), "");
+    EXPECT_STREQ(strip("/usr/lib/" PROCESS_DYLIB).utf8().data(), "");
+    EXPECT_STREQ(strip("/" PROCESS_DYLIB "/" PROCESS_DYLIB).utf8().data(), "");
 }
 
 }

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

Reply via email to