|
8 | 8 | BOOST_AUTO_TEST_CASE(Extract) |
9 | 9 | { |
10 | 10 | Tokenizer t("a1;b123;c1234 d12.f1", "; ."); |
11 | | - BOOST_REQUIRE(t); |
| 11 | + BOOST_TEST_REQUIRE(t); |
12 | 12 | BOOST_TEST(t.next() == "a1"); |
13 | | - BOOST_REQUIRE(t); |
| 13 | + BOOST_TEST_REQUIRE(t); |
14 | 14 | BOOST_TEST(t.next() == "b123"); |
15 | | - BOOST_REQUIRE(t); |
| 15 | + BOOST_TEST_REQUIRE(t); |
16 | 16 | BOOST_TEST(t.next() == "c1234"); |
17 | | - BOOST_REQUIRE(t); |
| 17 | + BOOST_TEST_REQUIRE(t); |
18 | 18 | BOOST_TEST(t.next() == "d12"); |
19 | | - BOOST_REQUIRE(t); |
| 19 | + BOOST_TEST_REQUIRE(t); |
20 | 20 | BOOST_TEST(t.next() == "f1"); |
21 | | - BOOST_REQUIRE(!t); |
| 21 | + BOOST_TEST_REQUIRE(!t); |
22 | 22 | BOOST_TEST(t.next() == ""); |
23 | 23 | BOOST_TEST(t.next() == ""); |
24 | 24 |
|
25 | 25 | // Split(foo) == [foo] |
26 | 26 | for(const auto& singleStr : {"", "foobar", "b.c d"}) |
27 | 27 | { |
28 | 28 | t = Tokenizer(singleStr, ";"); |
29 | | - BOOST_REQUIRE(t); |
| 29 | + BOOST_TEST_REQUIRE(t); |
30 | 30 | BOOST_TEST(t.next() == singleStr); |
31 | | - BOOST_REQUIRE(!t); |
| 31 | + BOOST_TEST_REQUIRE(!t); |
32 | 32 | } |
33 | 33 | } |
34 | 34 |
|
35 | 35 | BOOST_AUTO_TEST_CASE(Explode) |
36 | 36 | { |
37 | 37 | Tokenizer t("a1;b123;c1234 d12.f1", "; ."); |
38 | | - BOOST_REQUIRE(t); |
| 38 | + BOOST_TEST_REQUIRE(t); |
39 | 39 | BOOST_TEST(t.explode() == (std::vector<std::string>{"a1", "b123", "c1234", "d12", "f1"}), |
40 | 40 | boost::test_tools::per_element()); |
41 | 41 | } |
42 | 42 |
|
43 | 43 | BOOST_AUTO_TEST_CASE(ExtractWithEmpty) |
44 | 44 | { |
45 | 45 | Tokenizer t("a;;c;;;f"); |
46 | | - BOOST_REQUIRE(t); |
| 46 | + BOOST_TEST_REQUIRE(t); |
47 | 47 | BOOST_TEST(t.explode() == (std::vector<std::string>{"a", "", "c", "", "", "f"}), boost::test_tools::per_element()); |
48 | 48 |
|
49 | 49 | t = Tokenizer(";a;b"); |
50 | | - BOOST_REQUIRE(t); |
| 50 | + BOOST_TEST_REQUIRE(t); |
51 | 51 | BOOST_TEST(t.explode() == (std::vector<std::string>{"", "a", "b"}), boost::test_tools::per_element()); |
52 | 52 |
|
53 | 53 | t = Tokenizer("a;b;"); |
54 | | - BOOST_REQUIRE(t); |
| 54 | + BOOST_TEST_REQUIRE(t); |
55 | 55 | BOOST_TEST(t.explode() == (std::vector<std::string>{"a", "b", ""}), boost::test_tools::per_element()); |
56 | 56 |
|
57 | 57 | t = Tokenizer(";"); |
58 | | - BOOST_REQUIRE(t); |
| 58 | + BOOST_TEST_REQUIRE(t); |
59 | 59 | BOOST_TEST(t.explode() == (std::vector<std::string>{"", ""}), boost::test_tools::per_element()); |
60 | 60 |
|
61 | 61 | t = Tokenizer(""); |
62 | | - BOOST_REQUIRE(t); |
| 62 | + BOOST_TEST_REQUIRE(t); |
63 | 63 | BOOST_TEST(t.explode() == (std::vector<std::string>{""}), boost::test_tools::per_element()); |
64 | 64 | } |
0 commit comments