[Mockpp-commits] mockpp/mockpp/tests mock_test.cpp,1.38,1.39 mockpp_test.cpp,1.23,1.24

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

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

Modified Files:
	mock_test.cpp mockpp_test.cpp 
Log Message:
update

Index: mock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mock_test.cpp	2 Jan 2006 11:37:17 -0000	1.38
+++ mock_test.cpp	2 Jan 2006 15:40:22 -0000	1.39
@@ -29,6 +29,7 @@
 
 // Expected number of tests:
 //   8 cppunit specific
+//   9 unicode specific
 //   mock_test : 511
 //   jmock_test: 199
 
@@ -68,6 +69,8 @@
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/unit_test.hpp>
+#include <boost/test/unit_test_result.hpp>
+
 using namespace boost::unit_test_framework;
 
 #elif defined(MOCKPP_USE_CPPUNIT)
@@ -223,10 +226,10 @@
 
   std::cout << "  - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl;
   std::cout << "\n";
-
+/*
   std::cout << "Options\n";
   std::cout << "  --show-name        show method names before calling\n";
-
+*/
   test_suite* test = boost::unit_test_framework::detail::auto_unit_test_suite();
 
   /*
@@ -244,7 +247,7 @@
   */
 
   unit_test_log::instance().set_log_threshold_level(log_messages);
-
+//  unit_test_result::instance().detailed_report(std::cout);
   return test;
 }
 

Index: mockpp_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mockpp_test.cpp	1 Jan 2006 19:40:37 -0000	1.23
+++ mockpp_test.cpp	2 Jan 2006 15:40:22 -0000	1.24
@@ -34,7 +34,6 @@
 #include <mockpp/compat/Asserter.h>
 
 
-
 class mockpp_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK
 {
  public:
@@ -67,11 +66,15 @@
 #if defined (MOCKPP_USE_CXXTEST)
 
 MOCKPP_CXXTEST_SUITE_REGISTRATION( mockpp_test );
+#ifdef MOCKPP_UNICODE
 MOCKPP_CXXTEST(mockpp_test, test_unicode_latin1_conv);
+#endif
 
 #elif defined(MOCKPP_USE_BOOSTTEST)
 
+#ifdef MOCKPP_UNICODE
 MOCKPP_BOOST_TEST(mockpp_test::test_unicode_latin1_conv);
+#endif
 
 #elif defined(MOCKPP_USE_CPPUNIT)