You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by js...@apache.org on 2002/10/22 09:24:57 UTC
cvs commit: jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit AssertTagSupport.java AssertEqualsTag.java
jstrachan 2002/10/22 00:24:56
Modified: jelly/src/test/org/apache/commons/jelly/junit suite.jelly
jelly/src/java/org/apache/commons/jelly/tags/junit
AssertTagSupport.java AssertEqualsTag.java
Log:
Added some more tracing to the JellyUnit assertion tags so its clear which expressions were just evaluated
Revision Changes Path
1.3 +11 -0 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/junit/suite.jelly
Index: suite.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/junit/suite.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- suite.jelly 9 Aug 2002 15:46:55 -0000 1.2
+++ suite.jelly 22 Oct 2002 07:24:56 -0000 1.3
@@ -72,4 +72,15 @@
The exception was: ${ex.message}
</test:case>
+<!--
+
+ #### uncomment when assertEquals supports type conversions
+
+ <test:case name="assertEqualsConversion">
+
+ <test:assertEquals expected="${4}" actual="${2+2}"/>
+
+ </test:case>
+-->
+
</test:suite>
1.5 +2 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
Index: AssertTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AssertTagSupport.java 9 Aug 2002 15:46:45 -0000 1.4
+++ AssertTagSupport.java 22 Oct 2002 07:24:56 -0000 1.5
@@ -104,12 +104,12 @@
/**
* Produces a failure if the actual value was not equal to the expected value
*/
- protected void failNotEquals(String message, Object expected, Object actual) throws AssertionFailedError {
+ protected void failNotEquals(String message, Object expected, Object actual, String expressions) throws AssertionFailedError {
String formatted= "";
if (message != null) {
formatted = message +" ";
}
- fail(formatted + "expected:[" + expected + "] but was:[" + actual + "]");
+ fail(formatted + "expected:[" + expected + "] but was:[" + actual + "]" + expressions);
}
}
1.2 +12 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
Index: AssertEqualsTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AssertEqualsTag.java 20 Jul 2002 08:12:04 -0000 1.1
+++ AssertEqualsTag.java 22 Oct 2002 07:24:56 -0000 1.2
@@ -74,23 +74,28 @@
*/
public class AssertEqualsTag extends AssertTagSupport {
- private Object actual;
- private Object expected;
+ private Expression actual;
+ private Expression expected;
// Tag interface
//-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws Exception {
String message = getBodyText();
+
+ Object expectedValue = expected.evaluate(context);
+ Object actualValue = actual.evaluate(context);
- if (expected == null && actual == null) {
+ if (expectedValue == null && expectedValue == null) {
return;
}
- if (expected != null && expected.equals(actual)) {
+ if (actualValue != null && expectedValue.equals(actualValue)) {
return;
}
- failNotEquals(message, expected, actual);
+ String expressions = "\nExpected expression: " + expected + "\nActual expression: " + actual;
+
+ failNotEquals(message, expectedValue, actualValue, expressions);
}
// Properties
@@ -100,14 +105,14 @@
* Sets the actual value which will be compared against the
* expected value.
*/
- public void setActual(Object actual) {
+ public void setActual(Expression actual) {
this.actual = actual;
}
/**
* Sets the expected value to be tested against
*/
- public void setExpected(Object expected) {
+ public void setExpected(Expression expected) {
this.expected = expected;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>