diff --git a/libwccl/values/bool.h b/libwccl/values/bool.h index 19b53c9ab64a3bd539a19b41b19bef13f4a3e4e6..23cb432afb1d9dda647c4ab33e81c74bb459d1ee 100644 --- a/libwccl/values/bool.h +++ b/libwccl/values/bool.h @@ -29,7 +29,7 @@ public: /// Value override std::string to_raw_string() const { - return val_ ? "true" : "false"; + return val_ ? "True" : "False"; } private: diff --git a/tests/constant_tests.cpp b/tests/constant_tests.cpp index 59f52aa053dea629078288f594612144f5a2542e..8939e9566a2f2a0981a77ae2179ccd220c1306f2 100644 --- a/tests/constant_tests.cpp +++ b/tests/constant_tests.cpp @@ -42,17 +42,17 @@ BOOST_FIXTURE_TEST_CASE(bool_apply, BoolFix) BOOST_FIXTURE_TEST_CASE(bool_to_string, BoolFix) { - BOOST_CHECK_EQUAL("true", true_value.to_string(tagset)); + BOOST_CHECK_EQUAL("True", true_value.to_string(tagset)); BOOST_CHECK_EQUAL(true_value.to_string(tagset), true_constant.to_string(tagset)); - BOOST_CHECK_EQUAL("false", false_value.to_string(tagset)); + BOOST_CHECK_EQUAL("False", false_value.to_string(tagset)); BOOST_CHECK_EQUAL(false_value.to_string(tagset), false_constant.to_string(tagset)); } BOOST_FIXTURE_TEST_CASE(bool_to_raw_string, BoolFix) { - BOOST_CHECK_EQUAL("true", true_value.to_raw_string()); + BOOST_CHECK_EQUAL("True", true_value.to_raw_string()); BOOST_CHECK_EQUAL(true_value.to_raw_string(), true_constant.to_raw_string()); - BOOST_CHECK_EQUAL("false", false_value.to_raw_string()); + BOOST_CHECK_EQUAL("False", false_value.to_raw_string()); BOOST_CHECK_EQUAL(false_value.to_raw_string(), false_constant.to_raw_string()); } diff --git a/tests/logicalpredicates.cpp b/tests/logicalpredicates.cpp index df8c12fd8d0ab2a4b8bd442036b9798fdc41e710..5bb4f21ab59b85e82a71de376bcae96d4c3aa478 100644 --- a/tests/logicalpredicates.cpp +++ b/tests/logicalpredicates.cpp @@ -172,19 +172,19 @@ BOOST_FIXTURE_TEST_CASE(and_to_string, PredFix) boost::shared_ptr<And::BoolFunctionPtrVector> v(new And::BoolFunctionPtrVector()); v->push_back(true_constant); boost::shared_ptr<Function<Bool> > pred_and(new And(v)); - BOOST_CHECK_EQUAL("and(true)", pred_and->to_string(tagset)); + BOOST_CHECK_EQUAL("and(True)", pred_and->to_string(tagset)); v->push_back(false_constant); - BOOST_CHECK_EQUAL("and(true, false)", pred_and->to_string(tagset)); + BOOST_CHECK_EQUAL("and(True, False)", pred_and->to_string(tagset)); v->push_back(true_constant); - BOOST_CHECK_EQUAL("and(true, false, true)", pred_and->to_string(tagset)); + BOOST_CHECK_EQUAL("and(True, False, True)", pred_and->to_string(tagset)); boost::shared_ptr<And::BoolFunctionPtrVector> v2(new And::BoolFunctionPtrVector()); v2->push_back(false_constant); v2->push_back(pred_and); And another_and(v2); - BOOST_CHECK_EQUAL("and(false, and(true, false, true))", another_and.to_string(tagset)); + BOOST_CHECK_EQUAL("and(False, and(True, False, True))", another_and.to_string(tagset)); v2->push_back(false_constant); - BOOST_CHECK_EQUAL("and(false, and(true, false, true), false)", another_and.to_string(tagset)); + BOOST_CHECK_EQUAL("and(False, and(True, False, True), False)", another_and.to_string(tagset)); } BOOST_FIXTURE_TEST_CASE(and_to_raw_string, PredFix) @@ -192,17 +192,17 @@ BOOST_FIXTURE_TEST_CASE(and_to_raw_string, PredFix) boost::shared_ptr<And::BoolFunctionPtrVector> v(new And::BoolFunctionPtrVector()); v->push_back(false_constant); boost::shared_ptr<Function<Bool> > pred_and(new And(v)); - BOOST_CHECK_EQUAL("and(false)", pred_and->to_raw_string()); + BOOST_CHECK_EQUAL("and(False)", pred_and->to_raw_string()); v->push_back(true_constant); - BOOST_CHECK_EQUAL("and(false, true)", pred_and->to_raw_string()); + BOOST_CHECK_EQUAL("and(False, True)", pred_and->to_raw_string()); v->push_back(true_constant); - BOOST_CHECK_EQUAL("and(false, true, true)", pred_and->to_raw_string()); + BOOST_CHECK_EQUAL("and(False, True, True)", pred_and->to_raw_string()); boost::shared_ptr<And::BoolFunctionPtrVector> v2(new And::BoolFunctionPtrVector()); v2->push_back(true_constant); v2->push_back(pred_and); And another_and(v2); - BOOST_CHECK_EQUAL("and(true, and(false, true, true))", another_and.to_raw_string()); + BOOST_CHECK_EQUAL("and(True, and(False, True, True))", another_and.to_raw_string()); } BOOST_FIXTURE_TEST_CASE(or_to_string, PredFix) @@ -210,19 +210,19 @@ BOOST_FIXTURE_TEST_CASE(or_to_string, PredFix) boost::shared_ptr<Or::BoolFunctionPtrVector> v(new Or::BoolFunctionPtrVector()); v->push_back(true_constant); boost::shared_ptr<Function<Bool> > pred_or(new Or(v)); - BOOST_CHECK_EQUAL("or(true)", pred_or->to_string(tagset)); + BOOST_CHECK_EQUAL("or(True)", pred_or->to_string(tagset)); v->push_back(false_constant); - BOOST_CHECK_EQUAL("or(true, false)", pred_or->to_string(tagset)); + BOOST_CHECK_EQUAL("or(True, False)", pred_or->to_string(tagset)); v->push_back(true_constant); - BOOST_CHECK_EQUAL("or(true, false, true)", pred_or->to_string(tagset)); + BOOST_CHECK_EQUAL("or(True, False, True)", pred_or->to_string(tagset)); boost::shared_ptr<Or::BoolFunctionPtrVector> v2(new Or::BoolFunctionPtrVector()); v2->push_back(pred_or); v2->push_back(false_constant); Or another_or(v2); - BOOST_CHECK_EQUAL("or(or(true, false, true), false)", another_or.to_string(tagset)); + BOOST_CHECK_EQUAL("or(or(True, False, True), False)", another_or.to_string(tagset)); v2->push_back(true_constant); - BOOST_CHECK_EQUAL("or(or(true, false, true), false, true)", another_or.to_string(tagset)); + BOOST_CHECK_EQUAL("or(or(True, False, True), False, True)", another_or.to_string(tagset)); } BOOST_FIXTURE_TEST_CASE(or_to_raw_string, PredFix) @@ -230,17 +230,17 @@ BOOST_FIXTURE_TEST_CASE(or_to_raw_string, PredFix) boost::shared_ptr<Or::BoolFunctionPtrVector> v(new Or::BoolFunctionPtrVector()); v->push_back(false_constant); boost::shared_ptr<Function<Bool> > pred_or(new Or(v)); - BOOST_CHECK_EQUAL("or(false)", pred_or->to_raw_string()); + BOOST_CHECK_EQUAL("or(False)", pred_or->to_raw_string()); v->push_back(true_constant); - BOOST_CHECK_EQUAL("or(false, true)", pred_or->to_raw_string()); + BOOST_CHECK_EQUAL("or(False, True)", pred_or->to_raw_string()); v->push_back(true_constant); - BOOST_CHECK_EQUAL("or(false, true, true)", pred_or->to_raw_string()); + BOOST_CHECK_EQUAL("or(False, True, True)", pred_or->to_raw_string()); boost::shared_ptr<Or::BoolFunctionPtrVector> v2(new Or::BoolFunctionPtrVector()); v2->push_back(true_constant); v2->push_back(pred_or); Or another_or(v2); - BOOST_CHECK_EQUAL("or(true, or(false, true, true))", another_or.to_raw_string()); + BOOST_CHECK_EQUAL("or(True, or(False, True, True))", another_or.to_raw_string()); } BOOST_FIXTURE_TEST_CASE(nor_to_string, PredFix) @@ -248,19 +248,19 @@ BOOST_FIXTURE_TEST_CASE(nor_to_string, PredFix) boost::shared_ptr<Nor::BoolFunctionPtrVector> v(new Nor::BoolFunctionPtrVector()); v->push_back(true_constant); boost::shared_ptr<Function<Bool> > pred_nor(new Nor(v)); - BOOST_CHECK_EQUAL("not(true)", pred_nor->to_string(tagset)); + BOOST_CHECK_EQUAL("not(True)", pred_nor->to_string(tagset)); v->push_back(false_constant); - BOOST_CHECK_EQUAL("not(true, false)", pred_nor->to_string(tagset)); + BOOST_CHECK_EQUAL("not(True, False)", pred_nor->to_string(tagset)); v->push_back(true_constant); - BOOST_CHECK_EQUAL("not(true, false, true)", pred_nor->to_string(tagset)); + BOOST_CHECK_EQUAL("not(True, False, True)", pred_nor->to_string(tagset)); boost::shared_ptr<Or::BoolFunctionPtrVector> v2(new Nor::BoolFunctionPtrVector()); v2->push_back(pred_nor); v2->push_back(false_constant); Nor another_nor(v2); - BOOST_CHECK_EQUAL("not(not(true, false, true), false)", another_nor.to_string(tagset)); + BOOST_CHECK_EQUAL("not(not(True, False, True), False)", another_nor.to_string(tagset)); v2->push_back(true_constant); - BOOST_CHECK_EQUAL("not(not(true, false, true), false, true)", another_nor.to_string(tagset)); + BOOST_CHECK_EQUAL("not(not(True, False, True), False, True)", another_nor.to_string(tagset)); } BOOST_FIXTURE_TEST_CASE(nor_to_raw_string, PredFix) @@ -268,17 +268,17 @@ BOOST_FIXTURE_TEST_CASE(nor_to_raw_string, PredFix) boost::shared_ptr<Or::BoolFunctionPtrVector> v(new Nor::BoolFunctionPtrVector()); v->push_back(false_constant); boost::shared_ptr<Function<Bool> > pred_nor(new Nor(v)); - BOOST_CHECK_EQUAL("not(false)", pred_nor->to_raw_string()); + BOOST_CHECK_EQUAL("not(False)", pred_nor->to_raw_string()); v->push_back(true_constant); - BOOST_CHECK_EQUAL("not(false, true)", pred_nor->to_raw_string()); + BOOST_CHECK_EQUAL("not(False, True)", pred_nor->to_raw_string()); v->push_back(true_constant); - BOOST_CHECK_EQUAL("not(false, true, true)", pred_nor->to_raw_string()); + BOOST_CHECK_EQUAL("not(False, True, True)", pred_nor->to_raw_string()); boost::shared_ptr<Nor::BoolFunctionPtrVector> v2(new Nor::BoolFunctionPtrVector()); v2->push_back(true_constant); v2->push_back(pred_nor); Nor another_nor(v2); - BOOST_CHECK_EQUAL("not(true, not(false, true, true))", another_nor.to_raw_string()); + BOOST_CHECK_EQUAL("not(True, not(False, True, True))", another_nor.to_raw_string()); } BOOST_AUTO_TEST_SUITE_END()