[Mockpp-commits] mockpp/mockpp/tests ChainableMockObjectPolymorphism_test.cpp,1.15,1.16 Formatter_te
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests ChainableMockObjectPolymorphism_test.cpp,1.15,1.16 Formatter_test.cpp,1.43,1.44 NoException_test.cpp,1.15,1.16 TimeServer_test.cpp,1.10,1.11 VerifyingTestCaller_test.cpp,1.22,1.23 VisitableMockMethod_2_test.cpp,1.20,1.21 compilecheck.cpp,1.27,1.28 mock_test.cpp,1.44,1.45 readability_test.cpp,1.7,1.8
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/tests Modified Files: ChainableMockObjectPolymorphism_test.cpp Formatter_test.cpp NoException_test.cpp TimeServer_test.cpp VerifyingTestCaller_test.cpp VisitableMockMethod_2_test.cpp compilecheck.cpp mock_test.cpp readability_test.cpp Log Message: more namespace disabling Index: readability_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/readability_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- readability_test.cpp 15 Mar 2006 21:34:08 -0000 1.7 +++ readability_test.cpp 5 Apr 2006 17:03:40 -0000 1.8 @@ -93,9 +93,9 @@ mmo.chain(CA(), CB(), "hallo", 12, true); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -112,9 +112,9 @@ mmo.visit(CA(), CB(), "hallo", 12, false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -131,9 +131,9 @@ mmo.void_visit(CA(), CB(), "hallo", 21, false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -148,9 +148,9 @@ list.addActual(MOCKPP_STL::string("no-string")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -165,9 +165,9 @@ list.addActual(MOCKPP_STL::string("no-string")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -183,9 +183,9 @@ list.addActual(MOCKPP_STL::string("no-string")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -194,39 +194,39 @@ int main(int /* argc */, char ** /* argv */) { unsigned result = 0; - std::cout << "Starting readability tests..\n"; + MOCKPP_STD_NS::cout << "Starting readability tests..\n"; MOCKPP_TRY { - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; chainer_1(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; visiter_1(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; visiter_2(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; expectationlist_1(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; expectationlist_2(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; constraintlist_1(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; } #ifndef MOCKPP_NO_EXCEPTIONS catch(...) { - std::cout << "Caught unexpected exception\n"; + MOCKPP_STD_NS::cout << "Caught unexpected exception\n"; result = 1; } #endif - std::cout << "Finishing readability tests\n"; + MOCKPP_STD_NS::cout << "Finishing readability tests\n"; return result; } Index: VisitableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockMethod_2_test.cpp 15 Mar 2006 21:34:08 -0000 1.20 +++ VisitableMockMethod_2_test.cpp 5 Apr 2006 17:03:40 -0000 1.21 @@ -131,6 +131,8 @@ vmo.verify(); vmb.verify(); + vmb.addThrowable(0); + vmb.addThrowable(MOCKPP_NS::make_throwable(333u)); vmb.setDefaultThrowable(MOCKPP_NS::make_throwable(444u)); vmb.setDefaultReturnValue(999); Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- Formatter_test.cpp 15 Mar 2006 21:34:08 -0000 1.43 +++ Formatter_test.cpp 5 Apr 2006 17:03:40 -0000 1.44 @@ -288,7 +288,7 @@ void Formatter_test::test_number_min_long_dec() { #ifdef HAVE_LIMITS - long ul = std::numeric_limits<long>::min(); + long ul = MOCKPP_STD_NS::numeric_limits<long>::min(); #else long ul = INT_MIN; #endif @@ -300,7 +300,7 @@ #ifdef HAVE_SPRINTF_S sprintf_s(buff, "%ld", ul ); #else - std::sprintf(buff, "%ld", ul ); + MOCKPP_STD_NS::sprintf(buff, "%ld", ul ); #endif #ifdef MOCKPP_UNICODE @@ -316,14 +316,14 @@ void Formatter_test::test_number_min_long_hex() { #ifdef HAVE_LIMITS - long long ull = std::numeric_limits<long long>::min(); + long long ull = MOCKPP_STD_NS::numeric_limits<long long>::min(); #else long long ull = INT_MIN; #endif MOCKPP_NS::String str = MOCKPP_NS::number((unsigned long)123, 16); str = MOCKPP_NS::number(ull, 16); -// std::cout << MOCKPP_NS::getLatin1(str).c_str() << std::endl; +// MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(str).c_str() << MOCKPP_STD_NS::endl; MOCKPP_ASSERT_EQUALS(MOCKPP_PCSTRING("-8000000000000000"), str); // differs from sprintf(..) } @@ -331,7 +331,7 @@ void Formatter_test::test_number_max_long_dec() { #ifdef HAVE_LIMITS - long long ul = std::numeric_limits<long long>::max(); + long long ul = MOCKPP_STD_NS::numeric_limits<long long>::max(); #else long long ul = INT_MAX; #endif @@ -341,7 +341,7 @@ #ifdef HAVE_SPRINTF_S sprintf_s(buff, "%lld", ul ); #else - std::sprintf(buff, "%lld", ul ); + MOCKPP_STD_NS::sprintf(buff, "%lld", ul ); #endif #ifdef MOCKPP_UNICODE @@ -357,7 +357,7 @@ void Formatter_test::test_number_max_ulong_dec() { #ifdef HAVE_LIMITS - unsigned long long ul = std::numeric_limits<unsigned long long>::max(); + unsigned long long ul = MOCKPP_STD_NS::numeric_limits<unsigned long long>::max(); #else unsigned long long ul = UINT_MAX; #endif @@ -367,7 +367,7 @@ #ifdef HAVE_SPRINTF_S sprintf_s(buff, "%llu", ul ); #else - std::sprintf(buff, "%llu", ul ); + MOCKPP_STD_NS::sprintf(buff, "%llu", ul ); #endif #ifdef MOCKPP_UNICODE @@ -630,8 +630,8 @@ #ifdef MOCKPP_UNICODE -std::basic_ostream<wchar_t> & - operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/) +MOCKPP_STD_NS::basic_ostream<wchar_t> & + operator<< (MOCKPP_STD_NS::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/) { os << "Formatter_Dummy-wchar_t"; return os; @@ -641,8 +641,8 @@ #else // MOCKPP_UNICODE -std::basic_ostream<char> & - operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/) +MOCKPP_STD_NS::basic_ostream<char> & + operator<< (MOCKPP_STD_NS::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/) { os << "Formatter_Dummy-char"; return os; Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- mock_test.cpp 19 Mar 2006 16:26:50 -0000 1.44 +++ mock_test.cpp 5 Apr 2006 17:03:40 -0000 1.45 @@ -86,8 +86,8 @@ #endif #ifndef _MSC_VER -using std::time; -using std::time_t; +using MOCKPP_STD_NS::time; +using MOCKPP_STD_NS::time_t; #endif @@ -110,11 +110,11 @@ #define STRINGIZE_I(text) #text #define PRINT_NS \ - std::cout << " - namespace mockpp : " << STRINGIZE(MOCKPP_NS) << std::endl \ - << " - namespace stl : " << STRINGIZE(MOCKPP_STL) << std::endl \ - << " - namespace std : " << STRINGIZE(MOCKPP_STD_NS) << std::endl \ - << " - namespace ministl: " << STRINGIZE(MINISTL_NS) << std::endl \ - << " - namespace CxxTest: " << STRINGIZE(CXXTEST_NS) << std::endl + MOCKPP_STD_NS::cout << " - namespace mockpp : " << STRINGIZE(MOCKPP_NS) << MOCKPP_STD_NS::endl \ + << " - namespace stl : " << STRINGIZE(MOCKPP_STL) << MOCKPP_STD_NS::endl \ + << " - namespace std : " << STRINGIZE(MOCKPP_STD_NS) << MOCKPP_STD_NS::endl \ + << " - namespace ministl: " << STRINGIZE(MINISTL_NS) << MOCKPP_STD_NS::endl \ + << " - namespace CxxTest: " << STRINGIZE(CXXTEST_NS) << MOCKPP_STD_NS::endl ///////////////////////////////////////////////////// @@ -133,7 +133,7 @@ void enterTest( const CXXTEST_NS::TestDescription &td ) { if (show) - std::cout << td.suiteName() << "::" << td.testName() << std::endl; + MOCKPP_STD_NS::cout << td.suiteName() << "::" << td.testName() << MOCKPP_STD_NS::endl; CXXTEST_NS::ErrorPrinter::enterTest(td); } @@ -178,35 +178,35 @@ MOCKPP_TESTMETHOD_DECL void startTest( CppUnit::Test *test ) { starttime = time(0); - std::cerr << ">>>>>>>>>>>>>>>> " << test->getName() << " : " + MOCKPP_STD_NS::cerr << ">>>>>>>>>>>>>>>> " << test->getName() << " : " << starttime - << std::endl; - std::cerr.flush(); + << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cerr.flush(); } MOCKPP_TESTMETHOD_DECL void addFailure( const CppUnit::TestFailure &failure ) { - std::cerr << ( failure.isError() ? "E" : "F" ) << std::endl; - std::cerr.flush(); + MOCKPP_STD_NS::cerr << ( failure.isError() ? "E" : "F" ) << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cerr.flush(); } MOCKPP_TESTMETHOD_DECL void endTest(CppUnit::Test *test) { - std::cerr << std::endl; + MOCKPP_STD_NS::cerr << MOCKPP_STD_NS::endl; time_t endtime = time(0); time_t difftime = starttime - endtime; unsigned m = difftime / 60; unsigned s = difftime % 60; - std::cerr << "<<<<<<<<<<<<<<<< " << test->getName() + MOCKPP_STD_NS::cerr << "<<<<<<<<<<<<<<<< " << test->getName() << " : " << endtime << " : " << m << ":" << s - << std::endl; + << MOCKPP_STD_NS::endl; } MOCKPP_TESTMETHOD_DECL void done() { - std::cerr << std::endl; - std::cerr.flush(); + MOCKPP_STD_NS::cerr << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cerr.flush(); } }; @@ -227,7 +227,7 @@ #ifndef __BORLANDC__ // @todo for (int i2 = 1; i2 < argc; ++i2) if (strcmp (argv[i2], "--compiler-output") == 0) - runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr ) ); + runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), MOCKPP_STD_NS::cerr ) ); #endif ret = runner.run() ? 0 : 1; @@ -246,21 +246,21 @@ test_suite* init_unit_test_suite( int argc, char* argv[] ) { - std::cout << "starting tests..\n"; - std::cout << " - using Boost.Test framework\n"; + MOCKPP_STD_NS::cout << "starting tests..\n"; + MOCKPP_STD_NS::cout << " - using Boost.Test framework\n"; #ifdef MOCKPP_PTI_WEAKNESS - std::cout << " - support pti-weakness enabled\n"; + MOCKPP_STD_NS::cout << " - support pti-weakness enabled\n"; #else - std::cout << " - support pti-weakness disabled\n"; + MOCKPP_STD_NS::cout << " - support pti-weakness disabled\n"; #endif PRINT_NS; - std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; - std::cout << "\n"; + MOCKPP_STD_NS::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cout << "\n"; /* - std::cout << "Options\n"; - std::cout << " --show-name show method names before calling\n"; + MOCKPP_STD_NS::cout << "Options\n"; + MOCKPP_STD_NS::cout << " --show-name show method names before calling\n"; */ test_suite* test = boost::unit_test_framework::detail::auto_unit_test_suite(); @@ -279,7 +279,7 @@ */ unit_test_log::instance().set_log_threshold_level(log_messages); -// unit_test_result::instance().detailed_report(std::cout); +// unit_test_result::instance().detailed_report(MOCKPP_STD_NS::cout); return test; } @@ -288,24 +288,24 @@ int main(int argc, char **argv) { int ret = 1; - std::cout << "starting tests..\n"; + MOCKPP_STD_NS::cout << "starting tests..\n"; #if defined(MOCKPP_USE_CXXTEST) - std::cout << " - using cxxtest framework\n"; + MOCKPP_STD_NS::cout << " - using cxxtest framework\n"; #elif defined(MOCKPP_USE_CPPUNIT) - std::cout << " - using cppunit framework\n"; + MOCKPP_STD_NS::cout << " - using cppunit framework\n"; #endif PRINT_NS; #ifdef MOCKPP_PTI_WEAKNESS - std::cout << " - support pti-weakness enabled\n"; + MOCKPP_STD_NS::cout << " - support pti-weakness enabled\n"; #else - std::cout << " - support pti-weakness disabled\n"; + MOCKPP_STD_NS::cout << " - support pti-weakness disabled\n"; #endif - std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; - std::cout << "\n"; + MOCKPP_STD_NS::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cout << "\n"; #if defined(MOCKPP_USE_CXXTEST) @@ -313,17 +313,17 @@ #elif defined(MOCKPP_USE_CPPUNIT) - std::cout << "Options\n"; - std::cout << " --show-name show method names before calling\n"; - std::cout << " --compiler-output output similar to compilers\n"; + MOCKPP_STD_NS::cout << "Options\n"; + MOCKPP_STD_NS::cout << " --show-name show method names before calling\n"; + MOCKPP_STD_NS::cout << " --compiler-output output similar to compilers\n"; ret = run_cppunit(argc, argv); - std::cout << "\n"; + MOCKPP_STD_NS::cout << "\n"; #endif - std::cout << "Result: " << ret << std::endl << std::endl; + MOCKPP_STD_NS::cout << "Result: " << ret << MOCKPP_STD_NS::endl << MOCKPP_STD_NS::endl; return ret; } Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- NoException_test.cpp 15 Mar 2006 21:34:08 -0000 1.15 +++ NoException_test.cpp 5 Apr 2006 17:03:40 -0000 1.16 @@ -27,20 +27,18 @@ * ***************************************************************************/ +#include <mockpp/mockpp.h> // always first + +// redefine default stuff always + #undef MOCKPP_THROW #define MOCKPP_THROW(x) storeMalfunctionData(x) #undef MOCKPP_RETHROW #define MOCKPP_RETHROW storeMalfunctionData("unexpected rethrow") -#undef MOCKPP_NO_EXCEPTIONS -#define MOCKPP_NO_EXCEPTIONS - #define MOCKPP_ENABLE_DEFAULT_FORMATTER - -#include <mockpp/mockpp.h> // always first - #include <mockpp/ExpectationValue.h> #include <mockpp/Throwable.h> Index: compilecheck.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/compilecheck.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- compilecheck.cpp 15 Mar 2006 21:34:08 -0000 1.27 +++ compilecheck.cpp 5 Apr 2006 17:03:40 -0000 1.28 @@ -210,15 +210,15 @@ MOCKPP_VISITABLE1(MyVisitableMockObject, unsigned, visitable1, int); MOCKPP_VISITABLE2(MyVisitableMockObject, unsigned, visitable2, int, wchar_t); MOCKPP_VISITABLE3(MyVisitableMockObject, unsigned, visitable3, int, wchar_t, float); - MOCKPP_VISITABLE4(MyVisitableMockObject, unsigned, visitable4, int, wchar_t, float, std::string); - MOCKPP_VISITABLE5(MyVisitableMockObject, unsigned, visitable5, int, wchar_t, float, std::string, long); + MOCKPP_VISITABLE4(MyVisitableMockObject, unsigned, visitable4, int, wchar_t, float, MOCKPP_STD_NS::string); + MOCKPP_VISITABLE5(MyVisitableMockObject, unsigned, visitable5, int, wchar_t, float, MOCKPP_STD_NS::string, long); MOCKPP_VOID_VISITABLE0(MyVisitableMockObject, void_visitable0); MOCKPP_VOID_VISITABLE1(MyVisitableMockObject, void_visitable1, int); MOCKPP_VOID_VISITABLE2(MyVisitableMockObject, void_visitable2, int, wchar_t); MOCKPP_VOID_VISITABLE3(MyVisitableMockObject, void_visitable3, int, wchar_t, float); - MOCKPP_VOID_VISITABLE4(MyVisitableMockObject, void_visitable4, int, wchar_t, float, std::string); - MOCKPP_VOID_VISITABLE5(MyVisitableMockObject, void_visitable5, int, wchar_t, float, std::string, long); + MOCKPP_VOID_VISITABLE4(MyVisitableMockObject, void_visitable4, int, wchar_t, float, MOCKPP_STD_NS::string); + MOCKPP_VOID_VISITABLE5(MyVisitableMockObject, void_visitable5, int, wchar_t, float, MOCKPP_STD_NS::string, long); }; @@ -247,9 +247,9 @@ MOCKPP_NS::String fmt = MOCKPP_PCHAR("abc %1 %2 xyz"); fmt << Output() << 1; #if MOCKPP_UNICODE == 1 - std::wcout << fmt << std::endl; + MOCKPP_STD_NS::wcout << fmt << MOCKPP_STD_NS::endl; #else - std::cout << fmt << std::endl; + MOCKPP_STD_NS::cout << fmt << MOCKPP_STD_NS::endl; #endif return 0; @@ -258,7 +258,7 @@ MyExpectation expectation; MyExpectationValue expectationValue(MOCKPP_PCHAR("exval")); - MOCKPP_NS::ExpectationSegment<std::string> expectationSegment(MOCKPP_PCHAR("exseg"), 0); + MOCKPP_NS::ExpectationSegment<MOCKPP_STD_NS::string> expectationSegment(MOCKPP_PCHAR("exseg"), 0); MOCKPP_NS::ExpectationList<double> expectationList(MOCKPP_PCHAR("exlist"), 0); MOCKPP_NS::ExpectationSet<char> expectationSet(MOCKPP_PCHAR("exset"), 0); MOCKPP_NS::ExpectationMap<int, MOCKPP_NS::String> expectationMap(MOCKPP_PCHAR("exmap"), 0); @@ -267,8 +267,8 @@ MOCKPP_NS::MockObject mockObject(MOCKPP_PCHAR("mo")); fmt = MOCKPP_PCHAR("abc %1 def"); - std::string s8; - std::basic_string<wchar_t> s16; + MOCKPP_STD_NS::string s8; + MOCKPP_STD_NS::basic_string<wchar_t> s16; fmt << s8; fmt << s16; @@ -285,9 +285,9 @@ MOCKPP_NS::String s = MOCKPP_PCHAR("abc %1 def"); s << 123; #if MOCKPP_UNICODE == 1 - std::wcout << s << std::endl; + MOCKPP_STD_NS::wcout << s << MOCKPP_STD_NS::endl; #else - std::cout << s << std::endl; + MOCKPP_STD_NS::cout << s << MOCKPP_STD_NS::endl; #endif fmt = MOCKPP_PCHAR("abc %1 def"); @@ -296,33 +296,33 @@ string_taker (fmt << 321); #if MOCKPP_UNICODE == 1 - std::wcout << s2 << std::endl; + MOCKPP_STD_NS::wcout << s2 << MOCKPP_STD_NS::endl; #else - std::cout << s2 << std::endl; + MOCKPP_STD_NS::cout << s2 << MOCKPP_STD_NS::endl; #endif - std::printf ("%f\n", 12.345678); - std::printf ("%.2f\n", 12.345678); + MOCKPP_STD_NS::printf ("%f\n", 12.345678); + MOCKPP_STD_NS::printf ("%.2f\n", 12.345678); - std::cout << "typeid int " << typeid(int).name() << std::endl; - std::cout << "typeid float " << typeid(float).name() << std::endl; - std::cout << "typeid long " << typeid(long).name() << std::endl; + MOCKPP_STD_NS::cout << "typeid int " << typeid(int).name() << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cout << "typeid float " << typeid(float).name() << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cout << "typeid long " << typeid(long).name() << MOCKPP_STD_NS::endl; - std::exception *ex = new MOCKPP_NS::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("abc %1 def")); + MOCKPP_STD_NS::exception *ex = new MOCKPP_NS::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("abc %1 def")); try { - std::cout << "throw?\n"; + MOCKPP_STD_NS::cout << "throw?\n"; forwardException(ex); } - catch(std::exception *ex) + catch(MOCKPP_STD_NS::exception *ex) { - std::cout << "typeid * " << typeid(*ex).name() << std::endl; + MOCKPP_STD_NS::cout << "typeid * " << typeid(*ex).name() << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << "typeid & " << typeid(ex).name() << std::endl; + MOCKPP_STD_NS::cout << "typeid & " << typeid(ex).name() << MOCKPP_STD_NS::endl; } - std::cout << "after catch\n"; + MOCKPP_STD_NS::cout << "after catch\n"; try @@ -331,9 +331,9 @@ } catch(MOCKPP_NS::AssertionFailedError &ae) { - std::cout << "file: " << MOCKPP_NS::getLatin1(ae.getSrcFile()) << std::endl - << "line: " << ae.getSrcLine() << std::endl - << "msg : " << MOCKPP_NS::getLatin1(ae.getMessage()) << std::endl; + MOCKPP_STD_NS::cout << "file: " << MOCKPP_NS::getLatin1(ae.getSrcFile()) << MOCKPP_STD_NS::endl + << "line: " << ae.getSrcLine() << MOCKPP_STD_NS::endl + << "msg : " << MOCKPP_NS::getLatin1(ae.getMessage()) << MOCKPP_STD_NS::endl; } try @@ -344,15 +344,15 @@ } catch(MOCKPP_NS::AssertionFailedError &ae) { - std::cout << "file: " << MOCKPP_NS::getLatin1(ae.getSrcFile()) << std::endl - << "line: " << ae.getSrcLine() << std::endl - << "msg : " << MOCKPP_NS::getLatin1(ae.getMessage()) << std::endl; + MOCKPP_STD_NS::cout << "file: " << MOCKPP_NS::getLatin1(ae.getSrcFile()) << MOCKPP_STD_NS::endl + << "line: " << ae.getSrcLine() << MOCKPP_STD_NS::endl + << "msg : " << MOCKPP_NS::getLatin1(ae.getMessage()) << MOCKPP_STD_NS::endl; } MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable1) visit1_ctr (&mvo); - visit1_ctr.addThrowable(std::string("throw"), 2); + visit1_ctr.addThrowable(MOCKPP_STD_NS::string("throw"), 2); visit1_ctr.addThrowable(MOCKPP_NS::make_throwable(int(123))); visit1_ctr.setDefaultThrowable(MOCKPP_NS::make_throwable(float(123.456))); visit1_ctr.addReturnValue(0); @@ -366,15 +366,15 @@ u = mvo.visitable1(1); u = mvo.visitable2(1, L'a'); u = mvo.visitable3(1, L'a', 1.23); - u = mvo.visitable4(1, L'a', 1.23, std::string("abc")); - u = mvo.visitable5(1, L'a', 1.23, std::string("abc"), -12345678); + u = mvo.visitable4(1, L'a', 1.23, MOCKPP_STD_NS::string("abc")); + u = mvo.visitable5(1, L'a', 1.23, MOCKPP_STD_NS::string("abc"), -12345678); mvo.void_visitable0(); mvo.void_visitable1(1); mvo.void_visitable2(1, L'a'); mvo.void_visitable3(1, L'a', 1.23); - mvo.void_visitable4(1, L'a', 1.23, std::string("abc")); - mvo.void_visitable5(1, L'a', 1.23, std::string("abc"), -12345678); + mvo.void_visitable4(1, L'a', 1.23, MOCKPP_STD_NS::string("abc")); + mvo.void_visitable5(1, L'a', 1.23, MOCKPP_STD_NS::string("abc"), -12345678); mvo.activate(); Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObjectPolymorphism_test.cpp 15 Mar 2006 21:34:08 -0000 1.15 +++ ChainableMockObjectPolymorphism_test.cpp 5 Apr 2006 17:03:40 -0000 1.16 @@ -132,13 +132,13 @@ void accept1( Visitor &visitor ) { -// std::cout << "accept1\n"; +// MOCKPP_STD_NS::cout << "accept1\n"; visitor.visit1( parameter1 ); } void accept3( Visitor &visitor ) { -// std::cout << "accept3\n"; +// MOCKPP_STD_NS::cout << "accept3\n"; visitor.visit3( parameter1, parameter2, parameter3 ); } @@ -172,7 +172,7 @@ bool MOCKPP_NS::invocationComparison<MockParameter>(const MockParameter &left, const MockParameter &right) { - std::cout << "invocationComparison<MockParameter>\n"; + MOCKPP_STD_NS::cout << "invocationComparison<MockParameter>\n"; return left.a == right.a; } @@ -181,7 +181,7 @@ bool MOCKPP_NS::invocationComparison<Parameter>(const Parameter &left, const Parameter &right) { - std::cout << "invocationComparison<Parameter>\n"; + MOCKPP_STD_NS::cout << "invocationComparison<Parameter>\n"; return MOCKPP_NS::isSameComparison(left, right); } Index: VerifyingTestCaller_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- VerifyingTestCaller_test.cpp 15 Mar 2006 21:34:08 -0000 1.22 +++ VerifyingTestCaller_test.cpp 5 Apr 2006 17:03:40 -0000 1.23 @@ -149,7 +149,7 @@ { VerifyingTestCaseDummy vd; MOCKPP_NS::VerifyingTestCaller<VerifyingTestCaseDummy, true> - caller(std::string("caller"), &VerifyingTestCaseDummy::method, vd); + caller(MOCKPP_STD_NS::string("caller"), &VerifyingTestCaseDummy::method, vd); caller.runTest(); MOCKPP_ASSERT_EQUALS((unsigned)2, vd.ver); MOCKPP_ASSERT_EQUALS((unsigned)3, vd.clr); @@ -160,7 +160,7 @@ { VerifyingTestCaseDummy *vd = new VerifyingTestCaseDummy; MOCKPP_NS::VerifyingTestCaller<VerifyingTestCaseDummy, true> - caller(std::string("caller"), &VerifyingTestCaseDummy::method, vd); + caller(MOCKPP_STD_NS::string("caller"), &VerifyingTestCaseDummy::method, vd); caller.runTest(); MOCKPP_ASSERT_EQUALS((unsigned)2, vd->ver); MOCKPP_ASSERT_EQUALS((unsigned)3, vd->clr); Index: TimeServer_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TimeServer_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TimeServer_test.cpp 15 Mar 2006 21:34:08 -0000 1.10 +++ TimeServer_test.cpp 5 Apr 2006 17:03:40 -0000 1.11 @@ -90,11 +90,11 @@ rt.addUnixTime(0x5678); MOCKPP_NS::TimeServer *ts = &rt; - std::time_t t1 = ts->getUnixTime(); - MOCKPP_ASSERT_EQUALS((std::time_t)0x1234, t1); + MOCKPP_STD_NS::time_t t1 = ts->getUnixTime(); + MOCKPP_ASSERT_EQUALS((MOCKPP_STD_NS::time_t)0x1234, t1); t1 = ts->getUnixTime(); - MOCKPP_ASSERT_EQUALS((std::time_t)0x5678, t1); + MOCKPP_ASSERT_EQUALS((MOCKPP_STD_NS::time_t)0x5678, t1); } @@ -102,8 +102,8 @@ { MOCKPP_NS::RealTimeServer rt; MOCKPP_NS::TimeServer *ts = &rt; - std::time_t t1 = ts->getUnixTime(); - std::time_t t2 = std::time(0); + MOCKPP_STD_NS::time_t t1 = ts->getUnixTime(); + MOCKPP_STD_NS::time_t t2 = MOCKPP_STD_NS::time(0); MOCKPP_ASSERT_TRUE(t1 <= t2); // up to +2s should always succeed MOCKPP_ASSERT_TRUE((t1 + 2) >= t2); |
