Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint In directory sc8-pr-cvs1:/tmp/cvs-serv6139/src/core/com/mockobjects/constraint Modified Files: Or.java IsNot.java IsEqual.java IsSame.java IsLessThan.java And.java IsEventFrom.java IsGreaterThan.java Log Message: Removed toString()'s from Constraint reporting because it's built into the language Index: Or.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/Or.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Or.java 12 Nov 2002 17:42:38 -0000 1.1 +++ Or.java 24 Nov 2002 11:20:19 -0000 1.2 @@ -23,6 +23,6 @@ } public String toString() { - return "(" + _p1.toString() + " or " + _p2.toString() + ")"; + return "(" + _p1 + " or " + _p2 + ")"; } } Index: IsNot.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsNot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IsNot.java 12 Nov 2002 17:42:37 -0000 1.1 +++ IsNot.java 24 Nov 2002 11:20:19 -0000 1.2 @@ -20,6 +20,6 @@ } public String toString() { - return "not " + _predicate.toString(); + return "not " + _predicate; } } Index: IsEqual.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsEqual.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IsEqual.java 12 Nov 2002 17:42:37 -0000 1.1 +++ IsEqual.java 24 Nov 2002 11:20:19 -0000 1.2 @@ -23,6 +23,6 @@ } public String toString() { - return "a value equal to <" + _object.toString() + ">"; + return "a value equal to <" + _object + ">"; } } Index: IsSame.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsSame.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IsSame.java 12 Nov 2002 17:42:37 -0000 1.1 +++ IsSame.java 24 Nov 2002 11:20:19 -0000 1.2 @@ -26,6 +26,6 @@ } public String toString() { - return "the same object as <" + _object.toString() + ">"; + return "the same object as <" + _object + ">"; } } Index: IsLessThan.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsLessThan.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IsLessThan.java 12 Nov 2002 17:42:37 -0000 1.1 +++ IsLessThan.java 24 Nov 2002 11:20:19 -0000 1.2 @@ -22,6 +22,6 @@ } public String toString() { - return "a value less than <" + _object.toString() + ">"; + return "a value less than <" + _object + ">"; } } Index: And.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/And.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- And.java 12 Nov 2002 17:42:37 -0000 1.1 +++ And.java 24 Nov 2002 11:20:19 -0000 1.2 @@ -23,6 +23,6 @@ } public String toString() { - return "(" + _p1.toString() + " and " + _p2.toString() + ")"; + return "(" + _p1 + " and " + _p2 + ")"; } } Index: IsEventFrom.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsEventFrom.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IsEventFrom.java 12 Nov 2002 17:42:38 -0000 1.1 +++ IsEventFrom.java 24 Nov 2002 11:20:19 -0000 1.2 @@ -43,6 +43,6 @@ public String toString() { return "an event of type " + _event_class.getName() + - " from " + _source.toString(); + " from " + _source; } } Index: IsGreaterThan.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/constraint/IsGreaterThan.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IsGreaterThan.java 12 Nov 2002 17:42:38 -0000 1.1 +++ IsGreaterThan.java 24 Nov 2002 11:20:19 -0000 1.2 @@ -22,6 +22,6 @@ } public String toString() { - return "a value greater than <" + _object.toString() + ">"; + return "a value greater than <" + _object + ">"; } } |