[Mockpp-commits] mockpp/mockpp/examples mock_greeter.cpp,1.22,1.23
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/examples mock_greeter.cpp,1.22,1.23
|
From: Ewald A. <ewa...@us...> - 2006-03-15 21:34:44
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/examples Modified Files: mock_greeter.cpp Log Message: optionally disable mockpp namespace Index: mock_greeter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/mock_greeter.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mock_greeter.cpp 29 Dec 2005 19:29:51 -0000 1.22 +++ mock_greeter.cpp 15 Mar 2006 21:34:04 -0000 1.23 @@ -75,8 +75,8 @@ public: virtual ~StorageInterface() {} virtual void open() = 0; - virtual void write(const mockpp::String &msg) = 0; - virtual mockpp::String read() = 0; + virtual void write(const MOCKPP_NS::String &msg) = 0; + virtual MOCKPP_NS::String read() = 0; virtual void close() = 0; }; @@ -97,7 +97,7 @@ }; - HelloWriter(BugType bt, const mockpp::String who = MOCKPP_PCHAR("world") ) + HelloWriter(BugType bt, const MOCKPP_NS::String who = MOCKPP_PCHAR("world") ) { bugType = bt; who_is = who; @@ -110,7 +110,7 @@ storage.open(); try { - mockpp::String greet = MOCKPP_PCHAR("hello, %1"); + MOCKPP_NS::String greet = MOCKPP_PCHAR("hello, %1"); greet << who_is; storage.write( greet ); } @@ -131,7 +131,7 @@ storage.open(); try { - mockpp::String s; + MOCKPP_NS::String s; s = storage.read(); } catch(...) @@ -146,18 +146,18 @@ private: - mockpp::String who_is; + MOCKPP_NS::String who_is; BugType bugType; }; -class StorageMockWriter : public mockpp::MockObject, +class StorageMockWriter : public MOCKPP_NS::MockObject, public StorageInterface { public: StorageMockWriter() - : mockpp::MockObject(MOCKPP_PCHAR("mockWriter")), + : MOCKPP_NS::MockObject(MOCKPP_PCHAR("mockWriter")), open_cnt (MOCKPP_PCHAR("storage open() counter"), this), write_cnt(MOCKPP_PCHAR("storage write() counter"), this), close_cnt(MOCKPP_PCHAR("storage close() counter"), this), @@ -184,14 +184,14 @@ } - mockpp::String read() + MOCKPP_NS::String read() { MOCKPP_NOT_IMPLEMENTED(MOCKPP_GET_STRING(MOCKPP_FUNC_MACRO)); return MOCKPP_PCHAR(""); } - void write(const mockpp::String &s) + void write(const MOCKPP_NS::String &s) { write_cnt.inc(); greet_str.setActual(s); @@ -207,22 +207,22 @@ private: - mockpp::ExpectationCounter open_cnt; - mockpp::ExpectationCounter write_cnt; - mockpp::ExpectationCounter close_cnt; + MOCKPP_NS::ExpectationCounter open_cnt; + MOCKPP_NS::ExpectationCounter write_cnt; + MOCKPP_NS::ExpectationCounter close_cnt; - mockpp::ExpectationValue<mockpp::String> greet_str; - mockpp::ExpectationValue<bool> o_state; + MOCKPP_NS::ExpectationValue<MOCKPP_NS::String> greet_str; + MOCKPP_NS::ExpectationValue<bool> o_state; }; -class StorageMockReader : public mockpp::MockObject, +class StorageMockReader : public MOCKPP_NS::MockObject, public StorageInterface { public: StorageMockReader() - : mockpp::MockObject(MOCKPP_PCHAR("mockReader")), + : MOCKPP_NS::MockObject(MOCKPP_PCHAR("mockReader")), open_cnt (MOCKPP_PCHAR("storage open() counter"), this), read_cnt (MOCKPP_PCHAR("storage read() counter"), this), close_cnt(MOCKPP_PCHAR("storage close() counter"), this), @@ -248,13 +248,13 @@ } - void write(const mockpp::String &) + void write(const MOCKPP_NS::String &) { MOCKPP_NOT_IMPLEMENTED(MOCKPP_GET_STRING(MOCKPP_FUNC_MACRO)); } - mockpp::String read() + MOCKPP_NS::String read() { read_cnt.inc(); return ret_vals.nextReturnObject(); @@ -270,11 +270,11 @@ private: - mockpp::ExpectationCounter open_cnt; - mockpp::ExpectationCounter read_cnt; - mockpp::ExpectationCounter close_cnt; - mockpp::ReturnObjectList<mockpp::String> ret_vals; - mockpp::ExpectationValue<bool> o_state; + MOCKPP_NS::ExpectationCounter open_cnt; + MOCKPP_NS::ExpectationCounter read_cnt; + MOCKPP_NS::ExpectationCounter close_cnt; + MOCKPP_NS::ReturnObjectList<MOCKPP_NS::String> ret_vals; + MOCKPP_NS::ExpectationValue<bool> o_state; }; @@ -361,7 +361,7 @@ sm.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -381,7 +381,7 @@ sm.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -401,7 +401,7 @@ sm.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -421,7 +421,7 @@ sm.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -442,7 +442,7 @@ sm.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -462,7 +462,7 @@ return CxxTest::GuiTuiRunner<CxxTest::Win32Gui, CxxTest::StdioPrinter>( argc, argv ).run(); #else CxxTest::ErrorPrinter ep; - mockpp::CxxTestRunner::runAllTests(ep); + MOCKPP_NS::CxxTestRunner::runAllTests(ep); return CxxTest::tracker().failedTests(); //return CxxTest::ErrorPrinter().run(); #endif @@ -495,13 +495,13 @@ std::cout << "\n"; #else - std::cout << mockpp::getLatin1(mockpp_i18n("Test framework was not available at compile time!\n")).c_str(); - std::cout << mockpp::getLatin1(mockpp_i18n("Will use mockpp features only.\n\n")).c_str(); + std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Test framework was not available at compile time!\n")).c_str(); + std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Will use mockpp features only.\n\n")).c_str(); #endif try { - std::cout << mockpp::getLatin1(mockpp_i18n("Now running some tests with just mockpp features:\n\n")).c_str(); + std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Now running some tests with just mockpp features:\n\n")).c_str(); Streamer_test st; st.test_write_ok(); @@ -512,7 +512,7 @@ { st.fail_missing_close(); } - catch (mockpp::AssertionFailedError & /*ae*/) + catch (MOCKPP_NS::AssertionFailedError & /*ae*/) { thrown = true; } @@ -523,7 +523,7 @@ { st.fail_missing_close_on_error(); } - catch (mockpp::AssertionFailedError & /*ae*/) + catch (MOCKPP_NS::AssertionFailedError & /*ae*/) { thrown = true; } @@ -531,14 +531,14 @@ ret = 0; } - catch(mockpp::Exception &ex) + catch(MOCKPP_NS::Exception &ex) { - std::cout << "file: " << mockpp::getLatin1(ex.getSrcFile()).c_str() << std::endl + std::cout << "file: " << MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str() << std::endl << "line: " << ex.getSrcLine() << std::endl - << "msg : " << mockpp::getLatin1(ex.getMessage()).c_str() << std::endl; + << "msg : " << MOCKPP_NS::getLatin1(ex.getMessage()).c_str() << std::endl; ret = 1; } - std::cout << mockpp::getLatin1(mockpp_i18n("Finished.\n")).c_str(); + std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Finished.\n")).c_str(); return ret; } |
