Changeset 242323 in webkit


Ignore:
Timestamp:
Mar 2, 2019 5:03:26 PM (5 years ago)
Author:
Ross Kirsling
Message:

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

  • TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp:

(TestWebKitAPI::TEST):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r242308 r242323  
     12019-03-02  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        Unreviewed follow-up to r242292. Keep EXPECT_STREQ in tests per Darin's request.
     4
     5        * TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp:
     6        (TestWebKitAPI::TEST):
     7
    182019-03-01  Darin Adler  <darin@apple.com>
    29
  • trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp

    r242292 r242323  
    4242TEST(WebKit, StripEntriesEndingWith)
    4343{
    44     EXPECT_EQ(strip(""), "");
    45     EXPECT_EQ(strip(":"), ":");
    46     EXPECT_EQ(strip("::"), "::");
    47     EXPECT_EQ(strip(":::"), ":::");
    48     EXPECT_EQ(strip("::::"), "::::");
    49     EXPECT_EQ(strip(":::::"), ":::::");
     44    EXPECT_STREQ(strip("").utf8().data(), "");
     45    EXPECT_STREQ(strip(":").utf8().data(), ":");
     46    EXPECT_STREQ(strip("::").utf8().data(), "::");
     47    EXPECT_STREQ(strip(":::").utf8().data(), ":::");
     48    EXPECT_STREQ(strip("::::").utf8().data(), "::::");
     49    EXPECT_STREQ(strip(":::::").utf8().data(), ":::::");
    5050
    51     EXPECT_EQ(strip(PROCESS_DYLIB), PROCESS_DYLIB);
    52     EXPECT_EQ(strip(":" PROCESS_DYLIB), ":" PROCESS_DYLIB);
    53     EXPECT_EQ(strip(PROCESS_DYLIB ":"), PROCESS_DYLIB ":");
    54     EXPECT_EQ(strip(":" PROCESS_DYLIB ":"), ":" PROCESS_DYLIB ":");
     51    EXPECT_STREQ(strip(PROCESS_DYLIB).utf8().data(), PROCESS_DYLIB);
     52    EXPECT_STREQ(strip(":" PROCESS_DYLIB).utf8().data(), ":" PROCESS_DYLIB);
     53    EXPECT_STREQ(strip(PROCESS_DYLIB ":").utf8().data(), PROCESS_DYLIB ":");
     54    EXPECT_STREQ(strip(":" PROCESS_DYLIB ":").utf8().data(), ":" PROCESS_DYLIB ":");
    5555
    56     EXPECT_EQ(strip("/" PROCESS_DYLIB), "");
    57     EXPECT_EQ(strip(":/" PROCESS_DYLIB), "");
    58     EXPECT_EQ(strip("/" PROCESS_DYLIB ":"), "");
    59     EXPECT_EQ(strip(":/" PROCESS_DYLIB ":"), ":");
     56    EXPECT_STREQ(strip("/" PROCESS_DYLIB).utf8().data(), "");
     57    EXPECT_STREQ(strip(":/" PROCESS_DYLIB).utf8().data(), "");
     58    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":").utf8().data(), "");
     59    EXPECT_STREQ(strip(":/" PROCESS_DYLIB ":").utf8().data(), ":");
    6060
    61     EXPECT_EQ(strip(PROCESS_DYLIB "/"), PROCESS_DYLIB "/");
    62     EXPECT_EQ(strip(":" PROCESS_DYLIB "/"), ":" PROCESS_DYLIB "/");
    63     EXPECT_EQ(strip(PROCESS_DYLIB "/:"), PROCESS_DYLIB "/:");
    64     EXPECT_EQ(strip(":" PROCESS_DYLIB "/:"), ":" PROCESS_DYLIB "/:");
     61    EXPECT_STREQ(strip(PROCESS_DYLIB "/").utf8().data(), PROCESS_DYLIB "/");
     62    EXPECT_STREQ(strip(":" PROCESS_DYLIB "/").utf8().data(), ":" PROCESS_DYLIB "/");
     63    EXPECT_STREQ(strip(PROCESS_DYLIB "/:").utf8().data(), PROCESS_DYLIB "/:");
     64    EXPECT_STREQ(strip(":" PROCESS_DYLIB "/:").utf8().data(), ":" PROCESS_DYLIB "/:");
    6565
    66     EXPECT_EQ(strip("/" PROCESS_DYLIB "/"), "/" PROCESS_DYLIB "/");
    67     EXPECT_EQ(strip(":/" PROCESS_DYLIB "/"), ":/" PROCESS_DYLIB "/");
    68     EXPECT_EQ(strip("/" PROCESS_DYLIB "/:"), "/" PROCESS_DYLIB "/:");
    69     EXPECT_EQ(strip(":/" PROCESS_DYLIB "/:"), ":/" PROCESS_DYLIB "/:");
     66    EXPECT_STREQ(strip("/" PROCESS_DYLIB "/").utf8().data(), "/" PROCESS_DYLIB "/");
     67    EXPECT_STREQ(strip(":/" PROCESS_DYLIB "/").utf8().data(), ":/" PROCESS_DYLIB "/");
     68    EXPECT_STREQ(strip("/" PROCESS_DYLIB "/:").utf8().data(), "/" PROCESS_DYLIB "/:");
     69    EXPECT_STREQ(strip(":/" PROCESS_DYLIB "/:").utf8().data(), ":/" PROCESS_DYLIB "/:");
    7070
    71     EXPECT_EQ(strip("/Before.dylib:/" PROCESS_DYLIB), "/Before.dylib");
    72     EXPECT_EQ(strip("/" PROCESS_DYLIB ":/After.dylib"), "/After.dylib");
    73     EXPECT_EQ(strip("/Before.dylib:/" PROCESS_DYLIB ":/After.dylib"), "/Before.dylib:/After.dylib");
    74     EXPECT_EQ(strip("/Before.dylib:/" PROCESS_DYLIB ":/Middle.dylib:/" PROCESS_DYLIB ":/After.dylib"), "/Before.dylib:/Middle.dylib:/After.dylib");
     71    EXPECT_STREQ(strip("/Before.dylib:/" PROCESS_DYLIB).utf8().data(), "/Before.dylib");
     72    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/After.dylib").utf8().data(), "/After.dylib");
     73    EXPECT_STREQ(strip("/Before.dylib:/" PROCESS_DYLIB ":/After.dylib").utf8().data(), "/Before.dylib:/After.dylib");
     74    EXPECT_STREQ(strip("/Before.dylib:/" PROCESS_DYLIB ":/Middle.dylib:/" PROCESS_DYLIB ":/After.dylib").utf8().data(), "/Before.dylib:/Middle.dylib:/After.dylib");
    7575
    76     EXPECT_EQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB), "");
    77     EXPECT_EQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB ":/" PROCESS_DYLIB), "");
     76    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB).utf8().data(), "");
     77    EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB ":/" PROCESS_DYLIB).utf8().data(), "");
    7878
    79     EXPECT_EQ(strip("/usr/lib/" PROCESS_DYLIB), "");
    80     EXPECT_EQ(strip("/" PROCESS_DYLIB "/" PROCESS_DYLIB), "");
     79    EXPECT_STREQ(strip("/usr/lib/" PROCESS_DYLIB).utf8().data(), "");
     80    EXPECT_STREQ(strip("/" PROCESS_DYLIB "/" PROCESS_DYLIB).utf8().data(), "");
    8181}
    8282
Note: See TracChangeset for help on using the changeset viewer.