X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=test%2Fcore%2Fmain.cpp;h=d7b5b05a087498f9a2cdd98e9ac1563b0c6849bb;hb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;hp=d804ab06de73a84a83f3f31b021bd8bf63063b1f;hpb=bebea4009ed5a273fbf9ed3644a2140a8f477f99;p=anna.git

diff --git a/test/core/main.cpp b/test/core/main.cpp
index d804ab0..d7b5b05 100644
--- a/test/core/main.cpp
+++ b/test/core/main.cpp
@@ -1,4 +1,4 @@
-// ANNA - Anna is Not 'N' Anymore
+// ANNA - Anna is Not Nothingness Anymore
 //
 // (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
 //
@@ -55,26 +55,21 @@ using namespace anna;
 //     http://www.boost.org/doc/libs/1_44_0/libs/test/doc/html/utf/testing-tools/reference.html
 
 BOOST_AUTO_TEST_CASE(tokenizer) {
-
   anna::Tokenizer lst;
   lst.apply("In three words", " ");
   //BOOST_REQUIRE(lst.size() == 3);
   BOOST_REQUIRE_EQUAL(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_REQUIRE_EQUAL(tok_iter, lst.end());
   BOOST_CHECK_THROW(lst.at(10), anna::RuntimeException);
-
   lst.apply("In three words", ",");
   BOOST_REQUIRE_EQUAL(lst.size(), 1);
-
   lst.apply("", ",");
   BOOST_REQUIRE_EQUAL(lst.size(), 0);
   BOOST_CHECK_THROW(lst.last(), anna::RuntimeException);
-
 //  std::string str = "";
 //  for (int k = 0; k < 100; k++)
 //    str += "x ";
@@ -82,44 +77,34 @@ BOOST_AUTO_TEST_CASE(tokenizer) {
 }
 
 BOOST_AUTO_TEST_CASE(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");
-
   char cad_aux[128];
-  sprintf (cad_aux, "%d", 123);
+  sprintf(cad_aux, "%d", 123);
   BOOST_REQUIRE_EQUAL(anna::functions::asString(123), cad_aux);
-
   unsigned long ul = 43200111UL;
-  sprintf (cad_aux, "%lu", ul);
+  sprintf(cad_aux, "%lu", ul);
   BOOST_REQUIRE_EQUAL(anna::functions::asString(ul), cad_aux);
-
   unsigned long long ull = 4321000111ULL;
-  sprintf (cad_aux, "%llu", ull);
+  sprintf(cad_aux, "%llu", ull);
   BOOST_REQUIRE_EQUAL(anna::functions::asString(ull), cad_aux);
-
-  Unsigned64 u64 = ull;
+  U64 u64 = ull;
   BOOST_REQUIRE_EQUAL(anna::functions::asString(u64), cad_aux);
-
   unsigned int ui = 1234567890U;
-  sprintf (cad_aux, "%u", ui);
+  sprintf(cad_aux, "%u", ui);
   BOOST_REQUIRE_EQUAL(anna::functions::asString(ui), cad_aux);
-
   float f = 123.34;
   double d = 3.1415;
-  sprintf (cad_aux, "%4.2f", f);
+  sprintf(cad_aux, "%4.2f", f);
   BOOST_REQUIRE_EQUAL(anna::functions::asString(f, "%4.2f"), cad_aux);
-  sprintf (cad_aux, "%4.2f", d);
+  sprintf(cad_aux, "%4.2f", d);
   BOOST_REQUIRE_EQUAL(anna::functions::asString(d, "%4.2f"), cad_aux);
 }
 
 BOOST_AUTO_TEST_CASE(configuration) {
-
   anna::Configuration conf;
-
   BOOST_CHECK_THROW(conf.load("missing_file.cnf"), anna::RuntimeException);
   BOOST_CHECK_NO_THROW(conf.load("test/core/example.cnf"));
-  
   //[ property ]
   //thing = tshirt
   //size = 1
@@ -127,18 +112,14 @@ 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);
-
   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");
-
   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 */);
@@ -147,12 +128,16 @@ BOOST_AUTO_TEST_CASE(configuration) {
 }
 
 BOOST_AUTO_TEST_CASE(environment) {
-
   anna::Environment &env = anna::Environment::instantiate();
-
-  BOOST_CHECK_THROW(env.getValue("WRONG_ENV_VAR", true /* exception if missing */), anna::RuntimeException);
+  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);
-  BOOST_REQUIRE_EQUAL(env.getValue("HOME"), std::string("/home/eramos"));
+  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"));
+  env.unsetVariable("TEST_VAR");
+  BOOST_REQUIRE_EQUAL(env.getValue("TEST_VAR"), std::string(""));
   BOOST_REQUIRE_EQUAL(env.getValue("MISSING_ENV_VAR"), std::string(""));
 }