Update of /cvsroot/mockpp/mockpp/mockpp/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/mockpp/examples
Modified Files:
mock_greeter.cpp
Log Message:
select test framework
Index: mock_greeter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/mock_greeter.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mock_greeter.cpp 18 Dec 2005 16:56:23 -0000 1.20
+++ mock_greeter.cpp 28 Dec 2005 09:23:30 -0000 1.21
@@ -36,7 +36,7 @@
#include <iostream>
-#if defined(HAVE_CXXTEST)
+#if defined(MOCKPP_USE_CXXTEST)
#include <cxxtest/TestRunner.h>
@@ -55,7 +55,7 @@
# include <cxxtest/ErrorPrinter.h>
#endif
-#elif defined(HAVE_CPPUNIT)
+#elif defined(MOCKPP_USE_CPPUNIT)
# include <cppunit/extensions/HelperMacros.h>
# include <cppunit/extensions/TestFactoryRegistry.h>
@@ -282,9 +282,9 @@
{
public:
-#if defined (HAVE_CXXTEST)
+#if defined (MOCKPP_USE_CXXTEST)
-#elif defined(HAVE_CPPUNIT)
+#elif defined(MOCKPP_USE_CPPUNIT)
CPPUNIT_TEST_SUITE( Streamer_test );
@@ -298,7 +298,7 @@
CPPUNIT_TEST_SUITE_END();
-#endif // HAVE_CPPUNIT
+#endif // MOCKPP_USE_CPPUNIT
public:
@@ -313,7 +313,7 @@
};
-#if defined (HAVE_CXXTEST)
+#if defined (MOCKPP_USE_CXXTEST)
MOCKPP_CXXTEST_SUITE_REGISTRATION( Streamer_test );
@@ -325,11 +325,11 @@
MOCKPP_CXXTEST(Streamer_test, fail_missing_close);
MOCKPP_CXXTEST(Streamer_test, fail_missing_close_on_error);
-#elif defined(HAVE_CPPUNIT)
+#elif defined(MOCKPP_USE_CPPUNIT)
CPPUNIT_TEST_SUITE_REGISTRATION(Streamer_test);
-#endif // HAVE_CPPUNIT
+#endif // MOCKPP_USE_CPPUNIT
void Streamer_test::test_write_ok()
@@ -450,7 +450,7 @@
MOCKPP_ASSERT_TRUE(thrown == true);
}
-#if defined(HAVE_CXXTEST)
+#if defined(MOCKPP_USE_CXXTEST)
int run_cxxtest(int argc, char **argv)
{
@@ -468,7 +468,7 @@
#endif
}
-#elif defined(HAVE_CPPUNIT)
+#elif defined(MOCKPP_USE_CPPUNIT)
int run_cppunit(int argc, char **argv)
{
@@ -484,11 +484,11 @@
{
int ret = 1;
-#if defined(HAVE_CXXTEST)
+#if defined(MOCKPP_USE_CXXTEST)
ret = run_cxxtest(argc, argv);
-#elif defined(HAVE_CPPUNIT)
+#elif defined(MOCKPP_USE_CPPUNIT)
ret = run_cppunit(argc, argv);
|
