X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2Ftree%2FTreeTestResultLogger.java;h=535abe61b52ba0c38a600b55dbb898703557635c;hb=1a4b784250a43f6c7421ab5d8567c3bfbf51e990;hp=a0736fdbac0e45ace6c45a8d6f3401e9d20a057e;hpb=62e442adb36b006627b17061864dfa4edde0a99a;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java
index a0736fdba..535abe61b 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java
@@ -3,7 +3,7 @@ package org.argeo.slc.core.test.tree;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.argeo.slc.core.test.SimpleResultPart;
+import org.argeo.slc.core.test.TestResultListener;
 import org.argeo.slc.core.test.TestResultPart;
 import org.argeo.slc.core.test.TestStatus;
 
@@ -13,28 +13,40 @@ import org.argeo.slc.core.test.TestStatus;
  * @see TreeTestResult
  * 
  */
-public class TreeTestResultLogger extends AsynchronousTreeTestResultListener {
+public class TreeTestResultLogger implements TestResultListener<TreeTestResult> {
 
 	private static Log log = LogFactory.getLog(TreeTestResultLogger.class);
 
-	public TreeTestResultLogger() {
-		super(true);
-	}
+	private Boolean logExceptionMessages = false;
 
-	@Override
-	protected void resultPartAdded(PartStruct partStruct) {
-		TestResultPart part = partStruct.part;
-		String msg = partStruct.part + " - " + partStruct.uuid + ":"
-				+ partStruct.path;
-		if (part.getStatus().equals(TestStatus.PASSED)) {
+	public void resultPartAdded(TreeTestResult testResult,
+			TestResultPart testResultPart) {
+		String msg = testResultPart + " - " + testResult.getUuid() + ":"
+				+ testResult.getCurrentPath();
+		if (testResultPart.getStatus().equals(TestStatus.PASSED)) {
 			log.info(msg);
-		} else if (part.getStatus().equals(TestStatus.FAILED)) {
+		} else if (testResultPart.getStatus().equals(TestStatus.FAILED)) {
 			log.warn(msg);
-		} else if (part.getStatus().equals(TestStatus.ERROR)) {
-			log.error(msg + ((SimpleResultPart) part).getExceptionMessage());
+		} else if (testResultPart.getStatus().equals(TestStatus.ERROR)) {
+			if (logExceptionMessages)
+				msg = msg + "\n" + testResultPart.getExceptionMessage();
+
+			log.error(msg);
+
+			if (!logExceptionMessages || log.isDebugEnabled())
+				log.debug(testResultPart.getExceptionMessage());
+
 		} else {
 			log.error("Unknow test status: " + msg);
 		}
 	}
 
+	public void close(TreeTestResult testResult) {
+		log.info("Test result " + testResult.getUuid() + " closed.");
+	}
+
+	public void setLogExceptionMessages(Boolean logExceptionMessages) {
+		this.logExceptionMessages = logExceptionMessages;
+	}
+
 }