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=96d0db046509e4ab5e356e85e309c7097ddf0545;hb=8c69c342c923aff75e3cc53afe390b767bb81e2e;hp=43a3607108ef7ba18318a888d89109293ae5cf35;hpb=e860e15db1fd6dc797205de434c75a22f6e5f9a4;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 43a360710..96d0db046 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
@@ -10,64 +10,40 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.argeo.slc.core.SlcException;
-import org.argeo.slc.core.process.SlcExecution;
-import org.argeo.slc.core.process.SlcExecutionAware;
-import org.argeo.slc.core.process.SlcExecutionStep;
 import org.argeo.slc.core.structure.StructureAware;
 import org.argeo.slc.core.structure.StructureElement;
 import org.argeo.slc.core.structure.StructureRegistry;
 import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.test.NumericTRId;
 import org.argeo.slc.core.test.TestResult;
-import org.argeo.slc.core.test.TestResultId;
 import org.argeo.slc.core.test.TestResultListener;
 import org.argeo.slc.core.test.TestResultPart;
+import org.argeo.slc.core.test.TestRun;
+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>,
-		SlcExecutionAware {
+		Comparable<TreeTestResult> {
 	private Log log = LogFactory.getLog(TreeTestResult.class);
-	/** For ORM */
-	private Long tid;
 
-	private NumericTRId testResultId;
-	private List<TestResultListener> listeners = new Vector<TestResultListener>();
+	private List<TestResultListener<TreeTestResult>> listeners = new Vector<TestResultListener<TreeTestResult>>();
 
 	private TreeSPath currentPath;
-	private String currentSlcExecutionUuid;
-	private String currentSlcExecutionStepUuid;
+	private TestRun currentTestRun;
 
 	private Date closeDate;
 
 	private boolean isClosed = false;
 
+	private String uuid;
+
 	private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();
 	private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();
 
-	private StructureRegistry<TreeSPath> registry;
-
-	public TestResultId getTestResultId() {
-		return testResultId;
-	}
-
-	/**
-	 * Use of a <code>NumericTRId</code> is required by Hibernate. <b>It may
-	 * change in the future.</b>
-	 */
-	public NumericTRId getNumericResultId() {
-		return testResultId;
-	}
-
-	/** Sets the test result id as a numeric test result id. */
-	public void setNumericResultId(NumericTRId testResultId) {
-		this.testResultId = testResultId;
-	}
-
 	/** Sets the list of listeners. */
-	public void setListeners(List<TestResultListener> listeners) {
+	public void setListeners(List<TestResultListener<TreeTestResult>> listeners) {
 		this.listeners = listeners;
 	}
 
@@ -78,15 +54,16 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 		PartSubList subList = resultParts.get(currentPath);
 		if (subList == null) {
 			subList = new PartSubList();
-			subList.setSlcExecutionUuid(currentSlcExecutionUuid);
-			subList.setSlcExecutionStepUuid(currentSlcExecutionStepUuid);
 			resultParts.put(currentPath, subList);
 		}
+		if (part instanceof TestRunAware && currentTestRun != null) {
+			((TestRunAware) part).notifyTestRun(currentTestRun);
+		}
 		subList.getParts().add(part);
 
 		// notify listeners
 		synchronized (listeners) {
-			for (TestResultListener listener : listeners) {
+			for (TestResultListener<TreeTestResult> listener : listeners) {
 				listener.resultPartAdded(this, part);
 			}
 		}
@@ -99,18 +76,18 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 				if (!elements.containsKey(p)) {
 					StructureElement elem = registry.getElement(p);
 					if (elem != null) {
-						// elements.put(p, elem.getLabel());
 						elements.put(p, elem);
-					} else {
-						log.warn("An element is already registered for path "
-								+ p);
 					}
+				} else {
+					if (log.isTraceEnabled())
+						log.trace("An element is already registered for path "
+								+ p + " and was not updated");
 				}
+
 			}
 		}
 
 		currentPath = (TreeSPath) path;
-		this.registry = registry;
 	}
 
 	/** Gets the current path. */
@@ -130,39 +107,22 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 
 	public void close() {
 		if (isClosed) {
-			throw new SlcException("Test Result #" + getTestResultId()
+			throw new SlcException("Test Result #" + getUuid()
 					+ " alredy closed.");
 		}
 		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 #" + getTestResultId() + " closed.");
-	}
-
-	Long getTid() {
-		return tid;
-	}
-
-	void setTid(Long tid) {
-		this.tid = tid;
-	}
-
-	/** Gets the related registry (can be null). */
-	public StructureRegistry<TreeSPath> getRegistry() {
-		return registry;
+		log.info("Test Result #" + getUuid() + " closed.");
 	}
 
-	/** Sets the related registry. */
-	// public void setRegistry(StructureRegistry<TreeSPath> registry) {
-	// this.registry = registry;
-	// }
 	public Date getCloseDate() {
 		return closeDate;
 	}
@@ -172,12 +132,8 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 		this.closeDate = closeDate;
 	}
 
-	public void notifySlcExecution(SlcExecution slcExecution) {
-		currentSlcExecutionUuid = slcExecution.getUuid();
-		SlcExecutionStep step = slcExecution.currentStep();
-		if (step != null) {
-			currentSlcExecutionStepUuid = step.getUuid();
-		}
+	public void notifyTestRun(TestRun testRun) {
+		currentTestRun = testRun;
 	}
 
 	public SortedMap<TreeSPath, StructureElement> getElements() {
@@ -188,4 +144,41 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 		this.elements = pathNames;
 	}
 
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public SortedMap<TreeSPath, StructureElement> getRelatedElements(
+			TreeSPath path) {
+		SortedMap<TreeSPath, StructureElement> relatedElements = new TreeMap<TreeSPath, StructureElement>();
+		List<TreeSPath> hierarchy = path.getHierarchyAsList();
+		for (TreeSPath currPath : elements.keySet()) {
+			if (hierarchy.contains(currPath)) {
+				relatedElements.put(currPath, elements.get(currPath));
+			}
+		}
+		return relatedElements;
+	}
+
+	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());
+		}
+	}
+
 }