From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 29 Apr 2008 22:38:35 +0000 (+0000)
Subject: INtroduce tree test result web service (not working yet)
X-Git-Tag: argeo-slc-2.1.7~2957
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=22a03283f23241864e433943ba2bea57bfb0afeb;p=gpl%2Fargeo-slc.git

INtroduce tree test result web service (not working yet)

git-svn-id: https://svn.argeo.org/slc/trunk@1083 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartsRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartsRequest.java
new file mode 100644
index 000000000..542620d3c
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartsRequest.java
@@ -0,0 +1,38 @@
+package org.argeo.slc.msg.test.tree;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.argeo.slc.core.structure.StructureElement;
+import org.argeo.slc.core.structure.tree.TreeSPath;
+import org.argeo.slc.core.test.tree.PartSubList;
+
+public class ResultPartsRequest {
+	private String resultUuid;
+	private Map<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();
+	private Map<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();
+
+	public String getResultUuid() {
+		return resultUuid;
+	}
+
+	public void setResultUuid(String resultUuid) {
+		this.resultUuid = resultUuid;
+	}
+
+	public Map<TreeSPath, PartSubList> getResultParts() {
+		return resultParts;
+	}
+
+	public void setResultParts(Map<TreeSPath, PartSubList> resultParts) {
+		this.resultParts = resultParts;
+	}
+
+	public Map<TreeSPath, StructureElement> getElements() {
+		return elements;
+	}
+
+	public void setElements(Map<TreeSPath, StructureElement> elements) {
+		this.elements = elements;
+	}
+}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/TreeTestResultRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/TreeTestResultRequest.java
new file mode 100644
index 000000000..c550541fd
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/TreeTestResultRequest.java
@@ -0,0 +1,15 @@
+package org.argeo.slc.msg.test.tree;
+
+import org.argeo.slc.core.test.tree.TreeTestResult;
+
+public class TreeTestResultRequest {
+	private TreeTestResult treeTestResult;
+
+	public TreeTestResult getTreeTestResult() {
+		return treeTestResult;
+	}
+
+	public void setTreeTestResult(TreeTestResult treeTestResult) {
+		this.treeTestResult = treeTestResult;
+	}
+}
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/tree/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/tree/mapping.xml
index 45d9dd9cf..836b3789c 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/tree/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/tree/mapping.xml
@@ -127,4 +127,11 @@
 			<bind-xml node="attribute" />
 		</field>
 	</class>
+
+	<class name="org.argeo.slc.msg.test.tree.TreeTestResultRequest">
+		<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>
 </mapping>
\ 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 69700597f..d7e09650c 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
@@ -114,6 +114,16 @@
 		<xs:attribute name="name" type="xs:string" use="required" />
 	</xs:complexType>
 
+	<!-- TREE TEST RESULT -->
+	<xs:element name="tree-test-result-request">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="tree-test-result"
+					type="slc:TreeTestResultType" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+
 	<!-- SLC EXECUTION -->
 	<xs:element name="slc-execution" type="slc:SlcExecutionType" />
 	<xs:complexType name="SlcExecutionType">
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
index 8479c95ca..fbce288c1 100644
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
@@ -11,17 +11,26 @@ import org.apache.commons.logging.LogFactory;
 
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
 
