From 2a47cd88fcf4aedcb9f92c5900786c17f8e13698 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 Oct 2008 08:43:43 +0000
Subject: [PATCH] Improve error management: - register in collection the first
 result part - catches errors in slc.test executions - improve web display of
 errors

git-svn-id: https://svn.argeo.org/slc/trunk@1689 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.core/pom.xml                    |   1 -
 .../slc/core/test/BasicTestDefinition.java    |   3 +
 .../slc/core/test/tree/TreeTestResult.java    |   6 +-
 .../slc/dao/test/tree/TreeTestResultDao.java  |   4 +
 .../tree/CreateTreeTestResultRequest.java     |  13 +
 .../slc/msg/test/tree/ResultPartRequest.java  |  11 +
 .../org/argeo/slc/castor/msg/mapping.xml      | 179 ++++---
 .../org/argeo/slc/castor/test/mapping.xml     |   6 +-
 .../core/test/spring/applicationContext.xml   |  70 +--
 .../main/resources/org/argeo/slc/xml/slc.xsd  | 495 +++++++++---------
 10 files changed, 421 insertions(+), 367 deletions(-)

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index 61da5f740..513110c97 100644
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -45,7 +45,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.0.8</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.ws</groupId>
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
index 1178b41ec..4d62ba39d 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.core.test;
 
+import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.structure.tree.TreeSRelatedHelper;
 import org.argeo.slc.core.test.context.ContextAware;
 import org.argeo.slc.core.test.context.ContextUtils;
@@ -31,6 +32,8 @@ public class BasicTestDefinition extends TreeSRelatedHelper implements
 			TestData testData = testRun.getTestData();
 			ContextUtils.compareReachedExpected((ContextAware) testData,
 					testRun.getTestResult(), this);
+		} else {
+			throw new SlcException("No test data defined.");
 		}
 	}
 }
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 3e365afe0..0c3eea382 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
@@ -44,7 +44,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 	private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();
 	private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();
 
-	private Map<String, String> attributes = new TreeMap<String, String>();
+	private SortedMap<String, String> attributes = new TreeMap<String, String>();
 
 	/** Sets the list of listeners. */
 	public void setListeners(List<TestResultListener<TreeTestResult>> listeners) {
@@ -204,11 +204,11 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 		}
 	}
 
