[MO-java-dev] CVS: mockobjects-java/src/core/test/mockobjects/dynamic MockTest.java,1.2,1.3

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

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

Modified Files:
	MockTest.java 
Log Message:
Fixed broken tests to use voidMethod(), rather than noArgs()
Some layout

Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockTest.java	31 Oct 2002 17:03:46 -0000	1.2
+++ MockTest.java	5 Nov 2002 16:02:04 -0000	1.3
@@ -47,10 +47,8 @@
         }
         
         public String objectTypes( Integer n ) throws Throwable {
-            Method method = getClass().getMethod("objectTypes",
-                new Class[] { Integer.class } );
-            
-            return (String)mockCall( method , new Object[]{n} );
+            Method method = getClass().getMethod("objectTypes", new Class[] { Integer.class } );
+            return (String)mockCall(method , new Object[]{n} );
         }
     };
     
@@ -186,9 +184,9 @@
     }
     
     public void testCalledExpectationClearedBySubsequentExpecation() {
-        _mock.expectVoid( "noArgs", Mock.NO_ARGS );
-        _interface.noArgs();
-        _mock.expectVoid( "noArgs", Mock.NO_ARGS );
+        _mock.expectVoid( "voidMethod", Mock.NO_ARGS );
+        _interface.voidMethod();
+        _mock.expectVoid( "voidMethod", Mock.NO_ARGS );
         
         assertFails("verify did not fail when not all of the expected methods were called",
                     new Runnable() {
@@ -320,10 +318,10 @@
     }
     
     public void testExpectNotCalledClearedBySubsequentExpectation() {
-        _mock.expectNotCalled("noArgs");
-        _mock.expectVoid( "noArgs", Mock.NO_ARGS );
+        _mock.expectNotCalled("voidMethod");
+        _mock.expectVoid( "voidMethod", Mock.NO_ARGS );
         
-        _interface.noArgs();
+        _interface.voidMethod();
         
         _mock.verify();
     }