+import org.argeo.slc.msg.test.tree.TreeTestResultRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
 import org.argeo.slc.unit.UnitXmlUtils;
 import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;
 
 public class TreeTestResultCastorTest extends AbstractSpringTestCase {
 	private Log log = LogFactory.getLog(getClass());
+	
+	private Marshaller marshaller;
+	private Unmarshaller unmarshaller;
+
+	@Override
+	public void setUp() {
+		marshaller = getBean("marshaller");
+		unmarshaller = getBean("marshaller");
+	}
+
 
-	public void testMarshUnmarsh() throws Exception {
-		Marshaller marshaller = getBean("marshaller");
-		Unmarshaller unmarshaller = getBean("marshaller");
 
+	public void testMarshUnmarsh() throws Exception {
 		TreeTestResult ttr = createCompleteTreeTestResult();
 
 		StringResult xml = new StringResult();
@@ -37,6 +46,24 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
 				.unmarshal(new StringSource(xml.toString()));
 
 		UnitTestTreeUtil.assertTreeTestResult(ttr, ttrUnm);
+	}
+	
+	public void testTreeTestResultRequest() throws Exception{
+		TreeTestResultRequest req = new TreeTestResultRequest();
+		req.setTreeTestResult(createCompleteTreeTestResult());
+		
+		StringResult xml = new StringResult();
+		marshaller.marshal(req, xml);
+
+		log.info("Marshalled TreeTestResult Request: " + xml);
+
+		XsdSchema schema = getBean("schema");
+		UnitXmlUtils.assertXsdSchemaValidation(schema, new StringSource(xml
+				.toString()));
+
+		TreeTestResultRequest reqUnm = (TreeTestResultRequest) unmarshaller
+				.unmarshal(new StringSource(xml.toString()));
 
+		UnitTestTreeUtil.assertTreeTestResult(req.getTreeTestResult(), reqUnm.getTreeTestResult());
 	}
 }
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultWsIntegrationTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultWsIntegrationTest.java
new file mode 100644
index 000000000..3f1df773d
--- /dev/null
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultWsIntegrationTest.java
@@ -0,0 +1,27 @@
+package org.argeo.slc.core.test.tree;
+
+import org.springframework.ws.client.core.WebServiceTemplate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
+
+import org.argeo.slc.msg.test.tree.TreeTestResultRequest;
+import org.argeo.slc.unit.AbstractSpringTestCase;
+
+public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
+	private Log log = LogFactory.getLog(getClass());
+
+	public void testSendSlcExecutionrequest() {
+		WebServiceTemplate template = getBean("webServiceTemplate");
+		TreeTestResultRequest req = new TreeTestResultRequest();
+		req.setTreeTestResult(createCompleteTreeTestResult());
+
+		log.info("Send SlcExecutionRequest for SlcExecution "
+				+ req.getTreeTestResult().getUuid());
+
+		Object resp = template.marshalSendAndReceive(req);
+		log.info("Resp: " + resp);
+	}
+}
diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/castor/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/castor/applicationContext.xml
new file mode 100644
index 000000000..e6334a978
--- /dev/null
+++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/castor/applicationContext.xml
@@ -0,0 +1,36 @@
+<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">
+
+	<bean id="marshaller"
+		class="org.springframework.oxm.castor.CastorMarshaller">
+		<property name="mappingLocations">
+			<list>
+				<value>
+					classpath:org/argeo/slc/castor/process/mapping.xml
+				</value>
+				<value>
+					classpath:org/argeo/slc/castor/test/tree/mapping.xml
+				</value>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="webServiceTemplate"
+		class="org.springframework.ws.client.core.WebServiceTemplate">
+		<constructor-arg ref="messageFactory" />
+		<property name="marshaller" ref="marshaller" />
+		<property name="unmarshaller" ref="marshaller" />
+		<property name="defaultUri"
+			value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />
+	</bean>
+
+	<bean id="messageFactory"
+		class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory" />
+
+	<bean id="schema"
+		class="org.springframework.xml.xsd.SimpleXsdSchema">
+		<property name="xsd"
+			value="classpath:/org/argeo/slc/xml/slc.xsd" />
+	</bean>
+</beans>
diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/process/execution.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/process/execution.xml
index 81b734c2e..605339877 100644
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/process/execution.xml
+++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/process/execution.xml
@@ -3,6 +3,8 @@
 	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">
 
+	<import resource="classpath:/org/argeo/slc/castor/applicationContext.xml" />
+
 	<bean name="executionBuildListener"
 		class="org.argeo.slc.ant.SlcExecutionBuildListener">
 		<property name="notifiers">
@@ -23,28 +25,4 @@
 		<property name="template" ref="webServiceTemplate" />
 	</bean>
 
-	<bean id="marshaller"
-		class="org.springframework.oxm.castor.CastorMarshaller">
-		<property name="mappingLocation"
-			value="classpath:org/argeo/slc/castor/process/mapping.xml" />
-	</bean>
-
-	<bean id="webServiceTemplate"
-		class="org.springframework.ws.client.core.WebServiceTemplate">
-		<constructor-arg ref="messageFactory" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
-		<property name="defaultUri"
-			value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />
-	</bean>
-
-	<bean id="messageFactory"
-		class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory" />
-
-	<bean id="schema"
-		class="org.springframework.xml.xsd.SimpleXsdSchema">
-		<property name="xsd"
-			value="classpath:/org/argeo/slc/xml/slc.xsd" />
-	</bean>
-
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/test/tree/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/test/tree/applicationContext.xml
index cbbd540e1..2ebde0448 100644
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/test/tree/applicationContext.xml
+++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/test/tree/applicationContext.xml
@@ -3,15 +3,7 @@
 	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">
 
-	<bean id="marshaller"
-		class="org.springframework.oxm.castor.CastorMarshaller">
-		<property name="mappingLocation"
-			value="classpath:org/argeo/slc/castor/test/tree/mapping.xml" />
-	</bean>
+	<import
+		resource="classpath:/org/argeo/slc/castor/applicationContext.xml" />
 
-	<bean id="schema"
-		class="org.springframework.xml.xsd.SimpleXsdSchema">
-		<property name="xsd"
-			value="classpath:/org/argeo/slc/xml/slc.xsd" />
-	</bean>
 </beans>
\ No newline at end of file