diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 01:24:48 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 01:24:48 +0200 |
| commit | 13154bc1a9b341f46994607fdde2e725444a6e21 (patch) | |
| tree | 3fcf211b397092798b2aa39af4cc567d146a574c /test/compose_test.cc | |
| parent | 9853cbf566fdfdea096333c4caa788c29fa5c57b (diff) | |
Remove String namespace from around compose().compose
Diffstat (limited to 'test/compose_test.cc')
| -rw-r--r-- | test/compose_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/compose_test.cc b/test/compose_test.cc index 9dddb81b..b6347f78 100644 --- a/test/compose_test.cc +++ b/test/compose_test.cc @@ -38,11 +38,11 @@ BOOST_AUTO_TEST_CASE (compose_test) { - BOOST_REQUIRE_EQUAL (dcp::String::compose("foo %1", 42), "foo 42"); - BOOST_REQUIRE_EQUAL (dcp::String::compose("foo %1 %2", "", 42), "foo 42 "); - BOOST_REQUIRE_EQUAL (dcp::String::compose("foo %1 %1", 42), "foo 42 42"); - BOOST_REQUIRE_EQUAL (dcp::String::compose("foo %1 %2", 42, 9.6), "foo 42 9.6"); - BOOST_REQUIRE_EQUAL (dcp::String::compose("something %1 foo %2 %3", "balls", 42, 9.6), "something balls foo 42 9.6"); - BOOST_REQUIRE_EQUAL (dcp::String::compose("something %1 foo %2 %3 and then %% %4", "balls", 42, 9.6, boost::filesystem::path("/foo")), "something balls foo 42 9.6 and then % /foo"); + BOOST_REQUIRE_EQUAL (dcp::compose("foo %1", 42), "foo 42"); + BOOST_REQUIRE_EQUAL (dcp::compose("foo %1 %2", "", 42), "foo 42 "); + BOOST_REQUIRE_EQUAL (dcp::compose("foo %1 %1", 42), "foo 42 42"); + BOOST_REQUIRE_EQUAL (dcp::compose("foo %1 %2", 42, 9.6), "foo 42 9.6"); + BOOST_REQUIRE_EQUAL (dcp::compose("something %1 foo %2 %3", "balls", 42, 9.6), "something balls foo 42 9.6"); + BOOST_REQUIRE_EQUAL (dcp::compose("something %1 foo %2 %3 and then %% %4", "balls", 42, 9.6, boost::filesystem::path("/foo")), "something balls foo 42 9.6 and then % /foo"); } |