[Mockpp-commits] mockpp/mockpp/tests ExpectationMap_test.cpp,1.25,1.26 mock_test.cpp,1.36,1.37 mockpp_pti_test.cpp,1.16,1.17 mockpp_test.cpp,1.22,1.23

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

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

Modified Files:
	ExpectationMap_test.cpp mock_test.cpp mockpp_pti_test.cpp 
	mockpp_test.cpp 
Log Message:
fix framework dependencies 

Index: ExpectationMap_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ExpectationMap_test.cpp	1 Jan 2006 16:34:47 -0000	1.25
+++ ExpectationMap_test.cpp	1 Jan 2006 19:40:37 -0000	1.26
@@ -29,6 +29,8 @@
 
 #include <mockpp/mockpp.h> // always first
 
+#include MOCKPP_VECTOR_H
+
 #include "SelectFramework.h"
 
 #include <mockpp/ExpectationMap.h>

Index: mockpp_pti_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_pti_test.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mockpp_pti_test.cpp	1 Jan 2006 16:34:49 -0000	1.16
+++ mockpp_pti_test.cpp	1 Jan 2006 19:40:37 -0000	1.17
@@ -95,21 +95,22 @@
 
 #if defined (MOCKPP_USE_CXXTEST)
 
-  MOCKPP_CXXTEST(mockpp_pti_test, test_coremock);
-  MOCKPP_CXXTEST(mockpp_pti_test, test_typeless);
-  MOCKPP_CXXTEST(mockpp_pti_test, test_lifo);
-  MOCKPP_CXXTEST(mockpp_pti_test, test_fifo);
-  MOCKPP_CXXTEST(mockpp_pti_test, test_invocation);
-  MOCKPP_CXXTEST(mockpp_pti_test, test_abstract);
+MOCKPP_CXXTEST_SUITE_REGISTRATION( mockpp_pti_test );
+MOCKPP_CXXTEST(mockpp_pti_test, test_coremock);
+MOCKPP_CXXTEST(mockpp_pti_test, test_typeless);
+MOCKPP_CXXTEST(mockpp_pti_test, test_lifo);
+MOCKPP_CXXTEST(mockpp_pti_test, test_fifo);
+MOCKPP_CXXTEST(mockpp_pti_test, test_invocation);
+MOCKPP_CXXTEST(mockpp_pti_test, test_abstract);
 
 #elif defined(MOCKPP_USE_BOOSTTEST)
 
-  MOCKPP_BOOST_TEST(mockpp_pti_test::test_coremock);
-  MOCKPP_BOOST_TEST(mockpp_pti_test::test_typeless);
-  MOCKPP_BOOST_TEST(mockpp_pti_test::test_lifo);
-  MOCKPP_BOOST_TEST(mockpp_pti_test::test_fifo);
-  MOCKPP_BOOST_TEST(mockpp_pti_test::test_invocation);
-  MOCKPP_BOOST_TEST(mockpp_pti_test::test_abstract);
+MOCKPP_BOOST_TEST(mockpp_pti_test::test_coremock);
+MOCKPP_BOOST_TEST(mockpp_pti_test::test_typeless);
+MOCKPP_BOOST_TEST(mockpp_pti_test::test_lifo);
+MOCKPP_BOOST_TEST(mockpp_pti_test::test_fifo);
+MOCKPP_BOOST_TEST(mockpp_pti_test::test_invocation);
+MOCKPP_BOOST_TEST(mockpp_pti_test::test_abstract);
 
 #elif defined(MOCKPP_USE_CPPUNIT)
 

Index: mock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mock_test.cpp	1 Jan 2006 16:34:49 -0000	1.36
+++ mock_test.cpp	1 Jan 2006 19:40:37 -0000	1.37
@@ -90,8 +90,34 @@
 
 #if defined(MOCKPP_USE_CXXTEST)
 
+class MyErrorPrinter : public CxxTest::ErrorPrinter
+{
+  public:
+
+    MyErrorPrinter(bool showit)
+     : show(showit)
+    {}
+
+    void enterTest( const CxxTest::TestDescription &td )
+    {
+      if (show)
+        std::cout << td.suiteName() << "::" << td.testName() << std::endl;
+
+      CxxTest::ErrorPrinter::enterTest(td);
+    }
+
+  private:
+
+   bool show;
+};
+
 int run_cxxtest(int argc, char **argv)
 {
+  bool show = false;
+  for (int i1 = 1; i1 < argc; ++i1)
+    if (strcmp (argv[1], "--show-name") == 0)
+      show = true;
+
 #if defined(GUI_QT)
   return CxxTest::GuiTuiRunner<CxxTest::QtGui, CxxTest::StdioPrinter>( argc, argv ).run();
 #elif defined(GUI_X11)
@@ -99,7 +125,7 @@
 #elif defined(GUI_WIN32)
   return CxxTest::GuiTuiRunner<CxxTest::Win32Gui, CxxTest::StdioPrinter>( argc, argv ).run();
 #else
-   CxxTest::ErrorPrinter ep;
+   MyErrorPrinter ep(show);
    mockpp::CxxTestRunner::runAllTests(ep);
    return CxxTest::tracker().failedTests();
    //return CxxTest::ErrorPrinter().run();
@@ -214,7 +240,7 @@
     log_nothing              = 9
   */
 
-  unit_test_log::instance().set_log_threshold_level(log_messages);
+  unit_test_log::instance().set_log_threshold_level(log_successful_tests);
 
   return test;
 }

Index: mockpp_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mockpp_test.cpp	1 Jan 2006 16:34:49 -0000	1.22
+++ mockpp_test.cpp	1 Jan 2006 19:40:37 -0000	1.23
@@ -66,8 +66,9 @@
 
 #if defined (MOCKPP_USE_CXXTEST)
 
+MOCKPP_CXXTEST_SUITE_REGISTRATION( mockpp_test );
 MOCKPP_CXXTEST(mockpp_test, test_unicode_latin1_conv);
-               
+
 #elif defined(MOCKPP_USE_BOOSTTEST)
 
 MOCKPP_BOOST_TEST(mockpp_test::test_unicode_latin1_conv);