[MO-java-dev] CVS: mockobjects-java/src/core/test/mockobjects/dynamic CallOnceExpectationTest.java,1.3,1.4 CallMatchTest.java,1.5,1.6 CallSequenceTest.java,1.10,1.11 MockCallable.java,1.4,1.5

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

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

Modified Files:
	CallOnceExpectationTest.java CallMatchTest.java 
	CallSequenceTest.java MockCallable.java 
Log Message:
renamed setupMatchesReturn to setupAlwaysMatchesCall

Index: CallOnceExpectationTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CallOnceExpectationTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CallOnceExpectationTest.java	5 Jul 2003 15:15:54 -0000	1.3
+++ CallOnceExpectationTest.java	5 Jul 2003 16:35:20 -0000	1.4
@@ -59,7 +59,7 @@
 	
 	public void testMatchesDelegated() throws Throwable {
 		mockCallable.setExpectedMatches( METHOD_NAME, ARGS );
-		mockCallable.setupMatchesReturn(true);
+		mockCallable.setupAlwaysMatchActiveCall(true);
 		assertTrue( "returns matches to be true", call.matches( CALL ) );
 		mockCallable.verifyExpectations();
 	}
@@ -74,7 +74,7 @@
 	
     public void testDoesNotMatchAfterMethodCalled() throws Throwable
     {
-        mockCallable.setupMatchesReturn(true);
+        mockCallable.setupAlwaysMatchActiveCall(true);
         mockCallable.setupCallReturn(RESULT);
         
         assertTrue( "First time should match", call.matches( CALL ));

Index: CallMatchTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CallMatchTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CallMatchTest.java	5 Jul 2003 15:15:54 -0000	1.5
+++ CallMatchTest.java	5 Jul 2003 16:35:20 -0000	1.6
@@ -72,7 +72,7 @@
 
     public void testMatchesAfterCalls() throws Throwable {
         mockCallable.setupCallReturn("result");
-        mockCallable.setupMatchesReturn(true);
+        mockCallable.setupAlwaysMatchActiveCall(true);
 
         mockConstraintMatcher.setupMatches(true);
 

Index: CallSequenceTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CallSequenceTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CallSequenceTest.java	5 Jul 2003 15:15:54 -0000	1.10
+++ CallSequenceTest.java	5 Jul 2003 16:35:20 -0000	1.11
@@ -42,7 +42,7 @@
 	public void testCallableThrowableThrown() throws Throwable {
 		final Throwable throwable = new DummyThrowable();
 
-		mockCallable.setupMatchesReturn(true);
+		mockCallable.setupAlwaysMatchActiveCall(true);
 		mockCallable.setupCallThrow(throwable);
 
 		callSequence.addExpect(mockCallable);
@@ -67,7 +67,7 @@
 	}
 
 	public void testCallFailsWithTooManyCalls() throws Throwable {
-		mockCallable.setupMatchesReturn(true);
+		mockCallable.setupAlwaysMatchActiveCall(true);
 		mockCallable.setupCallReturn(METHOD_A_RESULT);
 		callSequence.addExpect(mockCallable);
 		callSequence.call(new ActiveCall("willdefinitelyMatch", new Object[0]));
@@ -85,7 +85,7 @@
 
 	public void testCallPassedToContainedElements() throws Throwable {
 		methodA.setExpectedMatches(METHOD_A_NAME, METHOD_A_ARGS);
-		methodA.setupMatchesReturn(true);
+		methodA.setupAlwaysMatchActiveCall(true);
 		methodA.activeCall.setExpected(METHOD_A_CALL);
 		methodA.setupCallReturn(METHOD_A_RESULT);
 
@@ -102,7 +102,7 @@
 
 	public void testCallPassedToContainedElementsOtherOrderShouldFail()
 		throws Throwable {
-		methodA.setupMatchesReturn(false);
+		methodA.setupAlwaysMatchActiveCall(false);
 
 		methodA.setupGetDescription("***methodA-description****");
 		methodB.setupGetDescription("***methodB-description****");
@@ -133,7 +133,7 @@
 		final String result = "result";
 
 		mockCallable.setupCallReturn(result);
-		mockCallable.setupMatchesReturn(true);
+		mockCallable.setupAlwaysMatchActiveCall(true);
 
 		callSequence.addExpect(mockCallable);
 
@@ -150,11 +150,11 @@
 		final ActiveCall methodCCall = new ActiveCall(methodCName, methodCArgs);
 		
 		methodA.setExpectedMatches(methodCName, methodCArgs);
-		methodA.setupMatchesReturn(false);
+		methodA.setupAlwaysMatchActiveCall(false);
 		methodA.activeCall.setExpectNothing();
 		methodA.setupGetDescription("***methodA-description****");
 		methodB.activeCall.setExpected(methodCCall);
-		methodB.setupMatchesReturn(false);
+		methodB.setupAlwaysMatchActiveCall(false);
 		methodB.activeCall.setExpectNothing();
 		methodB.setupGetDescription("***methodB-description****");
 

Index: MockCallable.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockCallable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockCallable.java	5 Jul 2003 15:15:54 -0000	1.4
+++ MockCallable.java	5 Jul 2003 16:35:20 -0000	1.5
@@ -60,7 +60,7 @@
 		matchesCount.setExpected(count);
 	}
 	
-	public void setupMatchesReturn( boolean result ) {
+	public void setupAlwaysMatchActiveCall( boolean result ) {
 		matchesResult.setValue(result);
 	}