From fc423bf6bcd93b835d13f939fa7e9d33be47bdd4 Mon Sep 17 00:00:00 2001
From: Stefan Slapeta <stefan@slapeta.com>
Date: Thu, 3 Feb 2005 12:45:59 +0000
Subject: [PATCH] Replaced BOOST_TEST*

[SVN r27052]
---
 test/options_description_test.cpp | 44 +++++++++++++++----------------
 test/parsers_test.cpp             | 36 ++++++++++++-------------
 test/unicode_test.cpp             |  8 +++---
 test/variable_map_test.cpp        | 30 ++++++++++-----------
 4 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/test/options_description_test.cpp b/test/options_description_test.cpp
index f4c42d1..0456da7 100644
--- a/test/options_description_test.cpp
+++ b/test/options_description_test.cpp
@@ -22,18 +22,18 @@ using namespace std;
 void test_option_description_construction()
 {
     option_description d1("a", new untyped_value(), "desc1");
-    BOOST_TEST(d1.long_name() == "a");
-    BOOST_TEST(d1.description() == "desc1");
-    BOOST_TEST(d1.semantic()->name() == "arg");
+    BOOST_CHECK(d1.long_name() == "a");
+    BOOST_CHECK(d1.description() == "desc1");
+    BOOST_CHECK(d1.semantic()->name() == "arg");
 
     // It is not possible to compare boost::function
     #if 0
     function<string, string> f1;
-    BOOST_TEST(&option_description("x", "y", "z").
+    BOOST_CHECK(&option_description("x", "y", "z").
                validator(f1).validator() ==
                &f1);
     function<void, string> f2;
-    BOOST_TEST(&option_description("x", "y", "z").
+    BOOST_CHECK(&option_description("x", "y", "z").
                notify(f2).notify() ==
                &f2);
     #endif
@@ -50,27 +50,27 @@ void test_options_description()
     shared_ptr<option_description> d1(
         new option_description("first,f", new untyped_value(), ""));
     desc.add(d1);
-    BOOST_TEST(desc.count("first") == 1);
-    BOOST_TEST(desc.count("-f") == 1);
-    BOOST_TEST(desc.keys().size() == 2);
-    BOOST_TEST(desc.keys().count("first") == 1);
-    BOOST_TEST(desc.keys().count("-f") == 1);
+    BOOST_CHECK(desc.count("first") == 1);
+    BOOST_CHECK(desc.count("-f") == 1);
+    BOOST_CHECK(desc.keys().size() == 2);
+    BOOST_CHECK(desc.keys().count("first") == 1);
+    BOOST_CHECK(desc.keys().count("-f") == 1);
 
     desc.add_options()
         ("second,s", new untyped_value())
         ("third,t", new untyped_value())
         ;
-    BOOST_TEST(desc.count("second") == 1);
-    BOOST_TEST(desc.count("-s") == 1);
+    BOOST_CHECK(desc.count("second") == 1);
+    BOOST_CHECK(desc.count("-s") == 1);
 
     desc.add_options()
         (",x", new untyped_value)
         ;
-    BOOST_TEST(desc.primary_keys().size() == 4);
-    BOOST_TEST(desc.primary_keys().count("first") == 1);
-    BOOST_TEST(desc.primary_keys().count("second") == 1);
-    BOOST_TEST(desc.primary_keys().count("third") == 1);
-    BOOST_TEST(desc.primary_keys().count("-x") == 1);
+    BOOST_CHECK(desc.primary_keys().size() == 4);
+    BOOST_CHECK(desc.primary_keys().count("first") == 1);
+    BOOST_CHECK(desc.primary_keys().count("second") == 1);
+    BOOST_CHECK(desc.primary_keys().count("third") == 1);
+    BOOST_CHECK(desc.primary_keys().count("-x") == 1);
 }
 
 void test_approximation()
@@ -81,12 +81,12 @@ void test_approximation()
     ("fee", new untyped_value())
     ("baz", new untyped_value());
 
-    BOOST_TEST(desc.count_approx("f") == 2);
-    BOOST_TEST(desc.count_approx("foo") == 1);
+    BOOST_CHECK(desc.count_approx("f") == 2);
+    BOOST_CHECK(desc.count_approx("foo") == 1);
     set<string> a = desc.approximations("f");
-    BOOST_TEST(a.size() == 2);
-    BOOST_TEST(*a.begin() == "fee");
-    BOOST_TEST(*(++a.begin()) == "foo");
+    BOOST_CHECK(a.size() == 2);
+    BOOST_CHECK(*a.begin() == "fee");
+    BOOST_CHECK(*(++a.begin()) == "foo");
 }
 
 int test_main(int, char* [])
diff --git a/test/parsers_test.cpp b/test/parsers_test.cpp
index c760df2..d72be5f 100644
--- a/test/parsers_test.cpp
+++ b/test/parsers_test.cpp
@@ -74,14 +74,14 @@ void test_command_line()
         parse_command_line(cmdline1,
                            cmdline1 + sizeof(cmdline1)/sizeof(cmdline1[0]));
 
-    BOOST_CRITICAL_TEST(a1.options().size() == 4);
-    BOOST_TEST(a1.options()[0] == msp("a", ""));
-    BOOST_TEST(a1.options()[1] == msp("b", "12"));
-    BOOST_TEST(a1.options()[2] == msp("-f", ""));
-    BOOST_TEST(a1.options()[3] == msp("-g", "4"));
-    BOOST_CRITICAL_TEST(a1.arguments().size() == 2);
-    BOOST_TEST(a1.arguments()[0] == "-");
-    BOOST_TEST(a1.arguments()[1] == "file");
+    BOOST_REQUIRE(a1.options().size() == 4);
+    BOOST_CHECK(a1.options()[0] == msp("a", ""));
+    BOOST_CHECK(a1.options()[1] == msp("b", "12"));
+    BOOST_CHECK(a1.options()[2] == msp("-f", ""));
+    BOOST_CHECK(a1.options()[3] == msp("-g", "4"));
+    BOOST_REQUIRE(a1.arguments().size() == 2);
+    BOOST_CHECK(a1.arguments()[0] == "-");
+    BOOST_CHECK(a1.arguments()[1] == "file");
 
     char* cmdline2[] = { "--a", "--", "file" };
 
@@ -89,10 +89,10 @@ void test_command_line()
         parse_command_line(cmdline2,
                            cmdline2 + sizeof(cmdline2)/sizeof(cmdline2[0]));
 
-    BOOST_CRITICAL_TEST(a2.options().size() == 1);
-    BOOST_TEST(a2.options()[0] == msp("a", ""));
-    BOOST_TEST(a2.arguments().size() == 1);
-    BOOST_TEST(a2.arguments()[0] == "file");
+    BOOST_REQUIRE(a2.options().size() == 1);
+    BOOST_CHECK(a2.options()[0] == msp("a", ""));
+    BOOST_CHECK(a2.arguments().size() == 1);
+    BOOST_CHECK(a2.arguments()[0] == "file");
     #endif
     
     options_description desc;
@@ -110,19 +110,19 @@ void test_command_line()
     vector<option> a3 = 
         command_line_parser(cmdline3).options(desc).run().options;
                        
-    BOOST_CRITICAL_TEST(a3.size() == 7);
+    BOOST_REQUIRE(a3.size() == 7);
 
     check_value(a3[0], "foo", "12");
     check_value(a3[1], "foo", "4");
     check_value(a3[2], "bar", "11");
 
-    BOOST_TEST(a3[3].string_key == "bar");
-    BOOST_CRITICAL_TEST(a3[3].value.size() == 0);
+    BOOST_CHECK(a3[3].string_key == "bar");
+    BOOST_REQUIRE(a3[3].value.size() == 0);
 
     check_value(a3[4], "bar", "4");
 
-    BOOST_TEST(a3[5].string_key == "bar");
-    BOOST_CRITICAL_TEST(a3[5].value.size() == 0);
+    BOOST_CHECK(a3[5].string_key == "bar");
+    BOOST_REQUIRE(a3[5].value.size() == 0);
 
     check_value(a3[6], "plug3", "10");
 }
