[MO-java-dev] CVS: mockobjects-java/src/core/test/mockobjects/dynamic CallBagTest.java,1.1.2.3,1.1.2.4 CallMatchTest.java,1.1.2.6,1.1.2.7 ConstraintMatcherTest.java,1.1.2.1,1.1.2.2 MockCallableAddable.java,1.1.2.2,1.1.2.3

[Vincent M. <vm...@us...>]

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

Modified Files:
      Tag: DynamicMockExperiment
	CallBagTest.java CallMatchTest.java ConstraintMatcherTest.java 
	MockCallableAddable.java 
Log Message:
- Moved reset() from Callable to CallableAddable as it was an error to put it in Callable
- Removed superfluous comments
- Fixed rest of classes to work with new reset()

Index: CallBagTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/Attic/CallBagTest.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CallBagTest.java	5 May 2003 22:47:09 -0000	1.1.2.3
+++ CallBagTest.java	18 May 2003 07:18:19 -0000	1.1.2.4
@@ -1,6 +1,3 @@
-/*
- * Created on 04-Apr-2003
- */
 package test.mockobjects.dynamic;
 
 import com.mockobjects.dynamic.*;
@@ -8,10 +5,6 @@
 
 import junit.framework.*;
 
-
-/**
- * @author dev
- */
 public class CallBagTest extends TestCase {
 	final String METHOD_A_NAME = "methodA";
 	final String METHOD_A_RESULT = "resultA";

Index: CallMatchTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/Attic/CallMatchTest.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- CallMatchTest.java	5 May 2003 22:47:09 -0000	1.1.2.6
+++ CallMatchTest.java	18 May 2003 07:18:19 -0000	1.1.2.7
@@ -65,8 +65,6 @@
     }
 
     public void testCallDoesNotMatchWhenWrongName() throws Throwable {
-        CallMatch call = new CallMatch(METHOD_NAME, C.ANY_ARGS, mockCallable);
-
         assertFalse("call does not match", callMatch.matches("anotherName", IGNORED_ARGS));
         mockCallable.verifyExpectations();
     }

Index: ConstraintMatcherTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/Attic/ConstraintMatcherTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ConstraintMatcherTest.java	5 May 2003 22:47:10 -0000	1.1.2.1
+++ ConstraintMatcherTest.java	18 May 2003 07:18:19 -0000	1.1.2.2
@@ -1,6 +1,3 @@
-/*
- * Created on 20-Apr-03
- */
 package test.mockobjects.dynamic;
 
 import com.mockobjects.dynamic.*;
@@ -8,9 +5,7 @@
 
 import junit.framework.TestCase;
 
-
 public class ConstraintMatcherTest extends TestCase {
-    private final String METHOD_NAME = "methodA";
 
     public ConstraintMatcherTest(String name) {
         super(name);

Index: MockCallableAddable.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/Attic/MockCallableAddable.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MockCallableAddable.java	17 Apr 2003 16:17:26 -0000	1.1.2.2
+++ MockCallableAddable.java	18 May 2003 07:18:19 -0000	1.1.2.3
@@ -5,6 +5,7 @@
 import com.mockobjects.dynamic.Callable;
 import com.mockobjects.dynamic.CallableAddable;
 import com.mockobjects.dynamic.Mock;
+import com.mockobjects.util.NotImplementedException;
 
 //Mock modified for []args
 public class MockCallableAddable extends MockObject implements CallableAddable {
@@ -25,6 +26,10 @@
 	private ExpectationList myCallParameter2Values = new ExpectationList("com.mockobjects.dynamic.CallableAddable CallParameter2Values");
 	private ExpectationCounter myVerifyCalls = new ExpectationCounter("com.mockobjects.dynamic.CallableAddable VerifyCalls");
 
+    public void reset() {
+        throw new NotImplementedException();        
+    }
+    
 	public void setExpectedAddMatchCalls(int calls) {
 		myAddMatchCalls.setExpected(calls);
 	}