[Mockpp-commits] mockpp/mockpp/docs/artikel/listings basicmock.cpp,1.3,1.4 chainmock.cpp,1.4,1.5 con
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/docs/artikel/listings basicmock.cpp,1.3,1.4 chainmock.cpp,1.4,1.5 consumer.h,1.1,1.2 interface.h,1.1,1.2 poormock.cpp,1.2,1.3 visitmock.cpp,1.4,1.5
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:29
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/docs/artikel/listings Modified Files: basicmock.cpp chainmock.cpp consumer.h interface.h poormock.cpp visitmock.cpp Log Message: more namespace disabling Index: visitmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/visitmock.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- visitmock.cpp 15 Mar 2006 21:34:03 -0000 1.4 +++ visitmock.cpp 5 Apr 2006 17:03:38 -0000 1.5 @@ -24,13 +24,13 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE0(close) {} - MOCKPP_VOID_VISITABLE_EXT1(VisitMock, open, const std::string &, - ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(VisitMock, open, const MOCKPP_STD_NS::string &, + ext, MOCKPP_STD_NS::string); - MOCKPP_VISITABLE0(VisitMock, std::string, read); + MOCKPP_VISITABLE0(VisitMock, MOCKPP_STD_NS::string, read); - MOCKPP_VOID_VISITABLE_EXT1(VisitMock, write, const std::string &, - ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(VisitMock, write, const MOCKPP_STD_NS::string &, + ext, MOCKPP_STD_NS::string); MOCKPP_VOID_VISITABLE0(VisitMock, close); }; @@ -66,24 +66,24 @@ mock.activate(); // Consumer-Klasse ablaufen lassen - std::cout << "Start der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Start der Tests" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Ende der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Ende der Tests" << MOCKPP_STD_NS::endl; // alle restlichen Bedingungen pr�fen mock.verify(); - std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl; + MOCKPP_STD_NS::cout << "Alle Tests wurden fehlerfrei durchlaufen" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Fehler aufgetreten.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Fehler aufgetreten.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; } } Index: consumer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/consumer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- consumer.h 19 Dec 2004 17:58:31 -0000 1.1 +++ consumer.h 5 Apr 2006 17:03:38 -0000 1.2 @@ -23,8 +23,8 @@ private: Interface *configfile; - std::string config1; - std::string config2; - std::string config3; + MOCKPP_STD_NS::string config1; + MOCKPP_STD_NS::string config2; + MOCKPP_STD_NS::string config3; }; Index: interface.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/interface.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- interface.h 19 Dec 2004 17:58:31 -0000 1.1 +++ interface.h 5 Apr 2006 17:03:38 -0000 1.2 @@ -17,15 +17,15 @@ /** Öffnet die übergebene Datei. */ - virtual void open(const std::string &name) = 0; + virtual void open(const MOCKPP_STD_NS::string &name) = 0; /** Liest einen Datensatz bestehend aus einer Text-Zeile. */ - virtual std::string read() = 0; + virtual MOCKPP_STD_NS::string read() = 0; /** Schreibt einen Datensatz bestehend aus einer Text-Zeile. */ - virtual void write(const std::string &s) = 0; + virtual void write(const MOCKPP_STD_NS::string &s) = 0; /** Schliesst die Datei */ Index: poormock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/poormock.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- poormock.cpp 29 Dec 2004 11:18:59 -0000 1.2 +++ poormock.cpp 5 Apr 2006 17:03:38 -0000 1.3 @@ -9,10 +9,10 @@ #define ASSERTER(x) \ if (!(x) ) { \ - std::cout << std::endl \ - << "Fehler aufgetreten.\n" << #x << std::endl \ - << std::endl \ - << std::flush; \ + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl \ + << "Fehler aufgetreten.\n" << #x << MOCKPP_STD_NS::endl \ + << MOCKPP_STD_NS::endl \ + << MOCKPP_STD_NS::flush; \ exit(1); \ } @@ -30,18 +30,18 @@ close_counter = 0; } - virtual void open(const std::string & /* name */) + virtual void open(const MOCKPP_STD_NS::string & /* name */) { open_counter = ++counter; } - virtual std::string read() + virtual MOCKPP_STD_NS::string read() { read_counter = ++counter; return "dummy"; } - virtual void write(const std::string & /* s */) + virtual void write(const MOCKPP_STD_NS::string & /* s */) { write_counter = ++counter; } @@ -64,7 +64,7 @@ PoorMock mock; // Consumer-Klasse ablaufen lassen - std::cout << "Start der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Start der Tests" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); @@ -80,8 +80,8 @@ ASSERTER(mock.write_counter == 9); ASSERTER(mock.close_counter == 10); - std::cout << "Ende der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Ende der Tests" << MOCKPP_STD_NS::endl; - std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl; + MOCKPP_STD_NS::cout << "Alle Tests wurden fehlerfrei durchlaufen" << MOCKPP_STD_NS::endl; } Index: basicmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/basicmock.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- basicmock.cpp 15 Mar 2006 21:34:03 -0000 1.3 +++ basicmock.cpp 5 Apr 2006 17:03:38 -0000 1.4 @@ -28,17 +28,17 @@ { } - virtual void open(const std::string &name) + virtual void open(const MOCKPP_STD_NS::string &name) { open_name.addActual(name); } - virtual std::string read() + virtual MOCKPP_STD_NS::string read() { return read_data.nextReturnObject(); } - virtual void write(const std::string &s) + virtual void write(const MOCKPP_STD_NS::string &s) { write_data.addActual(s); } @@ -48,10 +48,10 @@ close_counter.inc(); } - MOCKPP_NS::ExpectationList<std::string> open_name; + MOCKPP_NS::ExpectationList<MOCKPP_STD_NS::string> open_name; MOCKPP_NS::ExpectationCounter close_counter; - MOCKPP_NS::ExpectationList<std::string> write_data; - MOCKPP_NS::ReturnObjectList<std::string> read_data; + MOCKPP_NS::ExpectationList<MOCKPP_STD_NS::string> write_data; + MOCKPP_NS::ReturnObjectList<MOCKPP_STD_NS::string> read_data; }; @@ -79,23 +79,23 @@ mock.write_data.addExpected("Datenpaket-3/fertig"); // Consumer-Klasse ablaufen lassen - std::cout << "Start der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Start der Tests" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Ende der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Ende der Tests" << MOCKPP_STD_NS::endl; // alle restlichen Bedingungen pr�fen mock.verify(); - std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl; + MOCKPP_STD_NS::cout << "Alle Tests wurden fehlerfrei durchlaufen" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Fehler aufgetreten.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Fehler aufgetreten.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; } } Index: chainmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/chainmock.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- chainmock.cpp 15 Mar 2006 21:34:03 -0000 1.4 +++ chainmock.cpp 5 Apr 2006 17:03:38 -0000 1.5 @@ -28,13 +28,13 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE0(close) {} - MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, open, const std::string &, - ext, std::string); + MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, open, const MOCKPP_STD_NS::string &, + ext, MOCKPP_STD_NS::string); - MOCKPP_CHAINABLE0(ChainMock, std::string, read); + MOCKPP_CHAINABLE0(ChainMock, MOCKPP_STD_NS::string, read); - MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, write, const std::string &, - ext, std::string); + MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, write, const MOCKPP_STD_NS::string &, + ext, MOCKPP_STD_NS::string); MOCKPP_VOID_CHAINABLE0(ChainMock, close); }; @@ -52,13 +52,13 @@ // Erwartungen f�r das Einlesen der Datei open_chainer.expects(once()) - .with(eq(std::string("datei1.lst"))) + .with(eq(MOCKPP_STD_NS::string("datei1.lst"))) .before(MOCKPP_PCHAR("reader")); read_chainer.stubs() - .will(onConsecutiveCalls(new ReturnStub<std::string>("Datenpaket-1"), - new ReturnStub<std::string>("Datenpaket-2"), - new ReturnStub<std::string>("Datenpaket-3"))) + .will(onConsecutiveCalls(new ReturnStub<MOCKPP_STD_NS::string>("Datenpaket-1"), + new ReturnStub<MOCKPP_STD_NS::string>("Datenpaket-2"), + new ReturnStub<MOCKPP_STD_NS::string>("Datenpaket-3"))) .id(MOCKPP_PCHAR("reader")); close_chainer.expects(once()) @@ -67,15 +67,15 @@ // Erwartungen f�r das Zur�ckschreiben der Datei open_chainer.expects(once()) - .with(eq(std::string("datei1.lst"))) + .with(eq(MOCKPP_STD_NS::string("datei1.lst"))) .before(MOCKPP_PCHAR("writer")); write_chainer.expects(once()) - .with(eq(std::string("Datenpaket-1/fertig"))); + .with(eq(MOCKPP_STD_NS::string("Datenpaket-1/fertig"))); write_chainer.expects(once()) - .with(eq(std::string("Datenpaket-2/fertig"))); + .with(eq(MOCKPP_STD_NS::string("Datenpaket-2/fertig"))); write_chainer.expects(once()) - .with(eq(std::string("Datenpaket-3/fertig"))) + .with(eq(MOCKPP_STD_NS::string("Datenpaket-3/fertig"))) .id(MOCKPP_PCHAR("writer")); close_chainer.expects(once()) @@ -83,23 +83,23 @@ // Consumer-Klasse ablaufen lassen - std::cout << "Start der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Start der Tests" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Ende der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Ende der Tests" << MOCKPP_STD_NS::endl; // alle restlichen Bedingungen pr�fen mock.verify(); - std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl; + MOCKPP_STD_NS::cout << "Alle Tests wurden fehlerfrei durchlaufen" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Fehler aufgetreten.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Fehler aufgetreten.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; } } |
