mockobjects-java-dev

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

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

Modified Files:
	MockVoidCall.java 
Log Message:
Layout and internal refactoring
Fixed javadoc argument

Index: MockVoidCall.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/MockVoidCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockVoidCall.java	31 Oct 2002 17:03:45 -0000	1.1
+++ MockVoidCall.java	5 Nov 2002 16:03:40 -0000	1.2
@@ -22,8 +22,6 @@
     
     
     /** Constructs an <code>MockVoidCall</code> that accepts any arguments.
-     * 
-     *  @param name
      *      The name of the expected method.
      */
     public MockVoidCall() {
@@ -32,8 +30,6 @@
     
     /** Constructs a <code>MockVoidCall</code> that checks its arguments.
      * 
-     *  @param name
-     *      The name of the expected method.
      *  @param expected_args
      *      Predicates that define the valid arguments of the method.
      */
@@ -57,12 +53,10 @@
     private void checkArguments( Object[] args )
     {
         int arg_count = (args == null) ? 0 : args.length;
-        assertEquals( "wrong number of arguments",
-                      getArgumentCount(), arg_count );
+        assertEquals( "wrong number of arguments", getArgumentCount(), arg_count );
         
         for( int i = 0; i < arg_count; i++ ) {
-            Object arg = args[i];
-            checkArgument(i, arg);
+            checkArgument( i, _expected_args[i], args[i]);
         }
     }
     
@@ -70,12 +64,11 @@
         return _expected_args.length;
     }
     
-    private void checkArgument( int i, Object arg ) {
-        if( !_expected_args[i].eval(arg) ) {
-            fail( "unexpected argument " + (i+1) + ": " +
-                  ", expected " + describeArgument(i) +
-                  ", was <" + arg + ">" );
-        }
+    private void checkArgument( int i, Predicate expectedArg, Object arg ) {
+        assertTrue("argument " + (i+1) + "\n" +
+                  "expected " + expectedArg + "\n" +
+                  "     was " + arg + "",
+                   expectedArg.eval(arg) );
     }
     
     public String describeArgument( int n ) {