mockobjects-java-dev

[Tim M. <ma...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint
In directory sc8-pr-cvs1:/tmp/cvs-serv25351/core/com/mockobjects/constraint

Modified Files:
	IsEqual.java IsLessThan.java IsGreaterThan.java 
Log Message:
Integration with branch DynamicMockExperiment.

If you have problems - you can revert to Version 08.

Index: IsEqual.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsEqual.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IsEqual.java	24 Nov 2002 11:20:19 -0000	1.2
+++ IsEqual.java	18 May 2003 20:59:40 -0000	1.3
@@ -4,6 +4,9 @@
  */
 package com.mockobjects.constraint;
 
+import java.util.Arrays;
+
+import com.mockobjects.dynamic.DynamicUtil;
 
 /** Is the value equal to another value, as tested by the 
  *  {@link java.lang.Object#equals} method?
@@ -12,17 +15,26 @@
 {
     private Object _object;
     
-    /** Creates a new instance of IsEqual
-      */
-    public IsEqual( Object o ) {
-        _object = o;
+    public IsEqual( Object equalArg) {
+    	if(equalArg instanceof Object[]) {
+    		_object = Arrays.asList((Object[])equalArg);
+    	} else {
+        	_object = equalArg;
+    	}
     }
     
     public boolean eval( Object arg ) {
+    	if(arg instanceof Object[]) {
+    		arg = Arrays.asList((Object[])arg);
+    	}
         return arg.equals(_object);
     }
     
-    public String toString() {
-        return "a value equal to <" + _object + ">";
+    public String toString() { 
+    	return " = " + DynamicUtil.proxyToString(_object);
+    }
+    
+    public boolean equals(Object anObject) {
+    	return eval(anObject);    	
     }
 }

Index: IsLessThan.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsLessThan.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IsLessThan.java	24 Nov 2002 11:20:19 -0000	1.2
+++ IsLessThan.java	18 May 2003 20:59:40 -0000	1.3
@@ -11,8 +11,6 @@
 {
     private Comparable _object;
     
-    /** Creates a new instance of IsLessThan
-      */
     public IsLessThan(Comparable o) {
         _object = o;
     }

Index: IsGreaterThan.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsGreaterThan.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IsGreaterThan.java	24 Nov 2002 11:20:19 -0000	1.2
+++ IsGreaterThan.java	18 May 2003 20:59:40 -0000	1.3
@@ -5,14 +5,13 @@
 package com.mockobjects.constraint;
 
 
-/** Is the value greater than another {@link java.lang.Comparable} value?
+/** 
+ * Is the value greater than another {@link java.lang.Comparable} value?
  */
 public class IsGreaterThan implements Constraint
 {
     private Comparable _object;
     
-    /** Creates a new instance of IsGreaterThan
-      */
     public IsGreaterThan( Comparable o ) {
         _object = o;
     }