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

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

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

Modified Files:
	Test_Mock.java 
Log Message:
added test against returning values from void methods
fixed VOID failures in CallWithSideEffects tests
renamed tests for consistency

Index: Test_Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/Test_Mock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Test_Mock.java	21 Oct 2002 22:52:38 -0000	1.1
+++ Test_Mock.java	25 Oct 2002 21:03:03 -0000	1.2
@@ -152,7 +152,7 @@
         _mock.verify();
     }
     
-    public void testExpectCallWithSideEffects() {
+    public void testExpectCallWithSideEffect() {
         final StringBuffer buf = new StringBuffer();
         _mock.expect( 
             new ExpectedCall( "sideEffect",
@@ -160,7 +160,7 @@
             {
                 public Object eval( Object[] args ) throws Throwable {
                     buf.append("hello");
-                    return null;
+                    return Mock.VOID;
                 }
             } );
         
@@ -375,7 +375,7 @@
         _mock.setup( new ExpectedCall("sideEffect") {
             public Object eval( Object[] args ) throws Throwable {
                 buf.append("hello");
-                return null;
+                return Mock.VOID;
             }
         } );
         
@@ -413,7 +413,19 @@
         _interface.first();
         _interface.second();
     }
-    
+
+    public void testErrorWhenMockedVoidMethodReturnsAValue() {
+        _mock.expectReturn( "voidMethod", Mock.NO_ARGS, Boolean.TRUE );
+
+        try {
+            _interface.voidMethod();
+        }
+        catch( AssertionFailedError ex ) {
+            return;
+        }
+        fail("should have thrown AssertionFailedError when return from void method");
+    }
+
     public void testDerivedMockClass() {
         DerivedMock mock = new DerivedMock("Derived");
         ExampleInterface i = (ExampleInterface)Proxy.newProxyInstance(