[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic CallCounter.java,1.1,1.2

[Steve F. <sm...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv27555/src/core/com/mockobjects/dynamic

Modified Files:
	CallCounter.java 
Log Message:
retrofitted ExpectationCounter

Index: CallCounter.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallCounter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallCounter.java	31 Oct 2002 17:03:45 -0000	1.1
+++ CallCounter.java	24 Nov 2002 11:01:55 -0000	1.2
@@ -3,6 +3,7 @@
  */
 package com.mockobjects.dynamic;
 
+import com.mockobjects.ExpectationCounter;
 import com.mockobjects.Verifiable;
 import com.mockobjects.util.AssertMo;
 
@@ -12,25 +13,19 @@
     implements MockCall, Verifiable
 {
     private MockCall _call;
-    private int _expected_calls;
+    private ExpectationCounter _callCount = new ExpectationCounter("call count");
     
     public CallCounter( int expected_calls, MockCall call ) {
         _call = call;
-        _expected_calls = expected_calls;
+        _callCount.setExpected(expected_calls);
     }
     
     public Object call(Object[] args) throws Throwable {
-        if( _expected_calls == 0 ) {
-            fail( "too many calls" );
-        }
-        
-        _expected_calls--;
+        _callCount.inc();
         return _call.call(args);
     }
     
     public void verify() {
-        if( _expected_calls != 0 ) {
-            fail("expected " + _expected_calls + " additional call(s)" );
-        }
+        _callCount.verify();
     }
 }