Unreviewed follow-up to r242292. Keep EXPECT_STREQ in tests per Darin's request.
authorross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Mar 2019 01:03:26 +0000 (01:03 +0000)
committerross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Mar 2019 01:03:26 +0000 (01:03 +0000)
* TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp:
(TestWebKitAPI::TEST):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242323 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp

index 4202322..3d1855f 100644 (file)
@@ -1,3 +1,10 @@
+2019-03-02  Ross Kirsling  <ross.kirsling@sony.com>
+
+        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  <darin@apple.com>
 
         Finish removing String::format
index 41d035d..9c95387 100644 (file)
@@ -41,43 +41,43 @@ static String strip(StringView input)
 
 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(), "");
 }
 
 }