[Mockpp-commits] mockpp/mockpp/tests ChainableMockMethod_test.cpp,1.3,1.4

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

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

Modified Files:
	ChainableMockMethod_test.cpp 
Log Message:
cleanup

Index: ChainableMockMethod_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_test.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChainableMockMethod_test.cpp	16 Oct 2005 12:26:46 -0000	1.3
+++ ChainableMockMethod_test.cpp	17 Oct 2005 19:13:43 -0000	1.4
@@ -58,66 +58,64 @@
 
   CPPUNIT_TEST_SUITE( ChainableMockMethod_test );
 
-    CPPUNIT_TEST( test_parameter_1 );
-    CPPUNIT_TEST( test_parameter_1v );
+    CPPUNIT_TEST( test_parameter_0 );
+    CPPUNIT_TEST( test_parameter_0v );
 
   CPPUNIT_TEST_SUITE_END();
 
  public:
 
-   void test_parameter_1();
-   void test_parameter_1v();
+   void test_parameter_0();
+   void test_parameter_0v();
 };
 
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockMethod_test);
 
 
-class MyChainableMockObject_1 : public mockpp::ChainableMockObject
+class MyChainableMockObject_0 : public mockpp::ChainableMockObject
 {
   public:
 
-    MyChainableMockObject_1(const mockpp::String &name)
+    MyChainableMockObject_0(const mockpp::String &name)
       : mockpp::ChainableMockObject(name, 0)
       , chainable_mocker(MOCKPP_PCHAR("chainable"), this)
       , chainablev_mocker(MOCKPP_PCHAR("chainablev"), this)
     {}
 
-    int chainable(unsigned i)
+    int chainable()
     {
-      return chainable_mocker.forward(i);
+      return chainable_mocker.forward();
     }
 
-    void chainablev(unsigned i)
+    void chainablev()
     {
-      chainablev_mocker.forward(i);
+      chainablev_mocker.forward();
     }
 
-    mockpp::ChainableMockMethod1<int, unsigned>  chainable_mocker;
-    mockpp::ChainableMockMethod1<void, unsigned> chainablev_mocker;
+    mockpp::ChainableMockMethod0<int>  chainable_mocker;
+    mockpp::ChainableMockMethod0<void> chainablev_mocker;
 };
 
 
-void ChainableMockMethod_test::test_parameter_1()
+void ChainableMockMethod_test::test_parameter_0()
 {
-  MyChainableMockObject_1 mcm(MOCKPP_PCHAR("chainable-object"));
+  MyChainableMockObject_0 mcm(MOCKPP_PCHAR("chainable-object"));
 
-  mockpp::ChainableMockMethod1<int, unsigned>::ChainerFor chain(mcm.chainable_mocker);
+  mockpp::ChainableMockMethod0<int>::ChainerFor chain(mcm.chainable_mocker);
 
   chain.stubs(mockpp::once())
-       .with(mockpp::eq((unsigned int) 12))
        .will(new mockpp::ReturnStub<int>(21));
 
   chain.stubs(mockpp::once())
-       .with(mockpp::eq((unsigned int) 34))
        .will(new mockpp::ReturnStub<int>(43));
 
-  MOCKPP_ASSERT_TRUE(mcm.chainable(12) == 21);
-  MOCKPP_ASSERT_TRUE(mcm.chainable(34) == 43);
+  MOCKPP_ASSERT_TRUE(mcm.chainable() == 21);
+  MOCKPP_ASSERT_TRUE(mcm.chainable() == 43);
 
   try
   {
-    mcm.chainable(56);
+    mcm.chainable();
     MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("should have thrown"), false);
   }
   catch(mockpp::AssertionFailedError &ex)
@@ -129,29 +127,27 @@
 }
 
 
-void ChainableMockMethod_test::test_parameter_1v()
+void ChainableMockMethod_test::test_parameter_0v()
 {
-  MyChainableMockObject_1 mcm(MOCKPP_PCHAR("chainable-object"));
+  MyChainableMockObject_0 mcm(MOCKPP_PCHAR("chainable-object"));
 
-  mockpp::ChainableMockMethod1<void, unsigned>::ChainerFor chain(mcm.chainablev_mocker);
+  mockpp::ChainableMockMethod0<void>::ChainerFor chain(mcm.chainablev_mocker);
   unsigned counter = 0;
 
   chain.stubs(mockpp::once())
-       .with(mockpp::eq((unsigned int) 12))
        .will(new IncCounter<unsigned>(counter));
 // @todo   MOCKPP_ASSERT_EQUALS(1u, counter);
 
   chain.stubs(mockpp::once())
-       .with(mockpp::eq((unsigned int) 34))
        .will(new IncCounter<unsigned>(counter));
 // @todo   MOCKPP_ASSERT_EQUALS(2u, counter);
 
-  mcm.chainablev(12);
-  mcm.chainablev(34);
+  mcm.chainablev();
+  mcm.chainablev();
 
   try
   {
-    mcm.chainablev(56);
+    mcm.chainablev();
     MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("should have thrown"), false);
   }
   catch(mockpp::AssertionFailedError &ex)