[Mockpp-commits] mockpp/mockpp/tests mock_test.cpp,1.42,1.43

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

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

Modified Files:
	mock_test.cpp 
Log Message:
optionally disable namespace

Index: mock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- mock_test.cpp	15 Mar 2006 21:34:08 -0000	1.42
+++ mock_test.cpp	19 Mar 2006 11:09:37 -0000	1.43
@@ -93,7 +93,7 @@
 
 #if defined(MOCKPP_USE_CXXTEST)
 
-class MyErrorPrinter : public CxxTest::ErrorPrinter
+class MyErrorPrinter : public CXXTEST_NS::ErrorPrinter
 {
   public:
 
@@ -101,12 +101,12 @@
      : show(showit)
     {}
 
-    void enterTest( const CxxTest::TestDescription &td )
+    void enterTest( const CXXTEST_NS::TestDescription &td )
     {
       if (show)
         std::cout << td.suiteName() << "::" << td.testName() << std::endl;
 
-      CxxTest::ErrorPrinter::enterTest(td);
+      CXXTEST_NS::ErrorPrinter::enterTest(td);
     }
 
   private:
@@ -117,11 +117,11 @@
 int run_cxxtest(int argc, char **argv)
 {
 #if defined(GUI_QT)
-  return CxxTest::GuiTuiRunner<CxxTest::QtGui, CxxTest::StdioPrinter>( argc, argv ).run();
+  return CXXTEST_NS::GuiTuiRunner<CXXTEST_NS::QtGui, CXXTEST_NS::StdioPrinter>( argc, argv ).run();
 #elif defined(GUI_X11)
-  return CxxTest::GuiTuiRunner<CxxTest::X11Gui, CxxTest::StdioPrinter>( argc, argv ).run();
+  return CXXTEST_NS::GuiTuiRunner<CXXTEST_NS::X11Gui, CXXTEST_NS::StdioPrinter>( argc, argv ).run();
 #elif defined(GUI_WIN32)
-  return CxxTest::GuiTuiRunner<CxxTest::Win32Gui, CxxTest::StdioPrinter>( argc, argv ).run();
+  return CXXTEST_NS::GuiTuiRunner<CXXTEST_NS::Win32Gui, CXXTEST_NS::StdioPrinter>( argc, argv ).run();
 #else
   bool show = false;
   for (int i1 = 1; i1 < argc; ++i1)
@@ -130,8 +130,8 @@
 
   MyErrorPrinter ep(show);
   MOCKPP_NS::CxxTestRunner::runAllTests(ep);
-  return CxxTest::tracker().failedTests();
-  //return CxxTest::ErrorPrinter().run();
+  return CXXTEST_NS::tracker().failedTests();
+  //return CXXTEST_NS::ErrorPrinter().run();
 #endif
 }