[webkit-changes] [242338] trunk/Tools

Sun, 03 Mar 2019 21:11:02 -0800

Title: [242338] trunk/Tools
Revision
242338
Author
ross.kirsl...@sony.com
Date
2019-03-03 21:09:31 -0800 (Sun, 03 Mar 2019)

Log Message

Unreviewed follow-up to r242292.

By Darin's suggestion, adopt an approach that uses EXPECT_STREQ without scattering utf8().data() everywhere.

* TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp:
(TestWebKitAPI::testStrip): Renamed from strip.
(TestWebKitAPI::TEST):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (242337 => 242338)


--- trunk/Tools/ChangeLog	2019-03-04 04:47:56 UTC (rev 242337)
+++ trunk/Tools/ChangeLog	2019-03-04 05:09:31 UTC (rev 242338)
@@ -1,3 +1,13 @@
+2019-03-03  Ross Kirsling  <ross.kirsl...@sony.com>
+
+        Unreviewed follow-up to r242292.
+
+        By Darin's suggestion, adopt an approach that uses EXPECT_STREQ without scattering utf8().data() everywhere.
+
+        * TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp:
+        (TestWebKitAPI::testStrip): Renamed from strip.
+        (TestWebKitAPI::TEST):
+
 2019-03-03  Michael Catanzaro  <mcatanz...@igalia.com>
 
         Unreviewed, remove accidentally-committed URLHelpers.cpp test

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp (242337 => 242338)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp	2019-03-04 04:47:56 UTC (rev 242337)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp	2019-03-04 05:09:31 UTC (rev 242338)
@@ -34,50 +34,51 @@
 #define PROCESS_DYLIB "Process.dylib"
 const char* const stripValue = "/" PROCESS_DYLIB;
 
-static String strip(StringView input)
+static void testStrip(const char* input, const char* expected)
 {
-    return WebKit::EnvironmentUtilities::stripEntriesEndingWith(input, stripValue);
+    auto actual = WebKit::EnvironmentUtilities::stripEntriesEndingWith(input, stripValue);
+    EXPECT_STREQ(actual.utf8().data(), expected);
 }
 
 TEST(WebKit, StripEntriesEndingWith)
 {
-    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(), ":::::");
+    testStrip("", "");
+    testStrip(":", ":");
+    testStrip("::", "::");
+    testStrip(":::", ":::");
+    testStrip("::::", "::::");
+    testStrip(":::::", ":::::");
 
-    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 ":");
+    testStrip(PROCESS_DYLIB, PROCESS_DYLIB);
+    testStrip(":" PROCESS_DYLIB, ":" PROCESS_DYLIB);
+    testStrip(PROCESS_DYLIB ":", PROCESS_DYLIB ":");
+    testStrip(":" PROCESS_DYLIB ":", ":" 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(), ":");
+    testStrip("/" PROCESS_DYLIB, "");
+    testStrip(":/" PROCESS_DYLIB, "");
+    testStrip("/" PROCESS_DYLIB ":", "");
+    testStrip(":/" 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 "/:");
+    testStrip(PROCESS_DYLIB "/", PROCESS_DYLIB "/");
+    testStrip(":" PROCESS_DYLIB "/", ":" PROCESS_DYLIB "/");
+    testStrip(PROCESS_DYLIB "/:", PROCESS_DYLIB "/:");
+    testStrip(":" 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 "/:");
+    testStrip("/" PROCESS_DYLIB "/", "/" PROCESS_DYLIB "/");
+    testStrip(":/" PROCESS_DYLIB "/", ":/" PROCESS_DYLIB "/");
+    testStrip("/" PROCESS_DYLIB "/:", "/" PROCESS_DYLIB "/:");
+    testStrip(":/" PROCESS_DYLIB "/:", ":/" PROCESS_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");
+    testStrip("/Before.dylib:/" PROCESS_DYLIB, "/Before.dylib");
+    testStrip("/" PROCESS_DYLIB ":/After.dylib", "/After.dylib");
+    testStrip("/Before.dylib:/" PROCESS_DYLIB ":/After.dylib", "/Before.dylib:/After.dylib");
+    testStrip("/Before.dylib:/" PROCESS_DYLIB ":/Middle.dylib:/" PROCESS_DYLIB ":/After.dylib", "/Before.dylib:/Middle.dylib:/After.dylib");
 
-    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB).utf8().data(), "");
-    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB ":/" PROCESS_DYLIB).utf8().data(), "");
+    testStrip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB, "");
+    testStrip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB ":/" PROCESS_DYLIB, "");
 
-    EXPECT_STREQ(strip("/usr/lib/" PROCESS_DYLIB).utf8().data(), "");
-    EXPECT_STREQ(strip("/" PROCESS_DYLIB "/" PROCESS_DYLIB).utf8().data(), "");
+    testStrip("/usr/lib/" PROCESS_DYLIB, "");
+    testStrip("/" PROCESS_DYLIB "/" PROCESS_DYLIB, "");
 }
 
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to