@@ -151,7 +151,7 @@ void test_config_file()
 
     stringstream ss(content1);
     vector<option> a1 = parse_config_file(ss, desc).options;
-    BOOST_CRITICAL_TEST(a1.size() == 5);
+    BOOST_REQUIRE(a1.size() == 5);
     check_value(a1[0], "gv1", "0");
     check_value(a1[1], "plug3", "7");
     check_value(a1[2], "b", "true");
diff --git a/test/unicode_test.cpp b/test/unicode_test.cpp
index f068ca8..fb7348b 100644
--- a/test/unicode_test.cpp
+++ b/test/unicode_test.cpp
@@ -61,7 +61,7 @@ void test_unicode_to_native()
     variables_map vm;
     store(wcommand_line_parser(args).options(desc).run(), vm);
 
-    BOOST_TEST(vm["foo"].as<string>() == "\xD1\x8F");    
+    BOOST_CHECK(vm["foo"].as<string>() == "\xD1\x8F");    
 }
 
 void test_native_to_unicode()
@@ -82,7 +82,7 @@ void test_native_to_unicode()
     variables_map vm;
     store(command_line_parser(args).options(desc).run(), vm);
 
-    BOOST_TEST(vm["foo"].as<wstring>() == L"\x044F");    
+    BOOST_CHECK(vm["foo"].as<wstring>() == L"\x044F");    
 }
 
 
