Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7002/mockpp/tests
Modified Files:
readability_test.cpp
Log Message:
more descriptive output for bool
Index: readability_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/readability_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- readability_test.cpp 9 Apr 2005 16:43:55 -0000 1.2
+++ readability_test.cpp 19 Oct 2005 19:42:19 -0000 1.3
@@ -47,20 +47,20 @@
MyMixedMockObject()
: mockpp::MixedMockObject(MOCKPP_PCHAR("MyMixedMockObjectInstance") , 0)
- , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE4(chain)
- , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE4(visit)
- , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE4(void_chain)
- , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE4(void_visit)
+ , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE5(chain)
+ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE5(visit)
+ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE5(void_chain)
+ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE5(void_visit)
, chainer(this)
, void_chainer(this)
, visiter(this)
, void_visiter(this)
{}
- MOCKPP_CHAINABLE4(MyMixedMockObject, int, chain, CA, CB, std::string, char);
- MOCKPP_VISITABLE4(MyMixedMockObject, int, visit, CA, CB, std::string, char);
- MOCKPP_VOID_CHAINABLE4(MyMixedMockObject, void_chain, CA, CB, std::string, char);
- MOCKPP_VOID_VISITABLE4(MyMixedMockObject, void_visit, CA, CB, std::string, char);
+ MOCKPP_CHAINABLE5(MyMixedMockObject, int, chain, CA, CB, std::string, char, bool);
+ MOCKPP_VISITABLE5(MyMixedMockObject, int, visit, CA, CB, std::string, char, bool);
+ MOCKPP_VOID_CHAINABLE5(MyMixedMockObject, void_chain, CA, CB, std::string, char, bool);
+ MOCKPP_VOID_VISITABLE5(MyMixedMockObject, void_visit, CA, CB, std::string, char, bool);
MOCKPP_CHAINER_FOR(MyMixedMockObject, chain) chainer;
MOCKPP_CHAINER_FOR(MyMixedMockObject, void_chain) void_chainer;
@@ -76,19 +76,21 @@
.with(eq(CA()),
eq(CB(3)),
stringContains(std::string("string")),
- eq<char>(123, 45))
+ eq<char>(123, 45),
+ eq(true))
.will(returnValue(321));
mmo.chainer.expects(atLeast(3))
.with(eq(CA(5)),
eq(CB()),
stringContains(std::string("no-string")),
- eq<char>(0x23))
+ eq<char>(0x23),
+ eq(false))
.will(returnValue(123));
try
{
- mmo.chain(CA(), CB(), "hallo", 12);
+ mmo.chain(CA(), CB(), "hallo", 12, true);
}
catch(std::exception &ex)
{
@@ -100,12 +102,12 @@
void visiter_1()
{
MyMixedMockObject mmo;
- mmo.void_visit(CA(), CB(), "hallo", 12);
+ mmo.void_visit(CA(), CB(), "hallo", 12, true);
mmo.activate();
try
{
- mmo.visit(CA(), CB(), "hallo", 12);
+ mmo.visit(CA(), CB(), "hallo", 12, false);
}
catch(std::exception &ex)
{
@@ -117,12 +119,12 @@
void visiter_2()
{
MyMixedMockObject mmo;
- mmo.void_visit(CA(), CB(), "hallo", 12);
+ mmo.void_visit(CA(), CB(), "hallo", 12, true);
mmo.activate();
try
{
- mmo.void_visit(CA(), CB(), "hallo", 21);
+ mmo.void_visit(CA(), CB(), "hallo", 21, false);
}
catch(std::exception &ex)
{
|
