Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv10983/src/core/com/mockobjects/dynamic
Modified Files:
Tag: DynamicMockExperiment
CallBag.java Callable.java Mock.java
Log Message:
Added support for resetting mocks (i.e. resetting expected calls and expected matches).
Index: CallBag.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallBag.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- CallBag.java 17 Apr 2003 16:17:30 -0000 1.1.2.4
+++ CallBag.java 17 May 2003 18:55:23 -0000 1.1.2.5
@@ -15,6 +15,12 @@
public CallBag() {
}
+ public void reset()
+ {
+ expectedCalls.clear();
+ expectedMatches.clear();
+ }
+
public Object call(Mock mock, String methodName, Object[] args)
throws Throwable {
Index: Callable.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/Callable.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Callable.java 14 Apr 2003 08:46:27 -0000 1.1.2.2
+++ Callable.java 17 May 2003 18:55:23 -0000 1.1.2.3
@@ -1,14 +1,14 @@
-/*
- * Created on 04-Apr-2003
- */
package com.mockobjects.dynamic;
import com.mockobjects.*;
-
public interface Callable extends Verifiable {
String getDescription();
Object call( Mock mock, String methodName, Object[] args ) throws Throwable;
-
boolean matches(String methodName, Object[] args);
+
+ /**
+ * Resets all expected calls and expected matches.
+ */
+ void reset();
}
Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.16.2.12
retrieving revision 1.16.2.13
diff -u -r1.16.2.12 -r1.16.2.13
--- Mock.java 5 May 2003 22:44:33 -0000 1.16.2.12
+++ Mock.java 17 May 2003 18:55:23 -0000 1.16.2.13
@@ -13,9 +13,6 @@
import com.mockobjects.Verifiable;
import com.mockobjects.constraint.Constraint;
-/**
- * @author dev
- */
public class Mock implements InvocationHandler,Verifiable {
private String name;
private Object proxy;
@@ -37,6 +34,11 @@
this(mockedClass, mockNameFromClass(mockedClass));
}
+ public void reset()
+ {
+ callSequence.reset();
+ }
+
public static String mockNameFromClass(Class c) {
return "mock" + className(c);
}
|
