[Mockpp-commits] mockpp/mockpp/framework CxxTestRunner.h,1.5,1.6 VerifyingTestCaller.cpp,1.3,1.4 VerifyingTestCaller.h,1.5,1.6 VerifyingTestCase.cpp,1.4,1.5 VerifyingTestCase.h,1.5,1.6

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

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

Modified Files:
	CxxTestRunner.h VerifyingTestCaller.cpp VerifyingTestCaller.h 
	VerifyingTestCase.cpp VerifyingTestCase.h 
Log Message:
optionally disable mockpp namespace

Index: VerifyingTestCase.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VerifyingTestCase.cpp	29 Dec 2005 19:29:51 -0000	1.4
+++ VerifyingTestCase.cpp	15 Mar 2006 21:34:05 -0000	1.5
@@ -46,7 +46,7 @@
 #include <cppunit/TestResult.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT VerifyingTestCase::VerifyingTestCase()
@@ -110,7 +110,7 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_USE_CPPUNIT

Index: VerifyingTestCaller.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- VerifyingTestCaller.cpp	29 Dec 2005 19:29:51 -0000	1.3
+++ VerifyingTestCaller.cpp	15 Mar 2006 21:34:05 -0000	1.4
@@ -32,10 +32,10 @@
 #include <mockpp/framework/VerifyingTestCaller.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 // is a template
 
 
-} // namespace mockpp
+MOCKPP_NS_END

Index: VerifyingTestCaller.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- VerifyingTestCaller.h	3 Jan 2006 15:12:34 -0000	1.5
+++ VerifyingTestCaller.h	15 Mar 2006 21:34:05 -0000	1.6
@@ -41,7 +41,7 @@
 #include <cppunit/TestCaller.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** VerifyingTestCaller that verifies Verifiable
@@ -128,7 +128,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 /** Add a method to the suite and verify after its run.
@@ -141,7 +141,7 @@
   */
 #define MOCKPP_VERIFYING_TEST( testMethod ) \
     CPPUNIT_TEST_SUITE_ADD_TEST(  \
-        ( new mockpp::VerifyingTestCaller<TestFixtureType, true>( \
+        ( new MOCKPP_NS::VerifyingTestCaller<TestFixtureType, true>( \
                   context.getTestNameFor( #testMethod),   \
                   &TestFixtureType::testMethod,           \
                   context.makeFixture() ) ) )
@@ -156,7 +156,7 @@
   */
 #define MOCKPP_TEST( testMethod ) \
     CPPUNIT_TEST_SUITE_ADD_TEST(  \
-        ( new mockpp::VerifyingTestCaller<TestFixtureType, false>( \
+        ( new MOCKPP_NS::VerifyingTestCaller<TestFixtureType, false>( \
                   context.getTestNameFor( #testMethod),   \
                   &TestFixtureType::testMethod,           \
                   context.makeFixture() ) ) )
@@ -175,7 +175,7 @@
 #define MOCKPP_VERIFYING_TEST_EXCEPTION( testMethod, ExceptionType )  \
   CPPUNIT_TEST_SUITE_ADD_TEST(                                        \
       (new ::CppUnit::ExceptionTestCaseDecorator< ExceptionType >(      \
-          new mockpp::VerifyingTestCaller< TestFixtureType, true >(   \
+          new MOCKPP_NS::VerifyingTestCaller< TestFixtureType, true >(   \
                                context.getTestNameFor( #testMethod ), \
                                &TestFixtureType::testMethod,          \
                                context.makeFixture() ) ) ) )
@@ -192,7 +192,7 @@
 #define MOCKPP_TEST_EXCEPTION( testMethod, ExceptionType )  \
   CPPUNIT_TEST_SUITE_ADD_TEST(                                        \
       (new ::CppUnit::ExceptionTestCaseDecorator< ExceptionType >(      \
-          new mockpp::VerifyingTestCaller< TestFixtureType, false >(  \
+          new MOCKPP_NS::VerifyingTestCaller< TestFixtureType, false >(  \
                                context.getTestNameFor( #testMethod ), \
                                &TestFixtureType::testMethod,          \
                                context.makeFixture() ) ) ) )

Index: VerifyingTestCase.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- VerifyingTestCase.h	3 Jan 2006 15:12:34 -0000	1.5
+++ VerifyingTestCase.h	15 Mar 2006 21:34:05 -0000	1.6
@@ -45,7 +45,7 @@
 #include <cppunit/TestCaller.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** TestCase that verifies Verifiable
@@ -101,7 +101,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_VerifyingTestCaller_H

Index: CxxTestRunner.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CxxTestRunner.h	3 Jan 2006 15:12:34 -0000	1.5
+++ CxxTestRunner.h	15 Mar 2006 21:34:05 -0000	1.6
@@ -39,7 +39,7 @@
 #include <cxxtest/TestRunner.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Helper class to run tests with CxxTest framework.
@@ -58,8 +58,8 @@
 
         _TS_TRY { CxxTestRunner().runWorld(); }
 
-        _TS_CATCH_TYPE( (mockpp::Exception &ex),
-                        {CxxTest::tracker().failedTest( mockpp::getLatin1(ex.getSrcFile()).c_str(), ex.getSrcLine(), mockpp::getLatin1(ex.getMessage()).c_str() ); } )
+        _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() ); } )
 
         _TS_CATCH_TYPE( (std::exception &ex),
                         {CxxTest::tracker().failedTest( __FILE__, __LINE__, ex.what() ); } )
@@ -71,7 +71,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_USE_CXXTEST