mirror of
https://github.com/boostorg/logic.git
synced 2025-07-30 04:07:15 +02:00
Replaced BOOST_TEST
[SVN r27050]
This commit is contained in:
@ -27,14 +27,14 @@ int test_main(int, char*[])
|
||||
x = false;
|
||||
out << x;
|
||||
std::cout << "Output false (noboolalpha): " << out.str() << std::endl;
|
||||
BOOST_TEST(out.str() == "0");
|
||||
BOOST_CHECK(out.str() == "0");
|
||||
|
||||
// Output true (noboolalpha)
|
||||
out.str(std::string());
|
||||
x = true;
|
||||
out << x;
|
||||
std::cout << "Output true (noboolalpha): " << out.str() << std::endl;
|
||||
BOOST_TEST(out.str() == "1");
|
||||
BOOST_CHECK(out.str() == "1");
|
||||
|
||||
// Output indeterminate (noboolalpha)
|
||||
out.str(std::string());
|
||||
@ -42,7 +42,7 @@ int test_main(int, char*[])
|
||||
out << x;
|
||||
std::cout << "Output indeterminate (noboolalpha): " << out.str()
|
||||
<< std::endl;
|
||||
BOOST_TEST(out.str() == "2");
|
||||
BOOST_CHECK(out.str() == "2");
|
||||
|
||||
#ifndef BOOST_NO_STD_LOCALE
|
||||
const std::numpunct<char>& punct =
|
||||
@ -53,7 +53,7 @@ int test_main(int, char*[])
|
||||
x = false;
|
||||
out << std::boolalpha << x;
|
||||
std::cout << "Output false (boolalpha): " << out.str() << std::endl;
|
||||
BOOST_TEST(out.str() == punct.falsename());
|
||||
BOOST_CHECK(out.str() == punct.falsename());
|
||||
|
||||
// Output true (boolalpha)
|
||||
out.str(std::string());
|
||||
@ -61,7 +61,7 @@ int test_main(int, char*[])
|
||||
out << std::boolalpha << x;
|
||||
std::cout << "Output true (boolalpha): " << out.str() << std::endl;
|
||||
|
||||
BOOST_TEST(out.str() == punct.truename());
|
||||
BOOST_CHECK(out.str() == punct.truename());
|
||||
|
||||
// Output indeterminate (boolalpha - default name)
|
||||
out.str(std::string());
|
||||
@ -69,7 +69,7 @@ int test_main(int, char*[])
|
||||
out << std::boolalpha << x;
|
||||
std::cout << "Output indeterminate (boolalpha - default name): " << out.str()
|
||||
<< std::endl;
|
||||
BOOST_TEST(out.str() == "indeterminate");
|
||||
BOOST_CHECK(out.str() == "indeterminate");
|
||||
|
||||
# if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
|
||||
// No template constructors, so we can't build the test locale
|
||||
@ -82,7 +82,7 @@ int test_main(int, char*[])
|
||||
out << std::boolalpha << x;
|
||||
std::cout << "Output indeterminate (boolalpha - \"maybe\"): " << out.str()
|
||||
<< std::endl;
|
||||
BOOST_TEST(out.str() == "maybe");
|
||||
BOOST_CHECK(out.str() == "maybe");
|
||||
# endif
|
||||
#endif // ! BOOST_NO_STD_LOCALE
|
||||
|
||||
@ -93,7 +93,7 @@ int test_main(int, char*[])
|
||||
std::istringstream in("0");
|
||||
std::cout << "Input \"0\" (checks for false)" << std::endl;
|
||||
in >> x;
|
||||
BOOST_TEST(x == false);
|
||||
BOOST_CHECK(x == false);
|
||||
}
|
||||
|
||||
// Input true (noboolalpha)
|
||||
@ -101,7 +101,7 @@ int test_main(int, char*[])
|
||||
std::istringstream in("1");
|
||||
std::cout << "Input \"1\" (checks for true)" << std::endl;
|
||||
in >> x;
|
||||
BOOST_TEST(x == true);
|
||||
BOOST_CHECK(x == true);
|
||||
}
|
||||
|
||||
// Input false (noboolalpha)
|
||||
@ -109,14 +109,14 @@ int test_main(int, char*[])
|
||||
std::istringstream in("2");
|
||||
std::cout << "Input \"2\" (checks for indeterminate)" << std::endl;
|
||||
in >> x;
|
||||
BOOST_TEST(indeterminate(x));
|
||||
BOOST_CHECK(indeterminate(x));
|
||||
}
|
||||
|
||||
// Input bad number (noboolalpha)
|
||||
{
|
||||
std::istringstream in("3");
|
||||
std::cout << "Input \"3\" (checks for failure)" << std::endl;
|
||||
BOOST_TEST(!(in >> x));
|
||||
BOOST_CHECK(!(in >> x));
|
||||
}
|
||||
|
||||
// Input false (boolalpha)
|
||||
@ -124,7 +124,7 @@ int test_main(int, char*[])
|
||||
std::istringstream in("false");
|
||||
std::cout << "Input \"false\" (checks for false)" << std::endl;
|
||||
in >> std::boolalpha >> x;
|
||||
BOOST_TEST(x == false);
|
||||
BOOST_CHECK(x == false);
|
||||
}
|
||||
|
||||
// Input true (boolalpha)
|
||||
@ -132,7 +132,7 @@ int test_main(int, char*[])
|
||||
std::istringstream in("true");
|
||||
std::cout << "Input \"true\" (checks for true)" << std::endl;
|
||||
in >> std::boolalpha >> x;
|
||||
BOOST_TEST(x == true);
|
||||
BOOST_CHECK(x == true);
|
||||
}
|
||||
|
||||
// Input indeterminate (boolalpha)
|
||||
@ -141,7 +141,7 @@ int test_main(int, char*[])
|
||||
std::cout << "Input \"indeterminate\" (checks for indeterminate)"
|
||||
<< std::endl;
|
||||
in >> std::boolalpha >> x;
|
||||
BOOST_TEST(indeterminate(x));
|
||||
BOOST_CHECK(indeterminate(x));
|
||||
}
|
||||
|
||||
// Input bad string (boolalpha)
|
||||
@ -149,7 +149,7 @@ int test_main(int, char*[])
|
||||
std::istringstream in("bad");
|
||||
std::cout << "Input \"bad\" (checks for failure)"
|
||||
<< std::endl;
|
||||
BOOST_TEST(!(in >> std::boolalpha >> x));
|
||||
BOOST_CHECK(!(in >> std::boolalpha >> x));
|
||||
}
|
||||
|
||||
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
|
||||
@ -163,7 +163,7 @@ int test_main(int, char*[])
|
||||
std::cout << "Input \"maybe\" (checks for indeterminate, uses locales)"
|
||||
<< std::endl;
|
||||
in >> std::boolalpha >> x;
|
||||
BOOST_TEST(indeterminate(x));
|
||||
BOOST_CHECK(indeterminate(x));
|
||||
}
|
||||
|
||||
// Input indeterminate named "true_or_false" (boolalpha)
|
||||
@ -175,7 +175,7 @@ int test_main(int, char*[])
|
||||
std::cout << "Input \"true_or_false\" (checks for indeterminate)"
|
||||
<< std::endl;
|
||||
in >> std::boolalpha >> x;
|
||||
BOOST_TEST(indeterminate(x));
|
||||
BOOST_CHECK(indeterminate(x));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -19,103 +19,103 @@ int test_main(int,char*[])
|
||||
tribool y(true); // true
|
||||
tribool z(maybe); // maybe
|
||||
|
||||
BOOST_TEST(!x);
|
||||
BOOST_TEST(x == false);
|
||||
BOOST_TEST(false == x);
|
||||
BOOST_TEST(x != true);
|
||||
BOOST_TEST(true != x);
|
||||
BOOST_TEST(maybe(x == maybe));
|
||||
BOOST_TEST(maybe(maybe == x));
|
||||
BOOST_TEST(maybe(x != maybe));
|
||||
BOOST_TEST(maybe(maybe != x));
|
||||
BOOST_TEST(x == x);
|
||||
BOOST_TEST(!(x != x));
|
||||
BOOST_TEST(!(x && true));
|
||||
BOOST_TEST(!(true && x));
|
||||
BOOST_TEST(x || true);
|
||||
BOOST_TEST(true || x);
|
||||
BOOST_CHECK(!x);
|
||||
BOOST_CHECK(x == false);
|
||||
BOOST_CHECK(false == x);
|
||||
BOOST_CHECK(x != true);
|
||||
BOOST_CHECK(true != x);
|
||||
BOOST_CHECK(maybe(x == maybe));
|
||||
BOOST_CHECK(maybe(maybe == x));
|
||||
BOOST_CHECK(maybe(x != maybe));
|
||||
BOOST_CHECK(maybe(maybe != x));
|
||||
BOOST_CHECK(x == x);
|
||||
BOOST_CHECK(!(x != x));
|
||||
BOOST_CHECK(!(x && true));
|
||||
BOOST_CHECK(!(true && x));
|
||||
BOOST_CHECK(x || true);
|
||||
BOOST_CHECK(true || x);
|
||||
|
||||
BOOST_TEST(y);
|
||||
BOOST_TEST(y == true);
|
||||
BOOST_TEST(true == y);
|
||||
BOOST_TEST(y != false);
|
||||
BOOST_TEST(false != y);
|
||||
BOOST_TEST(maybe(y == maybe));
|
||||
BOOST_TEST(maybe(maybe == y));
|
||||
BOOST_TEST(maybe(y != maybe));
|
||||
BOOST_TEST(maybe(maybe != y));
|
||||
BOOST_TEST(y == y);
|
||||
BOOST_TEST(!(y != y));
|
||||
BOOST_CHECK(y);
|
||||
BOOST_CHECK(y == true);
|
||||
BOOST_CHECK(true == y);
|
||||
BOOST_CHECK(y != false);
|
||||
BOOST_CHECK(false != y);
|
||||
BOOST_CHECK(maybe(y == maybe));
|
||||
BOOST_CHECK(maybe(maybe == y));
|
||||
BOOST_CHECK(maybe(y != maybe));
|
||||
BOOST_CHECK(maybe(maybe != y));
|
||||
BOOST_CHECK(y == y);
|
||||
BOOST_CHECK(!(y != y));
|
||||
|
||||
BOOST_TEST(maybe(z || !z));
|
||||
BOOST_TEST(maybe(z == true));
|
||||
BOOST_TEST(maybe(true == z));
|
||||
BOOST_TEST(maybe(z == false));
|
||||
BOOST_TEST(maybe(false == z));
|
||||
BOOST_TEST(maybe(z == maybe));
|
||||
BOOST_TEST(maybe(maybe == z));
|
||||
BOOST_TEST(maybe(z != maybe));
|
||||
BOOST_TEST(maybe(maybe != z));
|
||||
BOOST_TEST(maybe(z == z));
|
||||
BOOST_TEST(maybe(z != z));
|
||||
BOOST_CHECK(maybe(z || !z));
|
||||
BOOST_CHECK(maybe(z == true));
|
||||
BOOST_CHECK(maybe(true == z));
|
||||
BOOST_CHECK(maybe(z == false));
|
||||
BOOST_CHECK(maybe(false == z));
|
||||
BOOST_CHECK(maybe(z == maybe));
|
||||
BOOST_CHECK(maybe(maybe == z));
|
||||
BOOST_CHECK(maybe(z != maybe));
|
||||
BOOST_CHECK(maybe(maybe != z));
|
||||
BOOST_CHECK(maybe(z == z));
|
||||
BOOST_CHECK(maybe(z != z));
|
||||
|
||||
BOOST_TEST(!(x == y));
|
||||
BOOST_TEST(x != y);
|
||||
BOOST_TEST(maybe(x == z));
|
||||
BOOST_TEST(maybe(x != z));
|
||||
BOOST_TEST(maybe(y == z));
|
||||
BOOST_TEST(maybe(y != z));
|
||||
BOOST_CHECK(!(x == y));
|
||||
BOOST_CHECK(x != y);
|
||||
BOOST_CHECK(maybe(x == z));
|
||||
BOOST_CHECK(maybe(x != z));
|
||||
BOOST_CHECK(maybe(y == z));
|
||||
BOOST_CHECK(maybe(y != z));
|
||||
|
||||
BOOST_TEST(!(x && y));
|
||||
BOOST_TEST(x || y);
|
||||
BOOST_TEST(!(x && z));
|
||||
BOOST_TEST(maybe(y && z));
|
||||
BOOST_TEST(maybe(z && z));
|
||||
BOOST_TEST(maybe(z || z));
|
||||
BOOST_TEST(maybe(x || z));
|
||||
BOOST_TEST(y || z);
|
||||
BOOST_CHECK(!(x && y));
|
||||
BOOST_CHECK(x || y);
|
||||
BOOST_CHECK(!(x && z));
|
||||
BOOST_CHECK(maybe(y && z));
|
||||
BOOST_CHECK(maybe(z && z));
|
||||
BOOST_CHECK(maybe(z || z));
|
||||
BOOST_CHECK(maybe(x || z));
|
||||
BOOST_CHECK(y || z);
|
||||
|
||||
BOOST_TEST(maybe(y && maybe));
|
||||
BOOST_TEST(maybe(maybe && y));
|
||||
BOOST_TEST(!(x && maybe));
|
||||
BOOST_TEST(!(maybe && x));
|
||||
BOOST_CHECK(maybe(y && maybe));
|
||||
BOOST_CHECK(maybe(maybe && y));
|
||||
BOOST_CHECK(!(x && maybe));
|
||||
BOOST_CHECK(!(maybe && x));
|
||||
|
||||
BOOST_TEST(maybe || y);
|
||||
BOOST_TEST(y || maybe);
|
||||
BOOST_TEST(maybe(x || maybe));
|
||||
BOOST_TEST(maybe(maybe || x));
|
||||
BOOST_CHECK(maybe || y);
|
||||
BOOST_CHECK(y || maybe);
|
||||
BOOST_CHECK(maybe(x || maybe));
|
||||
BOOST_CHECK(maybe(maybe || x));
|
||||
|
||||
// Test the if (z) ... else (!z) ... else ... idiom
|
||||
if (z) {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
else if (!z) {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
else {
|
||||
BOOST_TEST(true);
|
||||
BOOST_CHECK(true);
|
||||
}
|
||||
|
||||
z = true;
|
||||
if (z) {
|
||||
BOOST_TEST(true);
|
||||
BOOST_CHECK(true);
|
||||
}
|
||||
else if (!z) {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
else {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
|
||||
z = false;
|
||||
if (z) {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
else if (!z) {
|
||||
BOOST_TEST(true);
|
||||
BOOST_CHECK(true);
|
||||
}
|
||||
else {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
|
||||
std::cout << "no errors detected\n";
|
||||
|
@ -15,103 +15,103 @@ int test_main(int, char*[])
|
||||
tribool y(true); // true
|
||||
tribool z(indeterminate); // indeterminate
|
||||
|
||||
BOOST_TEST(!x);
|
||||
BOOST_TEST(x == false);
|
||||
BOOST_TEST(false == x);
|
||||
BOOST_TEST(x != true);
|
||||
BOOST_TEST(true != x);
|
||||
BOOST_TEST(indeterminate(x == indeterminate));
|
||||
BOOST_TEST(indeterminate(indeterminate == x));
|
||||
BOOST_TEST(indeterminate(x != indeterminate));
|
||||
BOOST_TEST(indeterminate(indeterminate != x));
|
||||
BOOST_TEST(x == x);
|
||||
BOOST_TEST(!(x != x));
|
||||
BOOST_TEST(!(x && true));
|
||||
BOOST_TEST(!(true && x));
|
||||
BOOST_TEST(x || true);
|
||||
BOOST_TEST(true || x);
|
||||
BOOST_CHECK(!x);
|
||||
BOOST_CHECK(x == false);
|
||||
BOOST_CHECK(false == x);
|
||||
BOOST_CHECK(x != true);
|
||||
BOOST_CHECK(true != x);
|
||||
BOOST_CHECK(indeterminate(x == indeterminate));
|
||||
BOOST_CHECK(indeterminate(indeterminate == x));
|
||||
BOOST_CHECK(indeterminate(x != indeterminate));
|
||||
BOOST_CHECK(indeterminate(indeterminate != x));
|
||||
BOOST_CHECK(x == x);
|
||||
BOOST_CHECK(!(x != x));
|
||||
BOOST_CHECK(!(x && true));
|
||||
BOOST_CHECK(!(true && x));
|
||||
BOOST_CHECK(x || true);
|
||||
BOOST_CHECK(true || x);
|
||||
|
||||
BOOST_TEST(y);
|
||||
BOOST_TEST(y == true);
|
||||
BOOST_TEST(true == y);
|
||||
BOOST_TEST(y != false);
|
||||
BOOST_TEST(false != y);
|
||||
BOOST_TEST(indeterminate(y == indeterminate));
|
||||
BOOST_TEST(indeterminate(indeterminate == y));
|
||||
BOOST_TEST(indeterminate(y != indeterminate));
|
||||
BOOST_TEST(indeterminate(indeterminate != y));
|
||||
BOOST_TEST(y == y);
|
||||
BOOST_TEST(!(y != y));
|
||||
BOOST_CHECK(y);
|
||||
BOOST_CHECK(y == true);
|
||||
BOOST_CHECK(true == y);
|
||||
BOOST_CHECK(y != false);
|
||||
BOOST_CHECK(false != y);
|
||||
BOOST_CHECK(indeterminate(y == indeterminate));
|
||||
BOOST_CHECK(indeterminate(indeterminate == y));
|
||||
BOOST_CHECK(indeterminate(y != indeterminate));
|
||||
BOOST_CHECK(indeterminate(indeterminate != y));
|
||||
BOOST_CHECK(y == y);
|
||||
BOOST_CHECK(!(y != y));
|
||||
|
||||
BOOST_TEST(indeterminate(z || !z));
|
||||
BOOST_TEST(indeterminate(z == true));
|
||||
BOOST_TEST(indeterminate(true == z));
|
||||
BOOST_TEST(indeterminate(z == false));
|
||||
BOOST_TEST(indeterminate(false == z));
|
||||
BOOST_TEST(indeterminate(z == indeterminate));
|
||||
BOOST_TEST(indeterminate(indeterminate == z));
|
||||
BOOST_TEST(indeterminate(z != indeterminate));
|
||||
BOOST_TEST(indeterminate(indeterminate != z));
|
||||
BOOST_TEST(indeterminate(z == z));
|
||||
BOOST_TEST(indeterminate(z != z));
|
||||
BOOST_CHECK(indeterminate(z || !z));
|
||||
BOOST_CHECK(indeterminate(z == true));
|
||||
BOOST_CHECK(indeterminate(true == z));
|
||||
BOOST_CHECK(indeterminate(z == false));
|
||||
BOOST_CHECK(indeterminate(false == z));
|
||||
BOOST_CHECK(indeterminate(z == indeterminate));
|
||||
BOOST_CHECK(indeterminate(indeterminate == z));
|
||||
BOOST_CHECK(indeterminate(z != indeterminate));
|
||||
BOOST_CHECK(indeterminate(indeterminate != z));
|
||||
BOOST_CHECK(indeterminate(z == z));
|
||||
BOOST_CHECK(indeterminate(z != z));
|
||||
|
||||
BOOST_TEST(!(x == y));
|
||||
BOOST_TEST(x != y);
|
||||
BOOST_TEST(indeterminate(x == z));
|
||||
BOOST_TEST(indeterminate(x != z));
|
||||
BOOST_TEST(indeterminate(y == z));
|
||||
BOOST_TEST(indeterminate(y != z));
|
||||
BOOST_CHECK(!(x == y));
|
||||
BOOST_CHECK(x != y);
|
||||
BOOST_CHECK(indeterminate(x == z));
|
||||
BOOST_CHECK(indeterminate(x != z));
|
||||
BOOST_CHECK(indeterminate(y == z));
|
||||
BOOST_CHECK(indeterminate(y != z));
|
||||
|
||||
BOOST_TEST(!(x && y));
|
||||
BOOST_TEST(x || y);
|
||||
BOOST_TEST(!(x && z));
|
||||
BOOST_TEST(indeterminate(y && z));
|
||||
BOOST_TEST(indeterminate(z && z));
|
||||
BOOST_TEST(indeterminate(z || z));
|
||||
BOOST_TEST(indeterminate(x || z));
|
||||
BOOST_TEST(y || z);
|
||||
BOOST_CHECK(!(x && y));
|
||||
BOOST_CHECK(x || y);
|
||||
BOOST_CHECK(!(x && z));
|
||||
BOOST_CHECK(indeterminate(y && z));
|
||||
BOOST_CHECK(indeterminate(z && z));
|
||||
BOOST_CHECK(indeterminate(z || z));
|
||||
BOOST_CHECK(indeterminate(x || z));
|
||||
BOOST_CHECK(y || z);
|
||||
|
||||
BOOST_TEST(indeterminate(y && indeterminate));
|
||||
BOOST_TEST(indeterminate(indeterminate && y));
|
||||
BOOST_TEST(!(x && indeterminate));
|
||||
BOOST_TEST(!(indeterminate && x));
|
||||
BOOST_CHECK(indeterminate(y && indeterminate));
|
||||
BOOST_CHECK(indeterminate(indeterminate && y));
|
||||
BOOST_CHECK(!(x && indeterminate));
|
||||
BOOST_CHECK(!(indeterminate && x));
|
||||
|
||||
BOOST_TEST(indeterminate || y);
|
||||
BOOST_TEST(y || indeterminate);
|
||||
BOOST_TEST(indeterminate(x || indeterminate));
|
||||
BOOST_TEST(indeterminate(indeterminate || x));
|
||||
BOOST_CHECK(indeterminate || y);
|
||||
BOOST_CHECK(y || indeterminate);
|
||||
BOOST_CHECK(indeterminate(x || indeterminate));
|
||||
BOOST_CHECK(indeterminate(indeterminate || x));
|
||||
|
||||
// Test the if (z) ... else (!z) ... else ... idiom
|
||||
if (z) {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
else if (!z) {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
else {
|
||||
BOOST_TEST(true);
|
||||
BOOST_CHECK(true);
|
||||
}
|
||||
|
||||
z = true;
|
||||
if (z) {
|
||||
BOOST_TEST(true);
|
||||
BOOST_CHECK(true);
|
||||
}
|
||||
else if (!z) {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
else {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
|
||||
z = false;
|
||||
if (z) {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
else if (!z) {
|
||||
BOOST_TEST(true);
|
||||
BOOST_CHECK(true);
|
||||
}
|
||||
else {
|
||||
BOOST_TEST(false);
|
||||
BOOST_CHECK(false);
|
||||
}
|
||||
|
||||
std::cout << "no errors detected\n";
|
||||
|
Reference in New Issue
Block a user