From e186b2d692d035a8e4a0ac86144600d1d2b80de4 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 4 May 2008 17:18:09 +0000
Subject: [PATCH 1/1] Introduce test descriptors

git-svn-id: https://svn.argeo.org/slc/trunk@1106 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../web/mvc/result/TestRunViewController.java | 33 +++++++++++++++++++
 .../slc/ws/test/tree/ResultPartRequestEp.java | 16 ++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java
new file mode 100644
index 000000000..8665ffecf
--- /dev/null
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java
@@ -0,0 +1,33 @@
+package org.argeo.slc.web.mvc.result;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.ParameterizableViewController;
+
+import org.argeo.slc.core.test.TestRunDescriptor;
+import org.argeo.slc.dao.test.TestRunDescriptorDao;
+
+public class TestRunViewController extends ParameterizableViewController {
+	private final TestRunDescriptorDao testRunDescriptorDao;
+
+	public TestRunViewController(TestRunDescriptorDao testRunDescriptorDao) {
+		this.testRunDescriptorDao = testRunDescriptorDao;
+	}
+
+	@Override
+	protected ModelAndView handleRequestInternal(HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
+
+		String uuid = request.getParameter("uuid");
+		TestRunDescriptor testRunDescriptor = testRunDescriptorDao
+				.getTestRunDescriptor(uuid);
+
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("testRunDescriptor", testRunDescriptor);
+		modelAndView.setViewName(getViewName());
+		return modelAndView;
+	}
+
+}
diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
index 9fe4ccd67..83425ae7b 100644
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
@@ -6,8 +6,10 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.argeo.slc.core.SlcException;
+import org.argeo.slc.core.test.TestRunDescriptor;
 import org.argeo.slc.core.test.tree.PartSubList;
 import org.argeo.slc.core.test.tree.TreeTestResult;
+import org.argeo.slc.dao.test.TestRunDescriptorDao;
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;
 import org.argeo.slc.msg.test.tree.ResultPartRequest;
 
@@ -16,14 +18,26 @@ public class ResultPartRequestEp extends AbstractMarshallingPayloadEndpoint {
 	private Log log = LogFactory.getLog(getClass());
 
 	private final TreeTestResultDao treeTestResultDao;
+	private final TestRunDescriptorDao testRunDescriptorDao;
 
-	public ResultPartRequestEp(TreeTestResultDao treeTestResultDao) {
+	public ResultPartRequestEp(TreeTestResultDao treeTestResultDao,
+			TestRunDescriptorDao testRunDescriptorDao) {
 		this.treeTestResultDao = treeTestResultDao;
+		this.testRunDescriptorDao = testRunDescriptorDao;
 	}
 
 	@Override
 	protected Object invokeInternal(Object requestObject) throws Exception {
 		ResultPartRequest msg = (ResultPartRequest) requestObject;
+
+		TestRunDescriptor testRunDescriptor = msg.getTestRunDescriptor();
+		if (testRunDescriptor != null) {
+			testRunDescriptorDao.saveOrUpdate(testRunDescriptor);
+			if (log.isDebugEnabled())
+				log.debug("Updated test run descriptor with id "
+						+ testRunDescriptor.getTestRunUuid());
+		}
+
 		TreeTestResult treeTestResult = treeTestResultDao.getTestResult(msg
 				.getResultUuid());
 		if (treeTestResult == null) {
-- 
2.39.2