Changeset 0e5675

Timestamp:

Apr 6, 2011, 4:05:13 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

e3ace2

Parents:

9ebc9d

git-author:

Frederik Heber <heber@…> (04/06/11 12:26:41)

git-committer:

Frederik Heber <heber@…> (04/06/11 16:05:13)

Message:

Removed Info usage in ChronosUnitTest.

• added dummy InfoStub.
• but test uses Chronos functions only, not via Info class (this is for InfoTest!).
• removed TESTLIB in Makefile.am, replaced by specific modules required.

Location:

src/Helpers/unittests

Files:

• ChronosUnitTest.cpp (modified) (3 diffs)
• Makefile.am (modified) (1 diff)
• stubs/InfoStub.cpp (added)

src/Helpers/unittests/ChronosUnitTest.cpp

@@ -25 +25 @@
 
 #include "Chronos.hpp"
-#include "Info.hpp"
 
 #include "ChronosUnitTest.hpp"
@@ -41 +40 @@
 void dummy()
 {
-  Info FunctionInfo(__func__);
+  Chronos::getInstance().startTiming(__func__);
   for (int i=0;i<10000000;++i)
     std::cout << "";
+  Chronos::getInstance().endTiming(__func__);
 }
 
 void dummy_two()
 {
-  Info FunctionInfo(__func__);
+  Chronos::getInstance().startTiming(__func__);
   for (int i=0;i<1000000;++i)
     std::cout << "";
+  Chronos::getInstance().endTiming(__func__);
 }
 
@@ -105 +106 @@
   // "inline" dummy
   {
-    Info DummyInfo("dummy_three");
+    Chronos::getInstance().startTiming("dummy_three");
     for (int i=0;i<1000000;++i)
       std::cout << "";
+    Chronos::getInstance().endTiming("dummy_three");
   }
   CPPUNIT_ASSERT( Chronos::getInstance().TimeRunning.find(std::string("dummy_three"))

src/Helpers/unittests/Makefile.am

@@ -32 +32 @@
 ChronosUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ChronosUnitTest.cpp \
-        ChronosUnitTest.hpp
-ChronosUnitTest_LDADD = ${TESTLIBS}
+        ChronosUnitTest.hpp \
+        stubs/InfoStub.cpp
+nodist_ChronosUnitTest_SOURCES = \
+        ../Assert.cpp \
+        ../Assert.hpp \
+        ../MemDebug.cpp \
+        ../MemDebug.hpp \
+        ../Chronos.cpp \
+        ../Chronos.hpp \
+        ../Info.hpp
+ChronosUnitTest_LDADD = \
+        $(BOOST_THREAD_LIB)
 
 InfoUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \