Changeset 242338 in webkit


Ignore:
Timestamp:
Mar 3, 2019 9:09:31 PM (5 years ago)
Author:
Ross Kirsling
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):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r242329 r242338  
     12019-03-03  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        Unreviewed follow-up to r242292.
     4
     5        By Darin's suggestion, adopt an approach that uses EXPECT_STREQ without scattering utf8().data() everywhere.
     6
     7        * TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp:
     8        (TestWebKitAPI::testStrip): Renamed from strip.
     9        (TestWebKitAPI::TEST):
     10
    1112019-03-03  Michael Catanzaro  <mcatanzaro@igalia.com>
    212

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp

    r242323 r242338  
    3535const char* const stripValue = "/" PROCESS_DYLIB;
    3636
    37 static String strip(StringView input)
     37static void testStrip(const char* input, const char* expected)
    3838{
    39     return WebKit::EnvironmentUtilities::stripEntriesEndingWith(input, stripValue);
     39    auto actual = WebKit::EnvironmentUtilities::stripEntriesEndingWith(input, stripValue);
     40    EXPECT_STREQ(actual.utf8().data(), expected);
    4041}
    4142
    4243TEST(WebKit, StripEntriesEndingWith)
    4344{
    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(), ":::::");
     45    testStrip("", "");
     46    testStrip(":", ":");
     47    testStrip("::", "::");
     48    testStrip(":::", ":::");
     49    testStrip("::::", "::::");
     50    testStrip(":::::", ":::::");
    5051
    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 ":");
     52    testStrip(PROCESS_DYLIB, PROCESS_DYLIB);
     53    testStrip(":" PROCESS_DYLIB, ":" PROCESS_DYLIB);
     54    testStrip(PROCESS_DYLIB ":", PROCESS_DYLIB ":");
     55    testStrip(":" PROCESS_DYLIB ":", ":" PROCESS_DYLIB ":");
    5556
    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(), ":");
     57    testStrip("/" PROCESS_DYLIB, "");
     58    testStrip(":/" PROCESS_DYLIB, "");
     59    testStrip("/" PROCESS_DYLIB ":", "");
     60    testStrip(":/" PROCESS_DYLIB ":", ":");
    6061
    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 "/:");
     62    testStrip(PROCESS_DYLIB "/", PROCESS_DYLIB "/");
     63    testStrip(":" PROCESS_DYLIB "/", ":" PROCESS_DYLIB "/");
     64    testStrip(PROCESS_DYLIB "/:", PROCESS_DYLIB "/:");
     65    testStrip(":" PROCESS_DYLIB "/:", ":" PROCESS_DYLIB "/:");
    6566
    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 "/:");
     67    testStrip("/" PROCESS_DYLIB "/", "/" PROCESS_DYLIB "/");
     68    testStrip(":/" PROCESS_DYLIB "/", ":/" PROCESS_DYLIB "/");
     69    testStrip("/" PROCESS_DYLIB "/:", "/" PROCESS_DYLIB "/:");
     70    testStrip(":/" PROCESS_DYLIB "/:", ":/" PROCESS_DYLIB "/:");
    7071
    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");
     72    testStrip("/Before.dylib:/" PROCESS_DYLIB, "/Before.dylib");
     73    testStrip("/" PROCESS_DYLIB ":/After.dylib", "/After.dylib");
     74    testStrip("/Before.dylib:/" PROCESS_DYLIB ":/After.dylib", "/Before.dylib:/After.dylib");
     75    testStrip("/Before.dylib:/" PROCESS_DYLIB ":/Middle.dylib:/" PROCESS_DYLIB ":/After.dylib", "/Before.dylib:/Middle.dylib:/After.dylib");
    7576
    76     EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB).utf8().data(), "");
    77     EXPECT_STREQ(strip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB ":/" PROCESS_DYLIB).utf8().data(), "");
     77    testStrip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB, "");
     78    testStrip("/" PROCESS_DYLIB ":/" PROCESS_DYLIB ":/" PROCESS_DYLIB, "");
    7879
    79     EXPECT_STREQ(strip("/usr/lib/" PROCESS_DYLIB).utf8().data(), "");
    80     EXPECT_STREQ(strip("/" PROCESS_DYLIB "/" PROCESS_DYLIB).utf8().data(), "");
     80    testStrip("/usr/lib/" PROCESS_DYLIB, "");
     81    testStrip("/" PROCESS_DYLIB "/" PROCESS_DYLIB, "");
    8182}
    8283
Note: See TracChangeset for help on using the changeset viewer.