[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.39,1.40 mock_test.cpp,1.34,1.35

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171/mockpp/tests

Modified Files:
	AbstractDynamicChainingMock_test.cpp mock_test.cpp 
Log Message:
register boost tests

Index: AbstractDynamicChainingMock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- AbstractDynamicChainingMock_test.cpp	1 Jan 2006 10:27:22 -0000	1.39
+++ AbstractDynamicChainingMock_test.cpp	1 Jan 2006 11:17:28 -0000	1.40
@@ -101,6 +101,13 @@
 
 #elif defined(MOCKPP_USE_BOOSTTEST)
 
+MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_void_invocation );
+MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_invocation );
+MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_describer );
+MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_describe );
+MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_void_describe );
+MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_verify );
+
 #elif defined(MOCKPP_USE_CPPUNIT)
 
 CPPUNIT_TEST_SUITE_REGISTRATION ( AbstractDynamicChainingMock_test );

Index: mock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- mock_test.cpp	1 Jan 2006 10:27:23 -0000	1.34
+++ mock_test.cpp	1 Jan 2006 11:17:28 -0000	1.35
@@ -34,6 +34,12 @@
 
 #include <mockpp/mockpp.h> // always first
 
+/*
+#if defined(MOCKPP_USE_BOOSTTEST)
+# define BOOST_AUTO_TEST_MAIN  // before first Boost header
+#endif
+*/
+
 #include <iostream>
 #include <ctime>
 
@@ -60,7 +66,6 @@
 
 #elif defined(MOCKPP_USE_BOOSTTEST)
 
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/unit_test.hpp>
 using namespace boost::unit_test_framework;
@@ -176,6 +181,9 @@
 
 #if defined(MOCKPP_USE_BOOSTTEST)
 
+// alternatively use #define BOOST_AUTO_TEST_MAIN to
+// have the the default main created automatically
+
 test_suite*
 init_unit_test_suite( int argc, char* argv[] )
 {
@@ -190,7 +198,23 @@
   std::cout << "  - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl;
   std::cout << "\n";
 
-  test_suite* test= BOOST_TEST_SUITE( "const_string test" );
+  test_suite* test = boost::unit_test_framework::detail::auto_unit_test_suite();
+
+  /*
+    log_successful_tests     = 0,
+    log_test_suites          = 1,
+    log_messages             = 2,
+    log_warnings             = 3,
+    log_all_errors           = 4, // reported by unit test macros
+    log_cpp_exception_errors = 5, // uncaught C++ exceptions
+    log_system_errors        = 6, // including timeouts, signals, traps
+    log_fatal_errors         = 7, // including unit test macros or
+                                  // fatal system errors
+    log_progress_only        = 8, // only unit test progress to be reported
+    log_nothing              = 9
+  */
+
+  unit_test_log::instance().set_log_threshold_level(log_messages);
 
   return test;
 }