Menu
▾
▴
[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic BaseCallCollectionBuilder.java,1.1.2.2,1.1.2.3 CallSequence.java,1.6.2.1,1.6.2.2 DefaultCallFactory.java,1.5.2.2,1.5.2.3 CallSelection.java,1.1.2.1,1.1.2.2 DynamicUtil.java,1.2.2.1,1.2.2.2 NameMatcher.java,1.1.2.1,1.1.2.2 DefaultReturnStub.java,1.1.2.1,1.1.2.2 ArgumentMatcher.java,1.1.2.1,1.1.2.2 CallFactory.java,1.4.2.2,1.4.2.3 CallCollectionBuilder.java,1.1.2.2,1.1.2.3
|
From: Steve F. <sm...@us...> - 2003-06-27 16:03:06
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv8236/src/core/com/mockobjects/dynamic
Modified Files:
Tag: Nat_reworks_dynamics_from_0_09
BaseCallCollectionBuilder.java CallSequence.java
DefaultCallFactory.java CallSelection.java DynamicUtil.java
NameMatcher.java DefaultReturnStub.java ArgumentMatcher.java
CallFactory.java CallCollectionBuilder.java
Log Message:
Further changes from Nat
Index: BaseCallCollectionBuilder.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/BaseCallCollectionBuilder.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BaseCallCollectionBuilder.java 26 Jun 2003 17:32:48 -0000 1.1.2.2
+++ BaseCallCollectionBuilder.java 27 Jun 2003 16:03:02 -0000 1.1.2.3
@@ -50,9 +50,10 @@
}
public void expect( String methodName, Constraint[] args, Callable stub ) {
- addCallable(
- callFactory.createCallOnceExpectation(
- callFactory.createArgumentMatcher( methodName, args, stub )));
+ addCallable( callFactory.createCallOnceExpectation(
+ callFactory.createNameMatcher( methodName,
+ callFactory.createArgumentMatcher( args,
+ stub ))));
}
public void expectVoid( String methodName, Constraint[] args ) {
@@ -113,9 +114,9 @@
}
public void match( String methodName, Constraint[] args, Callable stub ) {
- composite.addCallable(
- callFactory.createArgumentMatcher( methodName, args,
- stub ) );
+ composite.addCallable( callFactory.createNameMatcher( methodName,
+ callFactory.createArgumentMatcher( args,
+ stub )));
}
public void matchAndReturn(String methodName, Constraint[] args, Object result) {
@@ -153,6 +154,10 @@
public void matchName( String methodName, Callable stub ) {
composite.addCallable(
callFactory.createNameMatcher( methodName, stub ) );
+ }
+
+ public void matchNameVoid( String methodName ) {
+ matchName( methodName, new VoidStub() );
}
public void matchNameAndReturn(String methodName, Object result ) {
Index: CallSequence.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallSequence.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- CallSequence.java 21 Jun 2003 14:01:07 -0000 1.6.2.1
+++ CallSequence.java 27 Jun 2003 16:03:02 -0000 1.6.2.2
@@ -38,7 +38,7 @@
public String getDescription() {
if (expectedCalls.isEmpty()) {
- return "no methods";
+ return "no method calls";
} else {
StringBuffer buf = new StringBuffer();
Index: DefaultCallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultCallFactory.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- DefaultCallFactory.java 26 Jun 2003 17:32:48 -0000 1.5.2.2
+++ DefaultCallFactory.java 27 Jun 2003 16:03:02 -0000 1.5.2.3
@@ -16,30 +16,29 @@
return new CallOnceExpectation(call);
}
- public Callable createArgumentMatcher( String methodName,
- Constraint[] constraints,
- Callable call )
- {
- return new ArgumentMatcher( methodName, constraints, call );
+ public Callable createArgumentMatcher( Constraint[] constraints,
+ Callable call )
+ {
+ return new ArgumentMatcher( constraints, call );
}
- public Callable createNameMatcher(String methodName, Callable call) {
- return new NameMatcher( methodName, call );
- }
+ public Callable createNameMatcher(String methodName, Callable call) {
+ return new NameMatcher( methodName, call );
+ }
public Callable createVoidStub() {
return new VoidStub();
}
- public CompositeCallable createCallSelection() {
- return new CallSelection();
- }
+ public CompositeCallable createCallSelection() {
+ return new CallSelection();
+ }
- public CompositeCallable createCallSequence() {
- return new CallSequence();
- }
+ public CompositeCallable createCallSequence() {
+ return new CallSequence();
+ }
- public CallCollectionBuilder createCallCollectionBuilder(CompositeCallable collection) {
- return new CallCollectionBuilder( this, collection );
- }
+ public CallCollectionBuilder createCallCollectionBuilder(CompositeCallable collection) {
+ return new CallCollectionBuilder( this, collection );
+ }
}
Index: CallSelection.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/CallSelection.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CallSelection.java 21 Jun 2003 14:01:07 -0000 1.1.2.1
+++ CallSelection.java 27 Jun 2003 16:03:02 -0000 1.1.2.2
@@ -49,7 +49,7 @@
public String getDescription() {
if (calls.isEmpty()) {
- return "no methods";
+ return "no method calls";
} else {
StringBuffer buf = new StringBuffer();
Index: DynamicUtil.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DynamicUtil.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- DynamicUtil.java 21 Jun 2003 14:01:07 -0000 1.2.2.1
+++ DynamicUtil.java 27 Jun 2003 16:03:02 -0000 1.2.2.2
@@ -7,7 +7,7 @@
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.List;
-
+
public class DynamicUtil {
public static Object[] asObjectArray(Object primitiveArray) {
@@ -96,16 +96,19 @@
}
public static String methodToString(String name, Object[] args) {
- StringBuffer buf = new StringBuffer();
-
- buf.append(name);
- buf.append("(");
- join(args,buf);
- buf.append(")");
-
- return buf.toString();
+ return name + argumentsToString(args);
}
+ public static String argumentsToString( Object[] args ) {
+ StringBuffer buf = new StringBuffer();
+
+ buf.append("(");
+ join(args,buf);
+ buf.append(")");
+
+ return buf.toString();
+ }
+
public static void join(Object[] elements, StringBuffer buf) {
for (int i = 0; i < elements.length; i++) {
if (i > 0) {
Index: NameMatcher.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/NameMatcher.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NameMatcher.java 21 Jun 2003 14:01:07 -0000 1.1.2.1
+++ NameMatcher.java 27 Jun 2003 16:03:02 -0000 1.1.2.2
@@ -20,7 +20,7 @@
}
public String getDescription() {
- return getMethodName();
+ return getMethodName() + super.getDescription();
}
public String getMethodName() {
Index: DefaultReturnStub.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/DefaultReturnStub.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DefaultReturnStub.java 26 Jun 2003 17:32:48 -0000 1.1.2.1
+++ DefaultReturnStub.java 27 Jun 2003 16:03:02 -0000 1.1.2.2
@@ -2,7 +2,9 @@
*/
package com.mockobjects.dynamic;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import junit.framework.AssertionFailedError;
Index: ArgumentMatcher.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/ArgumentMatcher.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ArgumentMatcher.java 21 Jun 2003 14:01:07 -0000 1.1.2.1
+++ ArgumentMatcher.java 27 Jun 2003 16:03:02 -0000 1.1.2.2
@@ -6,34 +6,30 @@
public class ArgumentMatcher
- extends NameMatcher
+ extends CallDecorator
{
private Constraint[] constraints;
- public ArgumentMatcher( String methodName,
- Constraint[] constraints,
- Callable delegate )
- {
- super( methodName, delegate );
+ public ArgumentMatcher( Constraint[] constraints,
+ Callable delegate )
+ {
+ super( delegate );
this.constraints = (Constraint[])constraints.clone();
}
public boolean matches( ActiveCall call ) {
- return super.matches(call)
- && constraintsMatch( call.getParameterValues() );
- }
-
- private boolean constraintsMatch( List args ) {
- if( args.size() != constraints.length ) return false;
+ List args = call.getParameterValues();
+
+ if( args.size() != constraints.length ) return false;
- for( int i = 0; i < args.size(); i++) {
- if( !constraints[i].eval(args.get(i)) ) return false;
- }
+ for( int i = 0; i < args.size(); i++) {
+ if( !constraints[i].eval(args.get(i)) ) return false;
+ }
- return true;
- }
+ return super.matches(call);
+ }
public String getDescription() {
- return DynamicUtil.methodToString( getMethodName(), constraints );
+ return DynamicUtil.argumentsToString( constraints );
}
}
Index: CallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallFactory.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- CallFactory.java 26 Jun 2003 17:32:48 -0000 1.4.2.2
+++ CallFactory.java 27 Jun 2003 16:03:02 -0000 1.4.2.3
@@ -12,8 +12,7 @@
Callable createCallOnceExpectation( Callable call );
- Callable createArgumentMatcher( String methodName,
- Constraint[] constraints,
+ Callable createArgumentMatcher( Constraint[] constraints,
Callable call );
Callable createNameMatcher( String methodName,
Index: CallCollectionBuilder.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/CallCollectionBuilder.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CallCollectionBuilder.java 26 Jun 2003 17:32:48 -0000 1.1.2.2
+++ CallCollectionBuilder.java 27 Jun 2003 16:03:02 -0000 1.1.2.3
@@ -1,6 +1,7 @@
// WARNING: DO NOT EDIT
-// This file was automatically generated by the Boxer (floats like a butterfly, strings like a bee)
-// Generated on Thu Jun 19 19:50:08 BST 2003
+// This file was automatically generated by the Boxer
+// "Float like a butterfly, string like a bee."
+// Generated on Tue Jun 24 20:47:48 BST 2003 by npryce
package com.mockobjects.dynamic;
@@ -13,16 +14,8 @@
super(arg0);
[...1172 lines suppressed...]
- public void matchNameAndReturn(java.lang.String arg0, boolean arg1) {
- super.matchNameAndReturn(arg0, new Boolean(arg1));
- }
-
public void matchNameAndReturn(java.lang.String arg0, short arg1) {
super.matchNameAndReturn(arg0, new Short(arg1));
+ }
+
+ public void matchNameAndReturn(java.lang.String arg0, long arg1) {
+ super.matchNameAndReturn(arg0, new Long(arg1));
+ }
+
+ public void matchNameAndReturn(java.lang.String arg0, char arg1) {
+ super.matchNameAndReturn(arg0, new Character(arg1));
+ }
+
+ public void matchNameAndReturn(java.lang.String arg0, byte arg1) {
+ super.matchNameAndReturn(arg0, new Byte(arg1));
}
}
|