-	public Map<String, String> getAttributes() {
+	public SortedMap<String, String> getAttributes() {
 		return attributes;
 	}
 
-	public void setAttributes(Map<String, String> attributes) {
+	public void setAttributes(SortedMap<String, String> attributes) {
 		this.attributes = attributes;
 	}
 
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
index 49984e114..e7582a869 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
@@ -2,6 +2,7 @@ package org.argeo.slc.dao.test.tree;
 
 import java.util.List;
 import java.util.Map;
+import java.util.SortedMap;
 
 import org.argeo.slc.core.structure.StructureElement;
 import org.argeo.slc.core.structure.tree.TreeSPath;
@@ -16,4 +17,7 @@ public interface TreeTestResultDao extends TestResultDao<TreeTestResult> {
 	public void addResultPart(String testResultId, TreeSPath path,
 			SimpleResultPart resultPart,
 			Map<TreeSPath, StructureElement> relatedElements);
+
+	public void updateAttributes(String testResultId,
+			SortedMap<String, String> attributes);
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
index e11ef0407..0bac8a821 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
@@ -1,9 +1,11 @@
 package org.argeo.slc.msg.test.tree;
 
+import org.argeo.slc.core.test.TestRunDescriptor;
 import org.argeo.slc.core.test.tree.TreeTestResult;
 
 public class CreateTreeTestResultRequest {
 	private TreeTestResult treeTestResult;
+	private TestRunDescriptor testRunDescriptor;
 
 	public CreateTreeTestResultRequest() {
 
@@ -11,6 +13,9 @@ public class CreateTreeTestResultRequest {
 
 	public CreateTreeTestResultRequest(TreeTestResult treeTestResult) {
 		this.treeTestResult = treeTestResult;
+		if (treeTestResult.getCurrentTestRun() != null)
+			testRunDescriptor = new TestRunDescriptor(treeTestResult
+					.getCurrentTestRun());
 	}
 
 	public TreeTestResult getTreeTestResult() {
@@ -21,6 +26,14 @@ public class CreateTreeTestResultRequest {
 		this.treeTestResult = treeTestResult;
 	}
 
+	public TestRunDescriptor getTestRunDescriptor() {
+		return testRunDescriptor;
+	}
+
+	public void setTestRunDescriptor(TestRunDescriptor testRunDescriptor) {
+		this.testRunDescriptor = testRunDescriptor;
+	}
+
 	@Override
 	public String toString() {
 		return getClass().getSimpleName() + "#" + treeTestResult.getUuid();
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
index 7e3750ea9..09acea56a 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
@@ -1,6 +1,7 @@
 package org.argeo.slc.msg.test.tree;
 
 import java.util.Map;
+import java.util.SortedMap;
 
 import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.structure.StructureElement;
@@ -16,6 +17,7 @@ public class ResultPartRequest {
 	private TreeSPath path;
 	private Map<TreeSPath, StructureElement> relatedElements;
 	private TestRunDescriptor testRunDescriptor;
+	private SortedMap<String, String> attributes;
 
 	public ResultPartRequest() {
 
@@ -29,6 +31,7 @@ public class ResultPartRequest {
 		relatedElements = ttr.getRelatedElements(this.path);
 		if (ttr.getCurrentTestRun() != null)
 			testRunDescriptor = new TestRunDescriptor(ttr.getCurrentTestRun());
+		attributes = ttr.getAttributes();
 	}
 
 	public ResultPartRequest(TreeTestResult ttr) {
@@ -89,6 +92,14 @@ public class ResultPartRequest {
 		this.relatedElements = relatedElements;
 	}
 
+	public SortedMap<String, String> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(SortedMap<String, String> attributes) {
+		this.attributes = attributes;
+	}
+
 	@Override
 	public String toString() {
 		return getClass().getSimpleName() + "#" + resultUuid + " " + path;
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
index f695f9573..98517081c 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
@@ -1,82 +1,99 @@
-<?xml version="1.0"?>
-
-<mapping>
-	<description>Message objects XML mapping</description>
-
-	<!-- TESTS -->
-	<class
-		name="org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="treeTestResult"
-			type="org.argeo.slc.core.test.tree.TreeTestResult" />
-	</class>
-
-	<class
-		name="org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="resultUuid" />
-		<field name="closeDate" />
-	</class>
-
-	<class name="org.argeo.slc.msg.test.tree.ResultPartRequest">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="resultUuid" />
-		<field name="resultPart"
-			type="org.argeo.slc.core.test.SimpleResultPart">
-			<bind-xml auto-naming="deriveByClass" />
-		</field>
-
-		<field name="relatedElements" collection="map">
-			<bind-xml name="element" location="related-elements">
-				<class name="org.exolab.castor.mapping.MapItem">
-					<map-to
-						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
-					<field name="key"
-						type="org.argeo.slc.core.structure.tree.TreeSPath"
-						handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">
-						<bind-xml name="path" node="attribute" />
-					</field>
-					<field name="value"
-						type="org.argeo.slc.core.structure.SimpleSElement">
-						<bind-xml auto-naming="deriveByClass" />
-					</field>
-				</class>
-			</bind-xml>
-		</field>
-		<field name="path">
-			<bind-xml auto-naming="deriveByClass" />
-		</field>
-		<field name="testRunDescriptor" />
-	</class>
-
-
-	<!-- PROCESS -->
-	<class name="org.argeo.slc.msg.process.SlcExecutionStepsRequest">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="slcExecutionUuid" />
-		<field name="steps" collection="vector"
-			type="org.argeo.slc.core.process.SlcExecutionStep">
-			<bind-xml auto-naming="deriveByClass" location="steps" />
-		</field>
-	</class>
-
-	<class name="org.argeo.slc.msg.process.SlcExecutionStatusRequest">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="slcExecutionUuid" />
-		<field name="newStatus"/>
-	</class>
-
-	<class name="org.argeo.slc.msg.process.SlcExecutionRequest">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="slcExecution"
-			type="org.argeo.slc.core.process.SlcExecution" />
-	</class>
-
-
+<?xml version="1.0"?>
+
+<mapping>
+    <description>Message objects XML mapping</description>
+
+    <!-- TESTS -->
+    <class
+        name="org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="treeTestResult"
+            type="org.argeo.slc.core.test.tree.TreeTestResult" />
+        <field name="testRunDescriptor" />
+    </class>
+
+    <class
+        name="org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="resultUuid" />
+        <field name="closeDate" />
+    </class>
+
+    <class name="org.argeo.slc.msg.test.tree.ResultPartRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="resultUuid" />
+        <field name="resultPart"
+            type="org.argeo.slc.core.test.SimpleResultPart">
+            <bind-xml auto-naming="deriveByClass" />
+        </field>
+
+        <field name="relatedElements" collection="map">
+            <bind-xml name="element" location="related-elements">
+                <class name="org.exolab.castor.mapping.MapItem">
+                    <map-to
+                        ns-uri="http://argeo.org/projects/slc/schemas"
+                        ns-prefix="slc" />
+                    <field name="key"
+                        type="org.argeo.slc.core.structure.tree.TreeSPath"
+                        handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">
+                        <bind-xml name="path" node="attribute" />
+                    </field>
+                    <field name="value"
+                        type="org.argeo.slc.core.structure.SimpleSElement">
+                        <bind-xml auto-naming="deriveByClass" />
+                    </field>
+                </class>
+            </bind-xml>
+        </field>
+        <field name="path">
+            <bind-xml auto-naming="deriveByClass" />
+        </field>
+        <field name="testRunDescriptor" />
+        <field name="attributes" collection="sortedmap">
+            <bind-xml name="attribute" location="attributes">
+                <class name="org.exolab.castor.mapping.MapItem">
+                    <map-to
+                        ns-uri="http://argeo.org/projects/slc/schemas"
+                        ns-prefix="slc" />
+                    <field name="key" type="string">
+                        <bind-xml name="name" node="attribute" />
+                    </field>
+                    <field name="value" type="string">
+                        <bind-xml node="text" />
+                    </field>
+                </class>
+            </bind-xml>
+        </field>
+    </class>
+
+
+    <!-- PROCESS -->
+    <class name="org.argeo.slc.msg.process.SlcExecutionStepsRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="slcExecutionUuid" />
+        <field name="steps" collection="vector"
+            type="org.argeo.slc.core.process.SlcExecutionStep">
+            <bind-xml auto-naming="deriveByClass" location="steps" />
+        </field>
+    </class>
+
+    <class name="org.argeo.slc.msg.process.SlcExecutionStatusRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="slcExecutionUuid" />
+        <field name="newStatus" />
+    </class>
+
+    <class name="org.argeo.slc.msg.process.SlcExecutionRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="slcExecution"
+            type="org.argeo.slc.core.process.SlcExecution" />
+    </class>
+
+
 </mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
index e35450e16..f6dfbf984 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
@@ -22,7 +22,7 @@
 			<bind-xml name="uuid" node="attribute" />
 		</field>
 		<field name="closeDate" />
-		<field name="attributes" collection="map">
+		<field name="attributes" collection="sortedmap">
 			<bind-xml name="attribute" location="attributes">
 				<class name="org.exolab.castor.mapping.MapItem">
 					<map-to
@@ -36,7 +36,7 @@
 				</class>
 			</bind-xml>
 		</field>
-		<field name="resultParts" collection="map">
+		<field name="resultParts" collection="sortedmap">
 			<bind-xml name="result-part" location="result-parts">
 				<class name="org.exolab.castor.mapping.MapItem">
 					<map-to
@@ -53,7 +53,7 @@
 				</class>
 			</bind-xml>
 		</field>
-		<field name="elements" collection="map">
+		<field name="elements" collection="sortedmap">
 			<bind-xml name="element" location="elements">
 				<class name="org.exolab.castor.mapping.MapItem">
 					<map-to
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
index 91ce57482..20c821401 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
@@ -1,43 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
-	default-lazy-init="true">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+    default-lazy-init="true">
 
-	<bean id="slcDefault.test.resultLogger"
-		class="org.argeo.slc.core.test.tree.TreeTestResultLogger">
-	</bean>
+    <bean id="slcDefault.test.resultLogger"
+        class="org.argeo.slc.core.test.tree.TreeTestResultLogger">
+    </bean>
 
-	<bean name="slcDefault.test.testRun"
-		class="org.argeo.slc.core.test.SimpleTestRun">
-	</bean>
+    <bean name="slcDefault.test.testRun"
+        class="org.argeo.slc.core.test.SimpleTestRun"
+        scope="prototype">
+    </bean>
 
-	<bean name="slcDefault.test.uuid" class="java.util.UUID"
-		factory-method="randomUUID" scope="prototype">
-	</bean>
+    <bean name="slcDefault.test.uuid" class="java.util.UUID"
+        factory-method="randomUUID" scope="prototype">
+    </bean>
 
-	<bean id="slcDefault.test.basicTreeTestResult"
-		class="org.argeo.slc.core.test.tree.TreeTestResult" abstract="true"
-		destroy-method="close">
-		<property name="uuid">
-			<bean factory-bean="slcDefault.test.uuid"
-				factory-method="toString">
-			</bean>
-		</property>
-		<property name="listeners">
-			<list>
-				<ref bean="slcDefault.test.resultLogger" />
-			</list>
-		</property>
-	</bean>
+    <bean id="slcDefault.test.basicTreeTestResult"
+        class="org.argeo.slc.core.test.tree.TreeTestResult"
+        abstract="true" destroy-method="close">
+        <property name="uuid">
+            <bean factory-bean="slcDefault.test.uuid"
+                factory-method="toString">
+            </bean>
+        </property>
+        <property name="listeners">
+            <list>
+                <ref bean="slcDefault.test.resultLogger" />
+            </list>
+        </property>
+    </bean>
 
-	<bean id="slcDefault.test.basicSimpleTestResult"
-		class="org.argeo.slc.core.test.SimpleTestResult" abstract="true">
-		<property name="uuid">
-			<bean factory-bean="slcDefault.test.uuid"
-				factory-method="toString">
-			</bean>
-		</property>
-	</bean>
+    <bean id="slcDefault.test.basicSimpleTestResult"
+        class="org.argeo.slc.core.test.SimpleTestResult"
+        abstract="true">
+        <property name="uuid">
+            <bean factory-bean="slcDefault.test.uuid"
+                factory-method="toString">
+            </bean>
+        </property>
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
index 4be18ff74..5b7b43e15 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
@@ -1,254 +1,259 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:slc="http://argeo.org/projects/slc/schemas"
-	elementFormDefault="qualified"
-	targetNamespace="http://argeo.org/projects/slc/schemas">
-	<!-- TREE TEST RESULT -->
-	<xs:element name="tree-test-result" type="slc:TreeTestResultType" />
-	<xs:element name="tree-test-result-collection"
-		type="slc:TreeTestResultCollectionType" />
+    xmlns:slc="http://argeo.org/projects/slc/schemas"
+    elementFormDefault="qualified"
+    targetNamespace="http://argeo.org/projects/slc/schemas">
+    <!-- TREE TEST RESULT -->
+    <xs:element name="tree-test-result" type="slc:TreeTestResultType" />
+    <xs:element name="tree-test-result-collection"
+        type="slc:TreeTestResultCollectionType" />
 
-	<xs:complexType name="TreeTestResultCollectionType">
-		<xs:all>
-			<xs:element name="results" minOccurs="0"
-				type="slc:ResultsType" />
-		</xs:all>
-		<xs:attribute name="id" use="required" />
-	</xs:complexType>
-	<xs:complexType name="ResultsType">
-		<xs:sequence>
-			<xs:element name="tree-test-result"
-				type="slc:TreeTestResultType" minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TreeTestResultType">
-		<xs:all>
-			<xs:element name="close-date" type="xs:dateTime"
-				minOccurs="0" />
-			<xs:element name="attributes" minOccurs="0"
-				type="slc:AttributesType" />
-			<xs:element name="result-parts" minOccurs="0"
-				type="slc:ResultPartsType" />
-			<xs:element name="elements" minOccurs="0"
-				type="slc:ElementsType" />
-		</xs:all>
-		<xs:attribute name="uuid" use="required" />
-	</xs:complexType>
-	<xs:complexType name="ResultPartsType">
-		<xs:sequence>
-			<xs:element name="result-part" type="slc:ResultPartType"
-				minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ResultPartType">
-		<xs:all>
-			<xs:element name="part-sub-list" type="slc:PartSubListType" />
-		</xs:all>
-		<xs:attribute name="path" type="xs:string" use="required" />
-	</xs:complexType>
-	<xs:complexType name="PartSubListType">
-		<xs:all>
-			<xs:element name="parts" minOccurs="0" type="slc:PartsType" />
-		</xs:all>
-	</xs:complexType>
-	<xs:complexType name="PartsType">
-		<xs:sequence>
-			<xs:element name="simple-result-part"
-				type="slc:SimpleResultPartType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="SimpleResultPartType">
-		<xs:all>
-			<xs:element name="status">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="PASSED" />
-						<xs:enumeration value="FAILED" />
-						<xs:enumeration value="ERROR" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="message" type="xs:string" />
-			<xs:element name="exception-message" minOccurs="0"
-				type="xs:string" />
-			<xs:element name="stack-lines" minOccurs="0"
-				type="slc:StackLinesType" />
-			<xs:element name="test-run-uuid" type="xs:string"
-				minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-	<xs:complexType name="StackLinesType">
-		<xs:sequence>
-			<xs:element name="stack-line" maxOccurs="unbounded"
-				type="xs:string" />
-		</xs:sequence>
-		<xs:attribute name="message" type="xs:string" />
-	</xs:complexType>
-	<xs:complexType name="ElementsType">
-		<xs:sequence>
-			<xs:element name="element" type="slc:ElementType"
-				minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ElementType">
-		<xs:all>
-			<xs:element name="simple-sElement"
-				type="slc:SimpleSElementType" />
-		</xs:all>
-		<xs:attribute name="path" type="xs:string" use="required" />
-	</xs:complexType>
-	<xs:complexType name="SimpleSElementType">
-		<xs:all>
-			<xs:element name="label" type="xs:string" />
-			<xs:element name="tags" type="slc:TagsType" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-	<xs:complexType name="TagsType">
-		<xs:sequence>
-			<xs:element name="tag" type="slc:TagType" minOccurs="0"
-				maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TagType">
-		<xs:all>
-			<xs:element name="tag-value" type="xs:string" />
-		</xs:all>
-		<xs:attribute name="name" type="xs:string" use="required" />
-	</xs:complexType>
-	<xs:complexType name="TreeSPathType">
-		<xs:attribute name="as-unique-string" type="xs:string"
-			use="required" />
-	</xs:complexType>
-	<xs:complexType name="TestRunDescriptorType">
-		<xs:all>
-			<xs:element name="test-run-uuid" type="xs:string" />
-			<xs:element name="slc-execution-uuid" type="xs:string"
-				minOccurs="0" />
-			<xs:element name="slc-execution-step-uuid" type="xs:string"
-				minOccurs="0" />
-			<xs:element name="deployed-sytem-id" type="xs:string"
-				minOccurs="0" />
-			<xs:element name="test-result-uuid" type="xs:string"
-				minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
+    <xs:complexType name="TreeTestResultCollectionType">
+        <xs:all>
+            <xs:element name="results" minOccurs="0"
+                type="slc:ResultsType" />
+        </xs:all>
+        <xs:attribute name="id" use="required" />
+    </xs:complexType>
+    <xs:complexType name="ResultsType">
+        <xs:sequence>
+            <xs:element name="tree-test-result"
+                type="slc:TreeTestResultType" minOccurs="0"
+                maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TreeTestResultType">
+        <xs:all>
+            <xs:element name="close-date" type="xs:dateTime"
+                minOccurs="0" />
+            <xs:element name="attributes" minOccurs="0"
+                type="slc:AttributesType" />
+            <xs:element name="result-parts" minOccurs="0"
+                type="slc:ResultPartsType" />
+            <xs:element name="elements" minOccurs="0"
+                type="slc:ElementsType" />
+        </xs:all>
+        <xs:attribute name="uuid" use="required" />
+    </xs:complexType>
+    <xs:complexType name="ResultPartsType">
+        <xs:sequence>
+            <xs:element name="result-part" type="slc:ResultPartType"
+                minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ResultPartType">
+        <xs:all>
+            <xs:element name="part-sub-list" type="slc:PartSubListType" />
+        </xs:all>
+        <xs:attribute name="path" type="xs:string" use="required" />
+    </xs:complexType>
+    <xs:complexType name="PartSubListType">
+        <xs:all>
+            <xs:element name="parts" minOccurs="0" type="slc:PartsType" />
+        </xs:all>
+    </xs:complexType>
+    <xs:complexType name="PartsType">
+        <xs:sequence>
+            <xs:element name="simple-result-part"
+                type="slc:SimpleResultPartType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SimpleResultPartType">
+        <xs:all>
+            <xs:element name="status">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="PASSED" />
+                        <xs:enumeration value="FAILED" />
+                        <xs:enumeration value="ERROR" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:element>
+            <xs:element name="message" type="xs:string" />
+            <xs:element name="exception-message" minOccurs="0"
+                type="xs:string" />
+            <xs:element name="stack-lines" minOccurs="0"
+                type="slc:StackLinesType" />
+            <xs:element name="test-run-uuid" type="xs:string"
+                minOccurs="0" />
+        </xs:all>
+    </xs:complexType>
+    <xs:complexType name="StackLinesType">
+        <xs:sequence>
+            <xs:element name="stack-line" maxOccurs="unbounded"
+                type="xs:string" />
+        </xs:sequence>
+        <xs:attribute name="message" type="xs:string" />
+    </xs:complexType>
+    <xs:complexType name="ElementsType">
+        <xs:sequence>
+            <xs:element name="element" type="slc:ElementType"
+                minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ElementType">
+        <xs:all>
+            <xs:element name="simple-sElement"
+                type="slc:SimpleSElementType" />
+        </xs:all>
+        <xs:attribute name="path" type="xs:string" use="required" />
+    </xs:complexType>
+    <xs:complexType name="SimpleSElementType">
+        <xs:all>
+            <xs:element name="label" type="xs:string" />
+            <xs:element name="tags" type="slc:TagsType" minOccurs="0" />
+        </xs:all>
+    </xs:complexType>
+    <xs:complexType name="TagsType">
+        <xs:sequence>
+            <xs:element name="tag" type="slc:TagType" minOccurs="0"
+                maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TagType">
+        <xs:all>
+            <xs:element name="tag-value" type="xs:string" />
+        </xs:all>
+        <xs:attribute name="name" type="xs:string" use="required" />
+    </xs:complexType>
+    <xs:complexType name="TreeSPathType">
+        <xs:attribute name="as-unique-string" type="xs:string"
+            use="required" />
+    </xs:complexType>
+    <xs:complexType name="TestRunDescriptorType">
+        <xs:all>
+            <xs:element name="test-run-uuid" type="xs:string" />
+            <xs:element name="slc-execution-uuid" type="xs:string"
+                minOccurs="0" />
+            <xs:element name="slc-execution-step-uuid" type="xs:string"
+                minOccurs="0" />
+            <xs:element name="deployed-sytem-id" type="xs:string"
+                minOccurs="0" />
+            <xs:element name="test-result-uuid" type="xs:string"
+                minOccurs="0" />
+        </xs:all>
+    </xs:complexType>
 
-	<!-- TREE TEST RESULT REQUESTS -->
-	<xs:element name="create-tree-test-result-request">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="tree-test-result"
-					type="slc:TreeTestResultType" />
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
+    <!-- TREE TEST RESULT REQUESTS -->
+    <xs:element name="create-tree-test-result-request">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="tree-test-result"
+                    type="slc:TreeTestResultType" />
+                <xs:element name="test-run-descriptor"
+                    type="slc:TestRunDescriptorType" maxOccurs="1" minOccurs="0"/>
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="close-tree-test-result-request">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="result-uuid" type="xs:string" />
-				<xs:element name="close-date" type="xs:dateTime" />
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="close-tree-test-result-request">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="result-uuid" type="xs:string" />
+                <xs:element name="close-date" type="xs:dateTime" />
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="result-part-request">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="result-uuid" type="xs:string" />
-				<xs:element name="simple-result-part"
-					type="slc:SimpleResultPartType" />
-				<xs:element name="related-elements"
-					type="slc:ElementsType" />
-				<xs:element name="tree-sPath" type="slc:TreeSPathType" />
-				<xs:element name="test-run-descriptor"
-					type="slc:TestRunDescriptorType" />
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="result-part-request">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="result-uuid" type="xs:string" />
+                <xs:element name="simple-result-part"
+                    type="slc:SimpleResultPartType" />
+                <xs:element name="related-elements"
+                    type="slc:ElementsType" />
+                <xs:element name="tree-sPath" type="slc:TreeSPathType" />
+                <xs:element name="test-run-descriptor"
+                    type="slc:TestRunDescriptorType" />
+                <xs:element name="attributes" minOccurs="0"
+                    type="slc:AttributesType" />
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
 
-	<!-- SLC EXECUTION -->
-	<xs:element name="slc-execution" type="slc:SlcExecutionType" />
-	<xs:complexType name="SlcExecutionType">
-		<xs:all>
-			<xs:element name="status" type="xs:string" />
-			<xs:element name="type" type="xs:string" />
-			<xs:element name="host" type="xs:string" />
-			<xs:element name="user" type="xs:string" />
-			<xs:element name="steps" minOccurs="0"
-				type="slc:SlcExecutionStepsType" />
-			<xs:element name="attributes" minOccurs="0"
-				type="slc:AttributesType" />
-		</xs:all>
-		<xs:attribute name="uuid" type="xs:string" use="required" />
-	</xs:complexType>
-	<xs:complexType name="SlcExecutionStepsType">
-		<xs:sequence>
-			<xs:element name="slc-execution-step"
-				type="slc:SlcExecutionStepType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="SlcExecutionStepType">
-		<xs:all>
-			<xs:element name="type" type="xs:string" />
-			<xs:element name="begin" type="xs:dateTime" />
-			<xs:element name="log-lines" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="log-line" type="xs:string"
-							maxOccurs="unbounded" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:all>
-		<xs:attribute name="uuid" type="xs:string" use="required" />
-	</xs:complexType>
-	<xs:complexType name="AttributesType">
-		<xs:sequence>
-			<xs:element name="attribute" type="slc:AttributeType"
-				minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AttributeType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="name" type="xs:string"
-					use="required" />
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
+    <!-- SLC EXECUTION -->
+    <xs:element name="slc-execution" type="slc:SlcExecutionType" />
+    <xs:complexType name="SlcExecutionType">
+        <xs:all>
+            <xs:element name="status" type="xs:string" />
+            <xs:element name="type" type="xs:string" />
+            <xs:element name="host" type="xs:string" />
+            <xs:element name="user" type="xs:string" />
+            <xs:element name="steps" minOccurs="0"
+                type="slc:SlcExecutionStepsType" />
+            <xs:element name="attributes" minOccurs="0"
+                type="slc:AttributesType" />
+        </xs:all>
+        <xs:attribute name="uuid" type="xs:string" use="required" />
+    </xs:complexType>
+    <xs:complexType name="SlcExecutionStepsType">
+        <xs:sequence>
+            <xs:element name="slc-execution-step"
+                type="slc:SlcExecutionStepType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SlcExecutionStepType">
+        <xs:all>
+            <xs:element name="type" type="xs:string" />
+            <xs:element name="begin" type="xs:dateTime" />
+            <xs:element name="log-lines" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="log-line" type="xs:string"
+                            maxOccurs="unbounded" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+        <xs:attribute name="uuid" type="xs:string" use="required" />
+    </xs:complexType>
+    <xs:complexType name="AttributesType">
+        <xs:sequence>
+            <xs:element name="attribute" type="slc:AttributeType"
+                minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AttributeType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="name" type="xs:string"
+                    use="required" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
 
-	<!-- SLC EXECUTION REQUESTS-->
-	<xs:element name="slc-execution-request">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="slc-execution"
-					type="slc:SlcExecutionType" />
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="slc-execution-steps-request">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="slc-execution-uuid" type="xs:string" />
-				<xs:element name="steps"
-					type="slc:SlcExecutionStepsType" />
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="slc-execution-status-request">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="slc-execution-uuid" type="xs:string" />
-				<xs:element name="new-status" type="xs:string" />
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
+    <!-- SLC EXECUTION REQUESTS-->
+    <xs:element name="slc-execution-request">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="slc-execution"
+                    type="slc:SlcExecutionType" />
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="slc-execution-steps-request">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="slc-execution-uuid" type="xs:string" />
+                <xs:element name="steps"
+                    type="slc:SlcExecutionStepsType" />
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="slc-execution-status-request">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="slc-execution-uuid" type="xs:string" />
+                <xs:element name="new-status" type="xs:string" />
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
 
 </xs:schema>
\ No newline at end of file
-- 
2.39.2