From 5c0582beb72385114c6b971f378719d748b27ffc Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 4 May 2008 16:21:33 +0000
Subject: [PATCH] Introduce close tree test result request

git-svn-id: https://svn.argeo.org/slc/trunk@1104 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../test/tree/CloseTreeTestResultRequest.java | 35 +++++++++++++++++++
 .../org/argeo/slc/castor/msg/mapping.xml      |  8 +++++
 .../main/resources/org/argeo/slc/xml/slc.xsd  | 34 +++++-------------
 .../test/tree/TreeTestResultCastorTest.java   | 18 ++++++++++
 .../test/tree/TreeTestResultTestUtils.java    |  1 -
 .../tree/TreeTestResultWsIntegrationTest.java | 32 ++++++++++++++---
 6 files changed, 97 insertions(+), 31 deletions(-)
 create mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java
new file mode 100644
index 000000000..4aa229df8
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java
@@ -0,0 +1,35 @@
+package org.argeo.slc.msg.test.tree;
+
+import java.util.Date;
+
+public class CloseTreeTestResultRequest {
+	private String resultUuid;
+	private Date closeDate;
+
+	public CloseTreeTestResultRequest() {
+
+	}
+
+	public CloseTreeTestResultRequest(String resultUuid, Date closeDate) {
+		super();
+		this.resultUuid = resultUuid;
+		this.closeDate = closeDate;
+	}
+
+	public String getResultUuid() {
+		return resultUuid;
+	}
+
+	public void setResultUuid(String id) {
+		this.resultUuid = id;
+	}
+
+	public Date getCloseDate() {
+		return closeDate;
+	}
+
+	public void setCloseDate(Date closeDate) {
+		this.closeDate = closeDate;
+	}
+
+}
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 8ae72a559..9972cac7d 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
@@ -12,6 +12,14 @@
 			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" />
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 55bb55afd..0b645c274 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
@@ -66,31 +66,6 @@
 		</xs:sequence>
 		<xs:attribute name="message" type="xs:string" />
 	</xs:complexType>
-	<!-- 
-	<xs:complexType name="ExceptionType">
-		<xs:all>
-			<xs:element name="stack-trace" minOccurs="0"
-				type="slc:StackTraceType" />
-		</xs:all>
-		<xs:attribute name="message" type="xs:string" />
-	</xs:complexType>
-	<xs:complexType name="StackTraceType">
-		<xs:sequence>
-			<xs:element name="stack-trace-element"
-				type="slc:StackTraceElementType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="StackTraceElementType">
-		<xs:attribute name="declaring-class" type="xs:string"
-			use="required" />
-		<xs:attribute name="method-name" type="xs:string"
-			use="required" />
-		<xs:attribute name="file-name" type="xs:string" use="required" />
-		<xs:attribute name="line-number" type="xs:integer"
-			use="required" />
-	</xs:complexType>
-	-->
 	<xs:complexType name="ElementsType">
 		<xs:sequence>
 			<xs:element name="element" type="slc:ElementType"
@@ -148,6 +123,15 @@
 		</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>
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 a43d8f120..b35ea1774 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,9 +11,11 @@ import org.apache.commons.logging.LogFactory;
 
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;
 
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.test.SimpleResultPart;
+import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;
 import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
 import org.argeo.slc.msg.test.tree.ResultPartRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
@@ -69,6 +71,22 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
 				.assertPart(req.getResultPart(), reqUnm.getResultPart());
 	}
 
+	public void testCloseTreeTestResultRequest() throws Exception {
+		TreeTestResult ttr = createCompleteTreeTestResult();
+		ttr.close();
+
+		CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr
+				.getUuid(), ttr.getCloseDate());
+
+		StringResult xml = marshallAndValidate(req);
+
+		CloseTreeTestResultRequest reqUnm = (CloseTreeTestResultRequest) unmarshaller
+				.unmarshal(new StringSource(xml.toString()));
+
+		assertEquals(ttr.getUuid(), reqUnm.getResultUuid());
+		assertDateSec(ttr.getCloseDate(), ttr.getCloseDate());
+	}
+
 	private StringResult marshallAndValidate(Object obj) throws Exception {
 		StringResult xml = new StringResult();
 		marshaller.marshal(obj, xml);
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
index 60c46af5a..bc7dcbdd2 100644
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
@@ -21,7 +21,6 @@ public abstract class TreeTestResultTestUtils {
 	public static TreeTestResult createSimpleTreeTestResult() {
 		TreeTestResult treeTestResult = new TreeTestResult();
 		treeTestResult.setUuid(UUID.randomUUID().toString());
-		treeTestResult.setCloseDate(new Date());
 		return treeTestResult;
 	}
 
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
index 550cdb90a..d6abfea50 100644
--- 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
@@ -8,6 +8,7 @@ import org.apache.commons.logging.LogFactory;
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;
 
+import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;
 import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
 import org.argeo.slc.msg.test.tree.ResultPartRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
@@ -17,7 +18,8 @@ public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
 
 	public void testCreateTreeTestResultRequest() {
 		WebServiceTemplate template = getBean(WebServiceTemplate.class);
-		CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(createCompleteTreeTestResult());
+		CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(
+				createCompleteTreeTestResult());
 
 		log.info("Send CreateTreeTestResultRequest for result "
 				+ req.getTreeTestResult().getUuid());
@@ -29,15 +31,35 @@ public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
 	public void testResultPartRequest() {
 		WebServiceTemplate template = getBean(WebServiceTemplate.class);
 		TreeTestResult ttr = createCompleteTreeTestResult();
-		CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(ttr);
+		CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(
+				ttr);
 		log.info("Send CreateTreeTestResultRequest for result "
 				+ reqCreate.getTreeTestResult().getUuid());
-		Object respCreate = template.marshalSendAndReceive(reqCreate);
-		
-		
+		template.marshalSendAndReceive(reqCreate);
+
 		ResultPartRequest req = createSimpleResultPartRequest(ttr);
 
 		log.info("Send ResultPartRequest for result " + req.getResultUuid());
+		Object resp = template.marshalSendAndReceive(req);
+		log.info("Resp: " + resp);
+	}
+
+	public void testCloseTreeTestResultRequest() {
+		WebServiceTemplate template = getBean(WebServiceTemplate.class);
+
+		TreeTestResult ttr = createCompleteTreeTestResult();
+		CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(
+				ttr);
+		log.info("Send CreateTreeTestResultRequest for result "
+				+ reqCreate.getTreeTestResult().getUuid());
+		template.marshalSendAndReceive(reqCreate);
+
+		ttr.close();
+		CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr
+				.getUuid(), ttr.getCloseDate());
+
+		log.info("Send CloseTreeTestResultRequest for result "
+				+ req.getResultUuid());
 
 		Object resp = template.marshalSendAndReceive(req);
 		log.info("Resp: " + resp);
-- 
2.39.2