X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=test%2Fcore%2Fmain.cpp;h=bdff0994837c1b8de086f5b640e2acf43aaea847;hp=c32916fa54c18aa46e7d902af6eb637136d55f2b;hb=63c74af5519ae3db82627b9cd3b36bb2cfa3bd72;hpb=4b79e398beb48eaa5c96b914b84e9fe77dea9da4 diff --git a/test/core/main.cpp b/test/core/main.cpp index c32916f..bdff099 100644 --- a/test/core/main.cpp +++ b/test/core/main.cpp @@ -5,12 +5,6 @@ // See project site at http://redmine.teslayout.com/projects/anna-suite // // See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // - -#define BOOST_TEST_MODULE ANNA_CORE_TEST - -#include -#include - #include #include @@ -21,63 +15,63 @@ #include #include +#include + + using namespace std; using namespace anna; -// see http://www.boost.org/doc/libs/1_44_0/libs/test/doc/html/utf/testing-tools.html -// http://www.boost.org/doc/libs/1_44_0/libs/test/doc/html/utf/testing-tools/reference.html -BOOST_AUTO_TEST_CASE(tokenizer) { +TEST(core, tokenizer) { anna::Tokenizer lst; lst.apply("In three words", " "); - //BOOST_REQUIRE(lst.size() == 3); - BOOST_REQUIRE_EQUAL(lst.size(), 3); + EXPECT_EQ(lst.size(), 3); anna::Tokenizer::const_iterator tok_iter(lst.begin()); - BOOST_REQUIRE_EQUAL(anna::Tokenizer::data(tok_iter++), "In"); - BOOST_REQUIRE_EQUAL(anna::Tokenizer::data(tok_iter++), "three"); - BOOST_REQUIRE_EQUAL(anna::Tokenizer::data(tok_iter++), "words"); - BOOST_REQUIRE_EQUAL(tok_iter, lst.end()); - BOOST_CHECK_THROW(lst.at(10), anna::RuntimeException); + ASSERT_STREQ(anna::Tokenizer::data(tok_iter++), "In"); + ASSERT_STREQ(anna::Tokenizer::data(tok_iter++), "three"); + ASSERT_STREQ(anna::Tokenizer::data(tok_iter++), "words"); + EXPECT_EQ(tok_iter, lst.end()); + ASSERT_THROW(lst.at(10), anna::RuntimeException); lst.apply("In three words", ","); - BOOST_REQUIRE_EQUAL(lst.size(), 1); + EXPECT_EQ(lst.size(), 1); lst.apply("", ","); - BOOST_REQUIRE_EQUAL(lst.size(), 0); - BOOST_CHECK_THROW(lst.last(), anna::RuntimeException); + EXPECT_EQ(lst.size(), 0); + ASSERT_THROW(lst.last(), anna::RuntimeException); // std::string str = ""; // for (int k = 0; k < 100; k++) // str += "x "; -// BOOST_CHECK_THROW(lst.apply(str, " "), anna::RuntimeException); +// ASSERT_THROW(lst.apply(str, " "), anna::RuntimeException); } -BOOST_AUTO_TEST_CASE(functions_asString) { +TEST(core, functions_asString) { std::string msg = anna::functions::asString("One %s has %d legs. Two %s have %d legs", "horse", 4, "horses", 8); - BOOST_REQUIRE_EQUAL(msg, "One horse has 4 legs. Two horses have 8 legs"); + EXPECT_EQ(msg, "One horse has 4 legs. Two horses have 8 legs"); char cad_aux[128]; sprintf(cad_aux, "%d", 123); - BOOST_REQUIRE_EQUAL(anna::functions::asString(123), cad_aux); + EXPECT_EQ(anna::functions::asString(123), cad_aux); unsigned long ul = 43200111UL; sprintf(cad_aux, "%lu", ul); - BOOST_REQUIRE_EQUAL(anna::functions::asString(ul), cad_aux); + EXPECT_EQ(anna::functions::asString(ul), cad_aux); unsigned long long ull = 4321000111ULL; sprintf(cad_aux, "%llu", ull); - BOOST_REQUIRE_EQUAL(anna::functions::asString(ull), cad_aux); + EXPECT_EQ(anna::functions::asString(ull), cad_aux); U64 u64 = ull; - BOOST_REQUIRE_EQUAL(anna::functions::asString(u64), cad_aux); + EXPECT_EQ(anna::functions::asString(u64), cad_aux); unsigned int ui = 1234567890U; sprintf(cad_aux, "%u", ui); - BOOST_REQUIRE_EQUAL(anna::functions::asString(ui), cad_aux); + EXPECT_EQ(anna::functions::asString(ui), cad_aux); float f = 123.34; double d = 3.1415; sprintf(cad_aux, "%4.2f", f); - BOOST_REQUIRE_EQUAL(anna::functions::asString(f, "%4.2f"), cad_aux); + EXPECT_EQ(anna::functions::asString(f, "%4.2f"), cad_aux); sprintf(cad_aux, "%4.2f", d); - BOOST_REQUIRE_EQUAL(anna::functions::asString(d, "%4.2f"), cad_aux); + EXPECT_EQ(anna::functions::asString(d, "%4.2f"), cad_aux); } -BOOST_AUTO_TEST_CASE(configuration) { +TEST(core, configuration) { anna::Configuration conf; - BOOST_CHECK_THROW(conf.load("missing_file.cnf"), anna::RuntimeException); - BOOST_CHECK_NO_THROW(conf.load("test/core/example.cnf")); + ASSERT_THROW(conf.load("missing_file.cnf"), anna::RuntimeException); + ASSERT_NO_THROW(conf.load("test/core/example.cnf")); //[ property ] //thing = tshirt //size = 1 @@ -85,32 +79,39 @@ BOOST_AUTO_TEST_CASE(configuration) { //[ owner ] //name = edu //address = madrid - BOOST_CHECK_THROW(conf.getValue("property", "WRONG_VAR"), anna::RuntimeException); - BOOST_CHECK_THROW(conf.getValue("WRONG_SECTION", "thing"), anna::RuntimeException); + ASSERT_THROW(conf.getValue("property", "WRONG_VAR"), anna::RuntimeException); + ASSERT_THROW(conf.getValue("WRONG_SECTION", "thing"), anna::RuntimeException); std::string value; - BOOST_REQUIRE_EQUAL(value = conf.getValue("property", "thing"), "tshirt"); - BOOST_REQUIRE_EQUAL(conf.getIntegerValue("property", "size"), 1); - BOOST_REQUIRE_EQUAL(std::string(conf.getValue("property", "color")), "blue"); - BOOST_REQUIRE_EQUAL(std::string(conf.getValue("owner", "name")), "edu"); - BOOST_REQUIRE_EQUAL(std::string(conf.getValue("owner", "address")), "madrid"); + EXPECT_EQ(value = conf.getValue("property", "thing"), "tshirt"); + EXPECT_EQ(conf.getIntegerValue("property", "size"), 1); + EXPECT_EQ(std::string(conf.getValue("property", "color")), "blue"); + EXPECT_EQ(std::string(conf.getValue("owner", "name")), "edu"); + EXPECT_EQ(std::string(conf.getValue("owner", "address")), "madrid"); conf.setDefaultValue("owner", "phone", "555 55 55"); - BOOST_REQUIRE_EQUAL(std::string(conf.getValue("owner", "phone")), "555 55 55"); - BOOST_REQUIRE(!conf.getValue("owner", "phone", true) /* query value is NULL: 'true = strict' even with default value assigned */); - BOOST_REQUIRE(!conf.exists("owner", "phone")); - BOOST_REQUIRE(conf.exists("owner", "name")); + EXPECT_EQ(std::string(conf.getValue("owner", "phone")), "555 55 55"); + EXPECT_TRUE(!conf.getValue("owner", "phone", true)); // query value is NULL: 'true = strict' even with default value assigned + EXPECT_TRUE(!conf.exists("owner", "phone")); + EXPECT_TRUE(conf.exists("owner", "name")); } -BOOST_AUTO_TEST_CASE(environment) { +TEST(core, environment) { anna::Environment &env = anna::Environment::instantiate(); env.initialize(); - BOOST_CHECK_THROW(env.getValue("WRONG_ENV_VAR", true), anna::RuntimeException); // true => exception if missing - BOOST_CHECK_THROW(env.getValue(NULL), anna::RuntimeException); + ASSERT_THROW(env.getValue("WRONG_ENV_VAR", true), anna::RuntimeException); // true => exception if missing + ASSERT_THROW(env.getValue(NULL), anna::RuntimeException); env.setVariable("TEST_VAR", "my test var value"); - BOOST_REQUIRE_EQUAL(env.getValue("TEST_VAR"), std::string("my test var value")); - env.setVariable("TEST_VAR", "my new test var value", false /* no overwritting */); - BOOST_REQUIRE_EQUAL(env.getValue("TEST_VAR"), std::string("my test var value")); + EXPECT_EQ(env.getValue("TEST_VAR"), std::string("my test var value")); + env.setVariable("TEST_VAR", "my new test var value", false); // false: no overwritting + EXPECT_EQ(env.getValue("TEST_VAR"), std::string("my test var value")); env.unsetVariable("TEST_VAR"); - BOOST_REQUIRE_EQUAL(env.getValue("TEST_VAR"), std::string("")); - BOOST_REQUIRE_EQUAL(env.getValue("MISSING_ENV_VAR"), std::string("")); + EXPECT_EQ(env.getValue("TEST_VAR"), std::string("")); + EXPECT_EQ(env.getValue("MISSING_ENV_VAR"), std::string("")); +} + + +int main(int argc, char **argv) +{ + testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); }