Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint
In directory sc8-pr-cvs1:/tmp/cvs-serv18515/src/core/com/mockobjects/constraint
Modified Files:
Tag: DynamicMockExperiment
IsLessThan.java IsEqual.java IsGreaterThan.java
Log Message:
Constraint update - reluctantly had to
introduce .equals to test matchOneAndReturn + small comment cleanup
Index: IsLessThan.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsLessThan.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- IsLessThan.java 24 Nov 2002 11:20:19 -0000 1.2
+++ IsLessThan.java 11 Apr 2003 13:17:04 -0000 1.2.2.1
@@ -11,8 +11,6 @@
{
private Comparable _object;
- /** Creates a new instance of IsLessThan
- */
public IsLessThan(Comparable o) {
_object = o;
}
Index: IsEqual.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsEqual.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- IsEqual.java 7 Apr 2003 17:38:50 -0000 1.2.2.1
+++ IsEqual.java 11 Apr 2003 13:17:04 -0000 1.2.2.2
@@ -12,8 +12,6 @@
{
private Object _object;
- /** Creates a new instance of IsEqual
- */
public IsEqual( Object o ) {
_object = o;
}
@@ -24,5 +22,9 @@
public String toString() {
return _object.toString();
+ }
+
+ public boolean equals(Object anObject) {
+ return anObject.getClass().equals(this.getClass()) && eval(((IsEqual)anObject)._object);
}
}
Index: IsGreaterThan.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsGreaterThan.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- IsGreaterThan.java 24 Nov 2002 11:20:19 -0000 1.2
+++ IsGreaterThan.java 11 Apr 2003 13:17:04 -0000 1.2.2.1
@@ -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;
}
|