[Mockpp-commits] mockpp/mockpp/tests IsInstanceOf_test.cpp,1.16,1.17 SelectFramework.h,1.4,1.5 VerifyingTestCase_test.cpp,1.20,1.21 mock_test.cpp,1.28,1.29

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

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

Modified Files:
	IsInstanceOf_test.cpp SelectFramework.h 
	VerifyingTestCase_test.cpp mock_test.cpp 
Log Message:
fixes/ports with bcb5

Index: VerifyingTestCase_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCase_test.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- VerifyingTestCase_test.cpp	11 Dec 2005 20:03:44 -0000	1.20
+++ VerifyingTestCase_test.cpp	17 Dec 2005 18:38:48 -0000	1.21
@@ -29,6 +29,8 @@
 
 #include <mockpp/mockpp.h> // always first
 
+#if defined(HAVE_CPPUNIT)
+
 #include "SelectFramework.h"
 
 #include <stdexcept>
@@ -48,7 +50,6 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestResult.h>
 
-
 namespace {
 
 
@@ -58,10 +59,6 @@
 
     VerifyingTestCase_test();
 
-#if defined (HAVE_CXXTEST)
-
-#elif defined(HAVE_CPPUNIT)
-
 CPPUNIT_TEST_SUITE( VerifyingTestCase_test );
 
       MOCKPP_TEST(test_register );
@@ -73,8 +70,6 @@
 
 CPPUNIT_TEST_SUITE_END();
 
-#endif
-
   public:
 
     unsigned m_setup;
@@ -206,8 +201,9 @@
   // missing actual
 }
 
-
 } // namespace
 
+#endif // HACE_CPPUNIT
+
 
 

Index: IsInstanceOf_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- IsInstanceOf_test.cpp	11 Dec 2005 20:03:44 -0000	1.16
+++ IsInstanceOf_test.cpp	17 Dec 2005 18:38:48 -0000	1.17
@@ -35,9 +35,6 @@
 
 #include <mockpp/compat/Assert.h>
 
-#include <cppunit/extensions/HelperMacros.h>
-#include <iostream>
-
 #ifndef MOCKPP_NO_RTTI
 
 class IsInstanceOf_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK

Index: mock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mock_test.cpp	11 Dec 2005 20:03:44 -0000	1.28
+++ mock_test.cpp	17 Dec 2005 18:38:48 -0000	1.29
@@ -178,10 +178,6 @@
 
   std::cout << "  - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl;
   std::cout << "\n";
-  std::cout << "Options\n";
-  std::cout << "  --show-name        show method names before calling\n";
-  std::cout << "  --compiler-output  output similar to compilers\n";
-  std::cout << "\n";
 
 #if defined(HAVE_CXXTEST)
 
@@ -189,8 +185,14 @@
 
 #elif defined(HAVE_CPPUNIT)
 
+  std::cout << "Options\n";
+  std::cout << "  --show-name        show method names before calling\n";
+  std::cout << "  --compiler-output  output similar to compilers\n";
+
   ret = run_cppunit(argc, argv);
 
+  std::cout << "\n";
+
 #endif
 
   std::cout << "Result: " << ret << std::endl << std::endl;

Index: SelectFramework.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/SelectFramework.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SelectFramework.h	10 Dec 2005 20:07:22 -0000	1.4
+++ SelectFramework.h	17 Dec 2005 18:38:48 -0000	1.5
@@ -1 +1,2 @@
 #include <mockpp/framework/SelectUnittestFramework.h>
+