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=96d0db046509e4ab5e356e85e309c7097ddf0545;hpb=8c69c342c923aff75e3cc53afe390b767bb81e2e;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 96d0db046..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; @@ -33,6 +35,8 @@ public class TreeTestResult implements TestResult, StructureAware, private TreeSPath currentPath; private TestRun currentTestRun; + private Map rootTags = new TreeMap(); + private Date closeDate; private boolean isClosed = false; @@ -76,6 +80,15 @@ public class TreeTestResult implements TestResult, StructureAware, 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 { @@ -120,7 +133,8 @@ public class TreeTestResult implements TestResult, StructureAware, } isClosed = true; - log.info("Test Result #" + getUuid() + " closed."); + if (log.isTraceEnabled()) + log.trace("Test Result " + getUuid() + " closed."); } public Date getCloseDate() { @@ -181,4 +195,12 @@ public class TreeTestResult implements TestResult, StructureAware, } } + public Map getRootTags() { + return rootTags; + } + + public void setRootTags(Map rootTags) { + this.rootTags = rootTags; + } + }