[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic/matchers CallOnceMatcher.java,1.1,1.2 MethodNameMatcher.java,1.1,1.2 ArgumentsMatcher.java,1.1,1.2

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

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

Modified Files:
	CallOnceMatcher.java MethodNameMatcher.java 
	ArgumentsMatcher.java 
Log Message:
Added better error reporting. Shows invocation and invokables.

Index: CallOnceMatcher.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/matchers/CallOnceMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallOnceMatcher.java	29 Oct 2003 22:11:35 -0000	1.1
+++ CallOnceMatcher.java	18 Nov 2003 23:12:51 -0000	1.2
@@ -23,4 +23,8 @@
 		Assert.assertTrue("Should have been invoked", wasInvoked);
 	}
 
+	public StringBuffer writeTo(StringBuffer buffer) {
+		return buffer.append("Call once");
+	}
+
 }

Index: MethodNameMatcher.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/matchers/MethodNameMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MethodNameMatcher.java	29 Oct 2003 22:11:35 -0000	1.1
+++ MethodNameMatcher.java	18 Nov 2003 23:12:51 -0000	1.2
@@ -22,4 +22,7 @@
 	public boolean matches(Invocation invocation) {
 		return constraint.eval(invocation.getMethodName());
 	}
+	public StringBuffer writeTo(StringBuffer buffer) {
+		return buffer.append("Method ").append(constraint);
+	}
 }

Index: ArgumentsMatcher.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/matchers/ArgumentsMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArgumentsMatcher.java	29 Oct 2003 22:11:35 -0000	1.1
+++ ArgumentsMatcher.java	18 Nov 2003 23:12:51 -0000	1.2
@@ -38,15 +38,19 @@
 	}
 	
 	public String toString() {
-		StringBuffer result = new StringBuffer();
-		result.append("ArgumentMatcher: ");
-		for (int i = 0; i < constraints.length; ++i) {
-			result.append(constraints[i]).append(", ");
-		}
-		return result.toString();
+		return writeTo(new StringBuffer()).toString();
 	}
 	
 	public boolean equals(Object other) {
 		return other != null && toString().equals(other.toString());
+	}
+
+	public StringBuffer writeTo(StringBuffer buffer) {
+		buffer.append("Arguments [");
+		for (int i = 0; i < constraints.length; ++i) {
+			buffer.append(constraints[i]).append(", ");
+		}
+		buffer.append("]");
+		return buffer;
 	}
 }