Changeset 7fff6c

Timestamp:

Feb 14, 2011, 10:10:40 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

d3926b5

Parents:

2d6ae0

git-author:

Frederik Heber <heber@…> (02/14/11 22:07:29)

git-committer:

Frederik Heber <heber@…> (02/14/11 22:10:40)

Message:

Default Assert behavior is Abort, not Ask. Added LOG() macro.

• Library version is now 4:0:3, API version is still 1.0.8.
• default behavior of Abort is more approriate, e.g. for unit tests are much more abundant that main (interactive) programs.
• added ELOG(), LOG() macro in place for DoLog(x) && (Log() << Verbose ...

Files:

• configure.ac (modified) (2 diffs)
• src/Helpers/Assert.cpp (modified) (1 diff)
• src/Helpers/Log.hpp (modified) (1 diff)
• src/unittests/LogUnitTest.cpp (modified) (1 diff)

configure.ac

@@ -3 +3 @@
 
 AC_PREREQ([2.65])
-AC_INIT([CodePatterns], [1.0.7], [heber@ins.uni-bonn.de], [codepatterns], [http://trac.ins.uni-bonn.de/projects/CodePatterns/])
+AC_INIT([CodePatterns], [1.0.8], [heber@ins.uni-bonn.de], [codepatterns], [http://trac.ins.uni-bonn.de/projects/CodePatterns/])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR([src/Patterns/Singleton_impl.hpp])
@@ -25 +25 @@
 # refer to the libtool manual, section "Updating library version information":
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([CODEPATTERNS_SO_VERSION], [4:0:2])
-AC_SUBST([CODEPATTERNS_API_VERSION], [1.0.7])
+AC_SUBST([CODEPATTERNS_SO_VERSION], [4:0:3])
+AC_SUBST([CODEPATTERNS_API_VERSION], [1.0.8])
 
 # Checks for libraries.

src/Helpers/Assert.cpp

@@ -66 +66 @@
 #endif
 
-Assert::Action Assert::_my_assert::defaultAction = Ask;
+Assert::Action Assert::_my_assert::defaultAction = Abort;
 std::vector<Assert::hook_t> Assert::_my_assert::hooks;
 

src/Helpers/Log.hpp

@@ -16 +16 @@
 #include "errorlogger.hpp"
 #include "logger.hpp"
+#include "Verbose.hpp"
+
+#define LOG(level,msg) DoLog(level) && (Log() << Verbose(level) << msg << std::endl)
+#define ELOG(level,msg) DoeLog(level) && (eLog() << Verbose(level) << msg << std::endl)
 
 class logger & Log();

src/unittests/LogUnitTest.cpp

@@ -53 +53 @@
 {
   logger::getInstance().setVerbosity(2);
+  // long form
   DoLog(0) && (Log() << Verbose(0) << "Verbosity level is set to 2." << endl);
-  DoLog(0) && (Log() << Verbose(0) << "Test level 0" << endl);
-  DoLog(1) && (Log() << Verbose(1) << "Test level 1" << endl);
-  DoLog(2) && (Log() << Verbose(2) << "Test level 2" << endl);
-  DoLog(3) && (Log() << Verbose(3) << "Test level 3" << endl);
-  DoLog(4) && (Log() << Verbose(4) << "Test level 4" << endl);
+  // shortform via macro
+  LOG(0,"Test level 0");
+  LOG(1,"Test level 1");
+  LOG(2,"Test level 2");
+  LOG(3,"Test level 3");
+  LOG(4,"Test level 4");
 
   DoLog(0) && (Log() << Verbose(0) << "Output a log message." << endl);
   DoeLog(0) && (eLog()<< Verbose(0) << "Output an error message." << endl);
+  CPPUNIT_ASSERT(DoLog(0));
   setVerbosity(3);
   DoLog(4) && (Log() << Verbose(4) << "This should not be printed." << endl);
   DoeLog(4) && (eLog()<< Verbose(4) << "This should not be printed." << endl);
+  CPPUNIT_ASSERT(!DoLog(4));
+  CPPUNIT_ASSERT(!DoeLog(4));
 };