[MO-java-dev] CVS: mockobjects-java/src/core/test/mockobjects/dynamic/support MockInvokableFactory.java,1.7,1.8 MockConstraintMatcher.java,1.1,1.2

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

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

Modified Files:
	MockInvokableFactory.java MockConstraintMatcher.java 
Log Message:
Started implementing new dynamic mock structure. Introduced InvocationMocker. and InvocationMatcher

Renamed ConstraintMatcher to ArgumentsMatcher



Index: MockInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support/MockInvokableFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MockInvokableFactory.java	2 Oct 2003 23:47:22 -0000	1.7
+++ MockInvokableFactory.java	4 Oct 2003 22:56:45 -0000	1.8
@@ -6,7 +6,7 @@
 
 import com.mockobjects.ExpectationList;
 import com.mockobjects.MockObject;
-import com.mockobjects.dynamic.ConstraintMatcher;
+import com.mockobjects.dynamic.ArgumentsMatcher;
 import com.mockobjects.dynamic.Invokable;
 import com.mockobjects.dynamic.InvokableFactory;
 
@@ -21,7 +21,7 @@
     
     public void expectCreateReturnStub(
         String methodName, 
-        ConstraintMatcher constraints, 
+        ArgumentsMatcher constraints, 
         Object result)
     {
         parameters.addExpectedMany(
@@ -30,7 +30,7 @@
     
     public Invokable createReturnStub(
         String methodName,
-        ConstraintMatcher constraints,
+        ArgumentsMatcher constraints,
         Object result) 
     {
         parameters.addActualMany(
@@ -40,14 +40,14 @@
 
 	public void expectCreateReturnExpectation(
 		String methodName, 
-		ConstraintMatcher constraints, 
+		ArgumentsMatcher constraints, 
 		Object result)
 	{
 		parameters.addExpectedMany(
 			new Object[] { "createReturnExpectation", methodName, constraints, result });
 	}
     
-	public Invokable createReturnExpectation(String methodName, ConstraintMatcher constraints, Object result) {
+	public Invokable createReturnExpectation(String methodName, ArgumentsMatcher constraints, Object result) {
 		parameters.addActualMany(
 			new Object[] { "createReturnExpectation", methodName, constraints, result });
 		return createInvokableResult;
@@ -55,7 +55,7 @@
 
     public void expectCreateThrowableStub(
         String methodName, 
-        ConstraintMatcher constraints, 
+        ArgumentsMatcher constraints, 
         Throwable throwable)
     {
         parameters.addExpectedMany(
@@ -64,7 +64,7 @@
     
     public Invokable createThrowableStub(
         String methodName,
-        ConstraintMatcher constraints,
+        ArgumentsMatcher constraints,
         Throwable throwable) 
     {
         parameters.addActualMany(
@@ -74,21 +74,21 @@
 
 	public void expectCreateThrowableExpectation(
 		String methodName, 
-		ConstraintMatcher constraints, 
+		ArgumentsMatcher constraints, 
 		Throwable throwable)
 	{
 		parameters.addExpectedMany(
 			new Object[] { "createThrowableExpectation", methodName, constraints, throwable });
 	}
     
-	public Invokable createThrowableExpectation(String methodName, ConstraintMatcher constraints, Throwable throwable) {
+	public Invokable createThrowableExpectation(String methodName, ArgumentsMatcher constraints, Throwable throwable) {
 		parameters.addActualMany(
 			new Object[] { "createThrowableExpectation", methodName, constraints, throwable });
 		return createInvokableResult;
 	}
     public void expectCreateVoidCallable(
         String methodName, 
-        ConstraintMatcher constraints)
+        ArgumentsMatcher constraints)
     {
         parameters.addExpectedMany(
             new Object[] { "createVoidStub", methodName, constraints });
@@ -96,7 +96,7 @@
     
     public Invokable createVoidStub(
         String methodName,
-        ConstraintMatcher constraints) 
+        ArgumentsMatcher constraints) 
     {
         parameters.addActualMany(
             new Object[] { "createVoidStub", methodName, constraints });
@@ -105,13 +105,13 @@
 
 	public void expectCreateVoidExpectation(
 		String methodName, 
-		ConstraintMatcher constraints)
+		ArgumentsMatcher constraints)
 	{
 		parameters.addExpectedMany(
 			new Object[] { "createVoidExpectation", methodName, constraints });
 	}
 
-	public Invokable createVoidExpectation(String methodName, ConstraintMatcher constraints) {
+	public Invokable createVoidExpectation(String methodName, ArgumentsMatcher constraints) {
 		parameters.addActualMany(
 			new Object[] { "createVoidExpectation", methodName, constraints });
 		return createInvokableResult;

Index: MockConstraintMatcher.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support/MockConstraintMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockConstraintMatcher.java	23 Sep 2003 23:04:33 -0000	1.1
+++ MockConstraintMatcher.java	4 Oct 2003 22:56:45 -0000	1.2
@@ -1,9 +1,9 @@
 package test.mockobjects.dynamic.support;
 
 import com.mockobjects.*;
-import com.mockobjects.dynamic.ConstraintMatcher;
+import com.mockobjects.dynamic.ArgumentsMatcher;
 
-public class MockConstraintMatcher implements ConstraintMatcher{
+public class MockConstraintMatcher implements ArgumentsMatcher{
 	private ExpectationCounter myMatchesCalls = new ExpectationCounter("MockConstraintMatcher.matches(Object[])");
 	private ReturnValues myActualMatchesReturnValues = new ReturnValues("MockConstraintMatcher.matches(Object[])", true);
 	private ExpectationList myMatchesParameter0Values = new ExpectationList("MockConstraintMatcher.matches(Object[]) java.lang.Object");