Skip to content

Commit db9b9e0

Browse files
committed
Use BOOST_TEST* macros instead of old variants
Consistent use
1 parent 3b1abe6 commit db9b9e0

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

tests/testTokenizer.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,57 @@
88
BOOST_AUTO_TEST_CASE(Extract)
99
{
1010
Tokenizer t("a1;b123;c1234 d12.f1", "; .");
11-
BOOST_REQUIRE(t);
11+
BOOST_TEST_REQUIRE(t);
1212
BOOST_TEST(t.next() == "a1");
13-
BOOST_REQUIRE(t);
13+
BOOST_TEST_REQUIRE(t);
1414
BOOST_TEST(t.next() == "b123");
15-
BOOST_REQUIRE(t);
15+
BOOST_TEST_REQUIRE(t);
1616
BOOST_TEST(t.next() == "c1234");
17-
BOOST_REQUIRE(t);
17+
BOOST_TEST_REQUIRE(t);
1818
BOOST_TEST(t.next() == "d12");
19-
BOOST_REQUIRE(t);
19+
BOOST_TEST_REQUIRE(t);
2020
BOOST_TEST(t.next() == "f1");
21-
BOOST_REQUIRE(!t);
21+
BOOST_TEST_REQUIRE(!t);
2222
BOOST_TEST(t.next() == "");
2323
BOOST_TEST(t.next() == "");
2424

2525
// Split(foo) == [foo]
2626
for(const auto& singleStr : {"", "foobar", "b.c d"})
2727
{
2828
t = Tokenizer(singleStr, ";");
29-
BOOST_REQUIRE(t);
29+
BOOST_TEST_REQUIRE(t);
3030
BOOST_TEST(t.next() == singleStr);
31-
BOOST_REQUIRE(!t);
31+
BOOST_TEST_REQUIRE(!t);
3232
}
3333
}
3434

3535
BOOST_AUTO_TEST_CASE(Explode)
3636
{
3737
Tokenizer t("a1;b123;c1234 d12.f1", "; .");
38-
BOOST_REQUIRE(t);
38+
BOOST_TEST_REQUIRE(t);
3939
BOOST_TEST(t.explode() == (std::vector<std::string>{"a1", "b123", "c1234", "d12", "f1"}),
4040
boost::test_tools::per_element());
4141
}
4242

4343
BOOST_AUTO_TEST_CASE(ExtractWithEmpty)
4444
{
4545
Tokenizer t("a;;c;;;f");
46-
BOOST_REQUIRE(t);
46+
BOOST_TEST_REQUIRE(t);
4747
BOOST_TEST(t.explode() == (std::vector<std::string>{"a", "", "c", "", "", "f"}), boost::test_tools::per_element());
4848

4949
t = Tokenizer(";a;b");
50-
BOOST_REQUIRE(t);
50+
BOOST_TEST_REQUIRE(t);
5151
BOOST_TEST(t.explode() == (std::vector<std::string>{"", "a", "b"}), boost::test_tools::per_element());
5252

5353
t = Tokenizer("a;b;");
54-
BOOST_REQUIRE(t);
54+
BOOST_TEST_REQUIRE(t);
5555
BOOST_TEST(t.explode() == (std::vector<std::string>{"a", "b", ""}), boost::test_tools::per_element());
5656

5757
t = Tokenizer(";");
58-
BOOST_REQUIRE(t);
58+
BOOST_TEST_REQUIRE(t);
5959
BOOST_TEST(t.explode() == (std::vector<std::string>{"", ""}), boost::test_tools::per_element());
6060

6161
t = Tokenizer("");
62-
BOOST_REQUIRE(t);
62+
BOOST_TEST_REQUIRE(t);
6363
BOOST_TEST(t.explode() == (std::vector<std::string>{""}), boost::test_tools::per_element());
6464
}

0 commit comments

Comments
 (0)