Changeset 5906 for branches/newapi

Timestamp:

12/02/07 19:59:40 (12 months ago)

Author:

erijo

Message:

Put test help class in LicqTest? namespace.

Location:

branches/newapi/licq/src/test

Files:

• CMakeLists.inc (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)
• log.cpp (added)
• log.h (modified) (3 diffs)
• recorder.cpp (modified) (2 diffs)
• recorder.h (modified) (3 diffs)

branches/newapi/licq/src/test/CMakeLists.inc

@@ -9 +9 @@
 set_target_properties(${testname} PROPERTIES LINK_FLAGS ${CMAKE_THREAD_LIBS_INIT})
 
+target_link_libraries(${testname} ${module})
 target_link_libraries(${testname} testlib)
-target_link_libraries(${testname} ${module})
 target_link_libraries(${testname} boost_unit_test_framework-mt)
 

branches/newapi/licq/src/test/CMakeLists.txt

@@ -1 +1 @@
 set(testlib_SRCS
+  log.cpp
   main.cpp
   recorder.cpp

branches/newapi/licq/src/test/log.h

@@ -18 +18 @@
  */
 
-#ifndef LOG_H
-#define LOG_H
+#ifndef LICQTEST_LOG_H
+#define LICQTEST_LOG_H
 
 #include "licq/interface/log.h"
@@ -25 +25 @@
 #include <iostream>
 
+namespace LicqTest
+{
+
+/**
+ * A log for unit-tests that prints to std::clog. The single instance
+ * of this class is returned from Licq::Log::getThreadLog().
+ */
 class Log : public Licq::Log
 {
@@ -37 +44 @@
     std::clog << msg << std::endl;
   }
+
+private:
+  Log() { /* Empty */ }
+  ~Log() { /* Empty */ }
+
+  friend class Licq::Log;
 };
 
+} // namespace LicqTest
+
 #endif

branches/newapi/licq/src/test/recorder.cpp

@@ -22 +22 @@
 #include <cassert>
 
-Recorder::~Recorder()
+LicqTest::Recorder::~Recorder()
 {
   assert(myQueue.empty());
 }
 
-void Recorder::push(const std::string& msg)
+void LicqTest::Recorder::push(const std::string& msg)
 {
   myQueue.push(msg);
 }
 
-std::string Recorder::pop()
+std::string LicqTest::Recorder::pop()
 {
   assert(!isEmpty());
@@ -42 +42 @@
 
 boost::test_tools::predicate_result
-Recorder::pop(const std::string& msg)
+LicqTest::Recorder::pop(const std::string& msg)
 {
   boost::test_tools::predicate_result res(false);

branches/newapi/licq/src/test/recorder.h

@@ -18 +18 @@
  */
 
-#ifndef RECORDER_H
-#define RECORDER_H
+#ifndef LICQTEST_RECORDER_H
+#define LICQTEST_RECORDER_H
 
 #include <boost/format.hpp>
 #include <boost/test/predicate_result.hpp>
 #include <queue>
+
+namespace LicqTest
+{
 
 class Recorder
@@ -44 +47 @@
 };
 
-inline void Recorder::push(const boost::format& msg)
+} // namespace LicqTest
+
+inline void LicqTest::Recorder::push(const boost::format& msg)
 {
   push(msg.str());
@@ -50 +55 @@
 
 inline boost::test_tools::predicate_result
-Recorder::pop(const boost::format& msg)
+LicqTest::Recorder::pop(const boost::format& msg)
 {
   return pop(msg.str());
 }
 
-inline bool Recorder::isEmpty() const
+inline bool LicqTest::Recorder::isEmpty() const
 {
   return myQueue.empty();
 }
 
-inline size_t Recorder::size() const
+inline size_t LicqTest::Recorder::size() const
 {
   return myQueue.size();