Author: bago
Date: Sat Aug 9 03:36:13 2008
New Revision: 684218
URL: http://svn.apache.org/viewvc?rev=684218&view=rev
Log:
More logging for the tests (debugging an issue on hudson)
Modified:
james/jspf/branches/multimodule-proposal/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
Modified:
james/jspf/branches/multimodule-proposal/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java?rev=684218&r1=684217&r2=684218&view=diff
==============================================================================
---
james/jspf/branches/multimodule-proposal/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
(original)
+++
james/jspf/branches/multimodule-proposal/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
Sat Aug 9 03:36:13 2008
@@ -266,7 +266,7 @@
HashMap currentTest = (HashMap) data.getTests().get(testName);
Logger testLogger = log.getChildLogger(testName+"-verify");
if (currentTest.get("result") instanceof String) {
- assertEquals("Test "+testName+"
("+currentTest.get("description")+") failed. Returned: "+res.getResult()+"
Expected: "+currentTest.get("result")+"
[["+res.getResult()+"||"+res.getHeaderText()+"]]", currentTest.get("result"),
res.getResult());
+ assertEquals("Test "+testName+"
("+currentTest.get("description")+") failed. Returned: "+resultSPF+" Expected:
"+currentTest.get("result")+" [["+resultSPF+"||"+res.getHeaderText()+"]]",
currentTest.get("result"), resultSPF);
} else {
ArrayList results = (ArrayList) currentTest.get("result");
boolean match = false;
@@ -274,7 +274,7 @@
if (results.get(i).equals(resultSPF)) match = true;
// testLogger.debug("checking "+resultSPF+" against allowed
result "+results.get(i));
}
- assertTrue(match);
+ assertTrue("Test "+testName+" ("+currentTest.get("description")+")
failed. Returned: "+resultSPF+" Expected: "+results, match);
}
if (currentTest.get("explanation") != null) {
@@ -293,7 +293,7 @@
}
- testLogger.info("PASSED. Result="+res.getResult()+"
Explanation="+res.getExplanation()+" Header="+res.getHeaderText());
+ testLogger.info("PASSED. Result="+resultSPF+"
Explanation="+res.getExplanation()+" Header="+res.getHeaderText());
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]