Improve logging

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / core / test / tree / TreeTestResult.java

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 f34561a9e3b33881d2bd9c425f2d7990b2795132..781c6eee2a1cc29124f4cf4eee44d82d29133633 100644 (file)
--- 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
@@ -9,9 +9,7 @@ import java.util.Vector;
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-\r
 import org.argeo.slc.core.SlcException;\r
-import org.argeo.slc.core.structure.SimpleSElement;\r
 import org.argeo.slc.core.structure.StructureAware;\r
 import org.argeo.slc.core.structure.StructureElement;\r
 import org.argeo.slc.core.structure.StructureRegistry;\r
@@ -35,8 +33,6 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
        private TreeSPath currentPath;\r
        private TestRun currentTestRun;\r
 \r
-       private Map<String, String> rootTags = new TreeMap<String, String>();\r
-\r
        private Date closeDate;\r
 \r
        private boolean isClosed = false;\r
@@ -46,6 +42,8 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
        private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();\r
        private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();\r
 \r
+       private Map<String, String> attributes = new TreeMap<String, String>();\r
+\r
        /** Sets the list of listeners. */\r
        public void setListeners(List<TestResultListener<TreeTestResult>> listeners) {\r
                this.listeners = listeners;\r
@@ -80,15 +78,6 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
                                if (!elements.containsKey(p)) {\r
                                        StructureElement elem = registry.getElement(p);\r
                                        if (elem != null) {\r
-\r
-                                               if (elements.size() == 0\r
-                                                               && (elem instanceof SimpleSElement)) {\r
-                                                       SimpleSElement sElem = ((SimpleSElement) elem)\r
-                                                                       .clone();\r
-                                                       sElem.getTags().putAll(rootTags);\r
-                                                       elem = sElem;\r
-                                               }\r
-\r
                                                elements.put(p, elem);\r
                                        }\r
                                } else {\r
@@ -100,7 +89,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
                        }\r
                }\r
 \r
-               currentPath = (TreeSPath) path;\r
+               currentPath = path;\r
        }\r
 \r
        /** Gets the current path. */\r
@@ -121,7 +110,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
        public void close() {\r
                if (isClosed) {\r
                        throw new SlcException("Test Result #" + getUuid()\r
-                                       + " alredy closed.");\r
+                                       + " already closed.");\r
                }\r
                closeDate = new Date();\r
 \r
@@ -168,6 +157,11 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 \r
        public SortedMap<TreeSPath, StructureElement> getRelatedElements(\r
                        TreeSPath path) {\r
+               if (path == null)\r
+                       throw new SlcException(\r
+                                       "Cannot retrieve element for a null path in result #"\r
+                                                       + uuid);\r
+\r
                SortedMap<TreeSPath, StructureElement> relatedElements = new TreeMap<TreeSPath, StructureElement>();\r
                List<TreeSPath> hierarchy = path.getHierarchyAsList();\r
                for (TreeSPath currPath : elements.keySet()) {\r
@@ -195,12 +189,11 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
                }\r
        }\r
 \r
-       public Map<String, String> getRootTags() {\r
-               return rootTags;\r
+       public Map<String, String> getAttributes() {\r
+               return attributes;\r
        }\r
 \r
-       public void setRootTags(Map<String, String> rootTags) {\r
-               this.rootTags = rootTags;\r
+       public void setAttributes(Map<String, String> attributes) {\r
+               this.attributes = attributes;\r
        }\r
-\r
 }\r