[Mockpp-commits] mockpp/mockpp/framework CxxTestRunner.h,1.6,1.7 CxxTestSupport.h,1.3,1.4 SelectUnittestFramework.h,1.13,1.14

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

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

Modified Files:
	CxxTestRunner.h CxxTestSupport.h SelectUnittestFramework.h 
Log Message:
optionally disable namespace

Index: CxxTestRunner.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CxxTestRunner.h	15 Mar 2006 21:34:05 -0000	1.6
+++ CxxTestRunner.h	19 Mar 2006 11:09:37 -0000	1.7
@@ -1,5 +1,5 @@
 /** @file
-    @brief  Run tests based on CxxTest::TestRunner
+    @brief  Run tests based on CXXTEST_NS::TestRunner
 
   $Id$
 
@@ -45,28 +45,28 @@
 /** Helper class to run tests with CxxTest framework.
   * @ingroup grp_framework
   */
-class CxxTestRunner : public CxxTest::TestRunner
+class CxxTestRunner : public CXXTEST_NS::TestRunner
 {
   public:
 
    /** Internal method wihich runs all the tests.
      * @param listener  pointer to test listener
      */
-    static void runAllTests( CxxTest::TestListener &listener )
+    static void runAllTests( CXXTEST_NS::TestListener &listener )
     {
-        CxxTest::tracker().setListener( &listener );
+        CXXTEST_NS::tracker().setListener( &listener );
 
         _TS_TRY { CxxTestRunner().runWorld(); }
 
         _TS_CATCH_TYPE( (MOCKPP_NS::Exception &ex),
-                        {CxxTest::tracker().failedTest( MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str(), ex.getSrcLine(), MOCKPP_NS::getLatin1(ex.getMessage()).c_str() ); } )
+                        {CXXTEST_NS::tracker().failedTest( MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str(), ex.getSrcLine(), MOCKPP_NS::getLatin1(ex.getMessage()).c_str() ); } )
 
         _TS_CATCH_TYPE( (std::exception &ex),
-                        {CxxTest::tracker().failedTest( __FILE__, __LINE__, ex.what() ); } )
+                        {CXXTEST_NS::tracker().failedTest( __FILE__, __LINE__, ex.what() ); } )
 
-        _TS_LAST_CATCH( { CxxTest::tracker().failedTest( __FILE__, __LINE__, "Exception thrown from world" ); } );
+        _TS_LAST_CATCH( { CXXTEST_NS::tracker().failedTest( __FILE__, __LINE__, "Exception thrown from world" ); } );
 
-        CxxTest::tracker().setListener( 0 );
+        CXXTEST_NS::tracker().setListener( 0 );
     }
 };
 

Index: SelectUnittestFramework.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SelectUnittestFramework.h	6 Jan 2006 12:17:35 -0000	1.13
+++ SelectUnittestFramework.h	19 Mar 2006 11:09:37 -0000	1.14
@@ -79,7 +79,7 @@
 #if defined(MOCKPP_USE_CXXTEST)
 //=================================================
 
-# define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CxxTest::TestSuite
+# define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CXXTEST_NS::TestSuite
 
 #define MOCKPP_TESTMETHOD_DECL /* static or not */
 

Index: CxxTestSupport.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestSupport.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CxxTestSupport.h	3 Jan 2006 15:12:34 -0000	1.3
+++ CxxTestSupport.h	19 Mar 2006 11:09:37 -0000	1.4
@@ -40,9 +40,9 @@
 #define MOCKPP_CXXTEST_SUITE_REGISTRATION(classname) \
   static classname suite_ ## classname; \
   \
-  static CxxTest::List tests_ ## classname = { 0, 0 }; \
+  static CXXTEST_NS::List tests_ ## classname = { 0, 0 }; \
   \
-  CxxTest::StaticSuiteDescription suiteDescription_ ## classname( __FILE__, \
+  CXXTEST_NS::StaticSuiteDescription suiteDescription_ ## classname( __FILE__, \
                                                                   __LINE__, \
                                                                   #classname, \
                                                                   suite_ ## classname, \
@@ -58,10 +58,10 @@
   */
 #define MOCKPP_CXXTEST(classname, meth) \
 static class TestDescription_ ## classname ## _ ## meth \
-  : public CxxTest::RealTestDescription { \
+  : public CXXTEST_NS::RealTestDescription { \
 public: \
  TestDescription_ ## classname ## _ ## meth() \
-   : CxxTest::RealTestDescription( tests_ ## classname, \
+   : CXXTEST_NS::RealTestDescription( tests_ ## classname, \
                                    suiteDescription_ ##classname, \
                                    __LINE__, \
                                    #meth ) \