X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2Ftree%2FTreeTestResult.java;h=f34561a9e3b33881d2bd9c425f2d7990b2795132;hb=7ffec52c590ce511b476f55be4ad123418268aa0;hp=9b807c904be55023d0ab614273c3a442c51e629d;hpb=62e442adb36b006627b17061864dfa4edde0a99a;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
index 9b807c904..f34561a9e 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
@@ -2,6 +2,7 @@ package org.argeo.slc.core.test.tree;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Vector;
@@ -10,6 +11,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.argeo.slc.core.SlcException;
+import org.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.StructureAware;
 import org.argeo.slc.core.structure.StructureElement;
 import org.argeo.slc.core.structure.StructureRegistry;
@@ -24,14 +26,17 @@ import org.argeo.slc.core.test.TestRunAware;
  * Complex implementation of a test result compatible with a tree based
  * structure.
  */
-public class TreeTestResult implements TestResult, StructureAware<TreeSPath> {
+public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
+		Comparable<TreeTestResult> {
 	private Log log = LogFactory.getLog(TreeTestResult.class);
 
-	private List<TestResultListener> listeners = new Vector<TestResultListener>();
+	private List<TestResultListener<TreeTestResult>> listeners = new Vector<TestResultListener<TreeTestResult>>();
 
 	private TreeSPath currentPath;
 	private TestRun currentTestRun;
 
+	private Map<String, String> rootTags = new TreeMap<String, String>();
+
 	private Date closeDate;
 
 	private boolean isClosed = false;
@@ -42,7 +47,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath> {
 	private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();
 
 	/** Sets the list of listeners. */
-	public void setListeners(List<TestResultListener> listeners) {
+	public void setListeners(List<TestResultListener<TreeTestResult>> listeners) {
 		this.listeners = listeners;
 	}
 
@@ -62,7 +67,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath> {
 
 		// notify listeners
 		synchronized (listeners) {
-			for (TestResultListener listener : listeners) {
+			for (TestResultListener<TreeTestResult> listener : listeners) {
 				listener.resultPartAdded(this, part);
 			}
 		}
@@ -75,6 +80,15 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath> {
 				if (!elements.containsKey(p)) {
 					StructureElement elem = registry.getElement(p);
 					if (elem != null) {
+
+						if (elements.size() == 0
+								&& (elem instanceof SimpleSElement)) {
+							SimpleSElement sElem = ((SimpleSElement) elem)
+									.clone();
+							sElem.getTags().putAll(rootTags);
+							elem = sElem;
+						}
+
 						elements.put(p, elem);
 					}
 				} else {
@@ -112,14 +126,15 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath> {
 		closeDate = new Date();
 
 		synchronized (listeners) {
-			for (TestResultListener listener : listeners) {
+			for (TestResultListener<TreeTestResult> listener : listeners) {
 				listener.close(this);
 			}
 			listeners.clear();
 		}
 		isClosed = true;
 
-		log.info("Test Result #" + getUuid() + " closed.");
+		if (log.isTraceEnabled())
+			log.trace("Test Result " + getUuid() + " closed.");
 	}
 
 	public Date getCloseDate() {
@@ -166,6 +181,26 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath> {
 	public TestRun getCurrentTestRun() {
 		return currentTestRun;
 	}
-	
-	
+
+	public int compareTo(TreeTestResult ttr2) {
+		TreeTestResult ttr1 = this;
+		if (ttr1.getCloseDate() != null && ttr2.getCloseDate() != null) {
+			return -ttr1.getCloseDate().compareTo(ttr2.getCloseDate());
+		} else if (ttr1.getCloseDate() != null && ttr2.getCloseDate() == null) {
+			return 1;
+		} else if (ttr1.getCloseDate() == null && ttr2.getCloseDate() != null) {
+			return -1;
+		} else {
+			return ttr1.getUuid().compareTo(ttr2.getUuid());
+		}
+	}
+
+	public Map<String, String> getRootTags() {
+		return rootTags;
+	}
+
+	public void setRootTags(Map<String, String> rootTags) {
+		this.rootTags = rootTags;
+	}
+
 }