[MO-java-dev] CVS: mockobjects-java/src/core/functional/test/mockobjects/dynamic VoidMockTest.java,1.1,1.2 MockTestActions.java,1.1,1.2 MockTest.java,1.4,1.5 ThrowableMockTest.java,1.1,1.2 ReturnMockTest.java,1.1,1.2

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

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

Modified Files:
	VoidMockTest.java MockTestActions.java MockTest.java 
	ThrowableMockTest.java ReturnMockTest.java 
Log Message:
Removed Mock unit tests in favour of Mock functional test

InvokableFactory is now a class



Index: VoidMockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic/VoidMockTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VoidMockTest.java	8 Oct 2003 23:45:44 -0000	1.1
+++ VoidMockTest.java	15 Oct 2003 08:20:54 -0000	1.2
@@ -4,12 +4,14 @@
  */
 package functional.test.mockobjects.dynamic;
 
+import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
 
 public class VoidMockTest extends MockTest {
 	public interface TargetType {
 		void noParams();
 		void oneParam(Object aParam);
+		void twoParams(Object param1, Object param2);
 	}
 
 	public class VoidMockTestActions implements MockTestActions {
@@ -18,10 +20,12 @@
 
 		public void expectNoParams() { mockTarget.expect("noParams"); }
 		public void expectOneParam() { mockTarget.expect("oneParam", "one"); }
+		public void expectTwoParams() {mockTarget.expect("twoParams", C.eq("one", "two")); }
 		public void expectNotNoParams() { mockTarget.expect("notNoParams"); }
 		public void callNoParams() { targetType.noParams(); }
 		public void callOneParam() { targetType.oneParam("one"); }
-		public void callOneIncorrectParam() { targetType.oneParam("two"); }
+		public void callTwoParams() { targetType.twoParams("one", "two"); }
+		public void callIncorrectSecondParameter() { targetType.twoParams("one", "not two"); }
 		public void verifyMock() { mockTarget.verify(); }
 	}
 

Index: MockTestActions.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic/MockTestActions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockTestActions.java	8 Oct 2003 23:45:44 -0000	1.1
+++ MockTestActions.java	15 Oct 2003 08:20:54 -0000	1.2
@@ -6,9 +6,11 @@
 public interface MockTestActions {
 	void expectNoParams();
 	void expectOneParam();
+	void expectTwoParams();
 	void expectNotNoParams();
 	void callNoParams();
 	void callOneParam();
-	void callOneIncorrectParam();
+	void callTwoParams();
+	void callIncorrectSecondParameter();
 	void verifyMock();
 }

Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockTest.java	8 Oct 2003 23:45:44 -0000	1.4
+++ MockTest.java	15 Oct 2003 08:20:54 -0000	1.5
@@ -71,17 +71,17 @@
 		fail("Should have thrown exception");
 	}
 
-	public void testPassesIfMockedMethodCalledWithParameter() {
-		actions.expectOneParam();
-		actions.callOneParam();
+	public void testPassesIfMockedMethodCalledWithParameters() {
+		actions.expectTwoParams();
+		actions.callTwoParams();
 		actions.verifyMock();
 	}
 
 	public void testInvocationFailsIfParameterValueIncorrect() {
-		actions.expectOneParam();
+		actions.expectTwoParams();
 		
 		try {
-			actions.callOneIncorrectParam();
+			actions.callIncorrectSecondParameter();
 		} catch (AssertionFailedError unused) {
 			return;
 		}

Index: ThrowableMockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic/ThrowableMockTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThrowableMockTest.java	8 Oct 2003 23:45:44 -0000	1.1
+++ ThrowableMockTest.java	15 Oct 2003 08:20:54 -0000	1.2
@@ -4,13 +4,15 @@
  */
 package functional.test.mockobjects.dynamic;
 
+import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
 
 public class ThrowableMockTest extends MockTest {
 	public class TargetException extends Exception {};
 	public interface TargetType {
-		Object noParams() throws TargetException;
-		Object oneParam(Object aParam) throws TargetException;
+		void noParams() throws TargetException;
+		void oneParam(Object aParam) throws TargetException;
+		void twoParams(Object param1, Object param2) throws TargetException;
 	}
 
 	public class ReturnMockTestActions implements MockTestActions {
@@ -19,6 +21,9 @@
 
 		public void expectNoParams() { mockTarget.expectAndThrow("noParams", new TargetException()); }
 		public void expectOneParam() { mockTarget.expectAndThrow("oneParam", "one", new TargetException()); }
+		public void expectTwoParams() {
+			mockTarget.expectAndThrow("twoParams", C.eq("one", "two"), new TargetException()); 			
+		}
 		public void expectNotNoParams() { mockTarget.expectAndThrow("notNoParams", new TargetException()); }
 		public void callNoParams() {
 			try {
@@ -36,9 +41,17 @@
 			} 
 			fail("Should have thrown exception");
  		}
-		public void callOneIncorrectParam() { 
+		public void callTwoParams() {
+			try {
+				targetType.twoParams("one", "two");
+			} catch (TargetException expected) {
+				return;
+			} 
+			fail("Should have thrown exception");
+		}
+		public void callIncorrectSecondParameter() { 
 			try {
-				targetType.oneParam("two");
+				targetType.twoParams("one", "not two");
 			} catch (TargetException e) {
 				return; // skip
 			} 

Index: ReturnMockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic/ReturnMockTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReturnMockTest.java	8 Oct 2003 23:45:44 -0000	1.1
+++ ReturnMockTest.java	15 Oct 2003 08:20:54 -0000	1.2
@@ -4,12 +4,14 @@
  */
 package functional.test.mockobjects.dynamic;
 
+import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
 
 public class ReturnMockTest extends MockTest {
 	public interface TargetType {
 		Object noParams();
 		Object oneParam(Object aParam);
+		Object twoParams(Object param1, Object param2);
 	}
 
 	public class ThrowableMockTestActions implements MockTestActions {
@@ -18,6 +20,9 @@
 
 		public void expectNoParams() { mockTarget.expectAndReturn("noParams", "result"); }
 		public void expectOneParam() { mockTarget.expectAndReturn("oneParam", "one", "result"); }
+		public void expectTwoParams() {
+			mockTarget.expectAndReturn("twoParams", C.eq("one", "two"), "result");			
+		}
 		public void expectNotNoParams() { mockTarget.expectAndReturn("notNoParams", "result"); }
 		public void callNoParams() { 
 			assertEquals("Should be no params result", "result", targetType.noParams()); 
@@ -25,7 +30,10 @@
 		public void callOneParam() { 			
 			assertEquals("Should be one params result", "result", targetType.oneParam("one")); 
  		}
-		public void callOneIncorrectParam() { targetType.oneParam("two"); }
+		public void callTwoParams() {
+			assertEquals("Should be two params result", "result", targetType.twoParams("one", "two")); 			
+		}
+		public void callIncorrectSecondParameter() { targetType.twoParams("one", "not two"); }
 		public void verifyMock() { mockTarget.verify(); }
 	}