[Mockpp-commits] mockpp/mockpp/framework CxxTestRunner.h,1.1,1.2 SelectUnittestFramework.h,1.3,1.4 VerifyingTestCaller.h,1.2,1.3 VerifyingTestCase.cpp,1.2,1.3 VerifyingTestCase.h,1.2,1.3

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

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

Modified Files:
	CxxTestRunner.h SelectUnittestFramework.h 
	VerifyingTestCaller.h VerifyingTestCase.cpp 
	VerifyingTestCase.h 
Log Message:
select test framework

Index: CxxTestRunner.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CxxTestRunner.h	10 Dec 2005 21:57:12 -0000	1.1
+++ CxxTestRunner.h	28 Dec 2005 09:23:30 -0000	1.2
@@ -32,7 +32,7 @@
 
 #include <mockpp/mockpp.h> // always first
 
-#if defined(HAVE_CXXTEST)
+#if defined(MOCKPP_USE_CXXTEST)
 
 #include <mockpp/compat/Exception.h>
 
@@ -68,7 +68,7 @@
 } // namespace mockpp
 
 
-#endif // HAVE_CXXTEST
+#endif // MOCKPP_USE_CXXTEST
 
 
 #endif // MOCKPP_CXXTESTRUNNER_H

Index: VerifyingTestCase.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VerifyingTestCase.cpp	10 Dec 2005 20:07:21 -0000	1.2
+++ VerifyingTestCase.cpp	28 Dec 2005 09:23:30 -0000	1.3
@@ -39,7 +39,7 @@
 #include <mockpp/compat/Formatter.h>
 #include <mockpp/compat/AssertionFailedError.h>
 
-#ifdef HAVE_CPPUNIT
+#ifdef MOCKPP_USE_CPPUNIT
 
 #include <cppunit/Exception.h>
 #include <cppunit/SourceLine.h>
@@ -113,5 +113,5 @@
 } // namespace mockpp
 
 
-#endif // HAVE_CPPUNIT
+#endif // MOCKPP_USE_CPPUNIT
 

Index: VerifyingTestCaller.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VerifyingTestCaller.h	10 Dec 2005 20:07:21 -0000	1.2
+++ VerifyingTestCaller.h	28 Dec 2005 09:23:30 -0000	1.3
@@ -36,7 +36,7 @@
 
 #include <mockpp/framework/VerifyingTestCase.h>
 
-#ifdef HAVE_CPPUNIT
+#ifdef MOCKPP_USE_CPPUNIT
 
 #include <cppunit/TestCaller.h>
 
@@ -196,7 +196,7 @@
                                &TestFixtureType::testMethod,          \
                                context.makeFixture() ) ) ) )
 
-#endif // HAVE_CPPUNIT
+#endif // MOCKPP_USE_CPPUNIT
 
 #endif // MOCKPP_VerifyingTestCaller_H
 

Index: VerifyingTestCase.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VerifyingTestCase.h	10 Dec 2005 20:07:21 -0000	1.2
+++ VerifyingTestCase.h	28 Dec 2005 09:23:30 -0000	1.3
@@ -40,7 +40,7 @@
 
 #include <mockpp/util/AutoPointer.h>
 
-#ifdef HAVE_CPPUNIT
+#ifdef MOCKPP_USE_CPPUNIT
 
 #include <cppunit/TestCaller.h>
 

Index: SelectUnittestFramework.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SelectUnittestFramework.h	11 Dec 2005 20:47:01 -0000	1.3
+++ SelectUnittestFramework.h	28 Dec 2005 09:23:30 -0000	1.4
@@ -30,7 +30,7 @@
 #ifndef MOCKPP_SELECTUNITTESTFRAMEWORK_H
 #define MOCKPP_SELECTUNITTESTFRAMEWORK_H
 
-#if defined(HAVE_CXXTEST)
+#if defined(MOCKPP_USE_CXXTEST)
 
 # define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CxxTest::TestSuite
 
@@ -52,7 +52,7 @@
 
 #include <mockpp/framework/CxxTestSupport.h>
 
-#elif defined(HAVE_CPPUNIT)
+#elif defined(MOCKPP_USE_CPPUNIT)
 
 # include <cppunit/extensions/HelperMacros.h>
 # define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CppUnit::TestFixture