[Mockpp-commits] mockpp/mockpp/tests ChainableMockMethod_1_test.cpp,1.9,1.10 ChainableMockMethod_2_test.cpp,1.7,1.8 ChainableMockMethod_test.cpp,1.11,1.12

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

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

Modified Files:
	ChainableMockMethod_1_test.cpp ChainableMockMethod_2_test.cpp 
	ChainableMockMethod_test.cpp 
Log Message:
omit chainer

Index: ChainableMockMethod_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_test.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChainableMockMethod_test.cpp	3 Nov 2005 20:44:06 -0000	1.11
+++ ChainableMockMethod_test.cpp	15 Nov 2005 19:42:18 -0000	1.12
@@ -151,7 +151,7 @@
 {
   MyChainableMockObject_0 mcm(MOCKPP_PCHAR("chainable-object"));
 
-  mockpp::ChainableMockMethod0<int>::ChainerFor chain(mcm.chainable_mocker);
+  mockpp::ChainableMockMethod0<int>& chain(mcm.chainable_mocker);
 
   chain.stubs(mockpp::once())
        .will(mockpp::returnValue<int>(21));
@@ -180,7 +180,7 @@
 {
   MyChainableMockObject_0 mcm(MOCKPP_PCHAR("chainable-object"));
 
-  mockpp::ChainableMockMethod0<void>::ChainerFor chain(mcm.chainablev_mocker);
+  mockpp::ChainableMockMethod0<void> &chain(mcm.chainablev_mocker);
   unsigned counter = 0;
 
   chain.stubs(mockpp::once())

Index: ChainableMockMethod_1_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_1_test.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChainableMockMethod_1_test.cpp	3 Nov 2005 20:44:06 -0000	1.9
+++ ChainableMockMethod_1_test.cpp	15 Nov 2005 19:42:18 -0000	1.10
@@ -108,7 +108,7 @@
 {
   MyChainableMockObject_1 mcm(MOCKPP_PCHAR("chainable-object"));
 
-  mockpp::ChainableMockMethod1<int, unsigned>::ChainerFor chain(mcm.chainable_mocker);
+  mockpp::ChainableMockMethod1<int, unsigned> &chain(mcm.chainable_mocker);
 
   chain.stubs(mockpp::once())
        .with(mockpp::eq(12u))
@@ -139,7 +139,7 @@
 {
   MyChainableMockObject_1 mcm(MOCKPP_PCHAR("chainable-object"));
 
-  mockpp::ChainableMockMethod1<void, unsigned>::ChainerFor chain(mcm.chainablev_mocker);
+  mockpp::ChainableMockMethod1<void, unsigned> &chain(mcm.chainablev_mocker);
   unsigned counter = 0;
 
   chain.stubs(mockpp::once())

Index: ChainableMockMethod_2_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_2_test.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChainableMockMethod_2_test.cpp	3 Nov 2005 20:44:06 -0000	1.7
+++ ChainableMockMethod_2_test.cpp	15 Nov 2005 19:42:18 -0000	1.8
@@ -106,8 +106,7 @@
 void ChainableMockMethod_2_test::test_parameter_2()
 {
   MyChainableMockObject_2 mcm(MOCKPP_PCHAR("chainable-object"));
-
-  mockpp::ChainableMockMethod2<int, unsigned, long>::ChainerFor chain(mcm.chainable_mocker);
+  mockpp::ChainableMockMethod2<int, unsigned, long> &chain(mcm.chainable_mocker);
 
   chain.stubs(mockpp::once())
        .with(mockpp::eq<unsigned>(12u),
@@ -140,7 +139,7 @@
 {
   MyChainableMockObject_2 mcm(MOCKPP_PCHAR("chainable-object"));
 
-  mockpp::ChainableMockMethod2<void, unsigned, long>::ChainerFor chain(mcm.chainablev_mocker);
+  mockpp::ChainableMockMethod2<void, unsigned, long> &chain(mcm.chainablev_mocker);
   unsigned counter = 0;
 
 //   IncCounter<unsigned> ctr(counter);