@@ -119,7 +119,7 @@ void test_command_line()
     vector<woption> a4 = 
         wcommand_line_parser(cmdline4).options(desc).run().options;
 
-    BOOST_CRITICAL_TEST(a4.size() == 7);
+    BOOST_REQUIRE(a4.size() == 7);
 
     check_value(a4[0], "foo", L"1\u0FF52");
     check_value(a4[1], "foo", L"4");
@@ -146,7 +146,7 @@ void test_config_file()
     variables_map vm;
     store(parse_config_file(stream, desc), vm);
 
-    BOOST_TEST(vm["foo"].as<string>() == "\xD1\x8F");    
+    BOOST_CHECK(vm["foo"].as<string>() == "\xD1\x8F");    
 }
 
 int test_main(int, char* [])
diff --git a/test/variable_map_test.cpp b/test/variable_map_test.cpp
index 6657e58..0f8186f 100644
--- a/test/variable_map_test.cpp
+++ b/test/variable_map_test.cpp
@@ -57,12 +57,12 @@ void test_variable_map()
     variables_map vm;
     store(a3, vm);
     notify(vm);
-    BOOST_CRITICAL_TEST(vm.size() == 4);
-    BOOST_TEST(vm["foo"].as<string>() == "'12'");
-    BOOST_TEST(vm["bar"].as<string>() == "11");
-    BOOST_TEST(vm.count("biz") == 1);
-    BOOST_TEST(vm["biz"].as<string>() == "3");
-    BOOST_TEST(vm["output"].as<string>() == "foo");
+    BOOST_REQUIRE(vm.size() == 4);
+    BOOST_CHECK(vm["foo"].as<string>() == "'12'");
+    BOOST_CHECK(vm["bar"].as<string>() == "11");
+    BOOST_CHECK(vm.count("biz") == 1);
+    BOOST_CHECK(vm["biz"].as<string>() == "3");
+    BOOST_CHECK(vm["output"].as<string>() == "foo");
 
     int i;
     desc.add_options()
@@ -78,11 +78,11 @@ void test_variable_map()
     variables_map vm2;
     store(a4, vm2);
     notify(vm2);
-    BOOST_CRITICAL_TEST(vm2.size() == 3);
-    BOOST_TEST(vm2["zee"].as<bool>() == true);
-    BOOST_TEST(vm2["zak"].as<int>() == 13);
-    BOOST_TEST(vm2["opt"].as<bool>() == false);
-    BOOST_TEST(i == 13);
+    BOOST_REQUIRE(vm2.size() == 3);
+    BOOST_CHECK(vm2["zee"].as<bool>() == true);
+    BOOST_CHECK(vm2["zak"].as<int>() == 13);
+    BOOST_CHECK(vm2["opt"].as<bool>() == false);
+    BOOST_CHECK(i == 13);
 
     options_description desc2;
     desc2.add_options()
@@ -98,10 +98,10 @@ void test_variable_map()
     variables_map vm3;
     store(a5, vm3);
     notify(vm3);
-    BOOST_CRITICAL_TEST(vm3.size() == 3);
-    BOOST_TEST(vm3["vee"].as<string>() == "42");
-    BOOST_TEST(vm3["voo"].as<string>() == "1");
-    BOOST_TEST(vm3["iii"].as<int>() == 123);
+    BOOST_REQUIRE(vm3.size() == 3);
+    BOOST_CHECK(vm3["vee"].as<string>() == "42");
+    BOOST_CHECK(vm3["voo"].as<string>() == "1");
+    BOOST_CHECK(vm3["iii"].as<int>() == 123);
 }
 
 int stored_value;