Introduce test result attributes instead of root tags

[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 ecd6cad52ac1921190d06a36a1f438bc41f59d60..5d680ff8e2399ccd25e90ef1c1042d8bfb044ebb 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
@@ -34,8 +34,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
@@ -45,6 +43,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
@@ -79,15 +79,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
@@ -199,12 +190,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