From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 4 May 2008 17:17:51 +0000 (+0000)
Subject: Introduce test descriptors
X-Git-Tag: argeo-slc-2.1.7~2935
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=496701c3c4af05272b3960f6c69d98a4b8bfae92;p=gpl%2Fargeo-slc.git

Introduce test descriptors

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index da1f13900..7727629dc 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -46,6 +46,11 @@
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 
+	<bean id="testRunDescriptorDao"
+		parent="slcTemplates.dao.testRunDescriptorDao">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
 	<bean id="slcExecutionDao"
 		parent="slcTemplates.dao.slcExecutionDao">
 		<property name="sessionFactory" ref="sessionFactory" />
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
index 621212682..ae95c9502 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
@@ -11,8 +11,7 @@
 <h1>Result #${result.uuid}</h1>
 
 <jsp:useBean id="describedPaths" type="java.util.SortedMap"
-	scope="request" /> 
-<jsp:useBean id="toc" type="java.util.SortedMap"
+	scope="request" /> <jsp:useBean id="toc" type="java.util.SortedMap"
 	scope="request" />
 
 <table>
@@ -34,6 +33,12 @@
 			<tr>
 				<td class="${part.status == 0 ? 'passed' : 'failed'}">
 				${part.message}</td>
+				<c:if test="${part.testRunUuid!=null}">
+					<td>
+					<a href="testRunView.web?uuid=${part.testRunUuid}">related
+					test run</a>
+					</td>
+				</c:if>
 			</tr>
 		</c:forEach>
 	</table>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp
new file mode 100644
index 000000000..8152342aa
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+	pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+
+<%@include file="header.txt"%>
+<jsp:include page="common.jsp" />
+
+<div id="main">
+<h1>TestRun #${testRunDescriptor.testRunUuid}</h1>
+
+<c:if test="${testRunDescriptor.slcExecutionUuid !=null}">
+	Related	SLC Execution: <a
+		href="slcExecutionView.web?uuid=${testRunDescriptor.slcExecutionUuid}">${testRunDescriptor.slcExecutionUuid}</a>
+	<br />
+	<c:if test="${testRunDescriptor.slcExecutionStepUuid !=null}">
+	Related SLC Execution Step:	<a
+			href="slcExecutionView.web?uuid=${testRunDescriptor.slcExecutionUuid}#step_${testRunDescriptor.slcExecutionStepUuid}">${testRunDescriptor.slcExecutionStepUuid}</a>
+		<br />
+	</c:if>
+</c:if> <c:if test="${testRunDescriptor.testResultUuid !=null}">
+	Related	Test Result: <a
+		href="resultView.web?uuid=${testRunDescriptor.testResultUuid}">${testRunDescriptor.testResultUuid}</a>
+	<br />
+</c:if> 
+
+<c:if test="${testRunDescriptor.deployedSytemId !=null}">
+	Related Deployed System: ${testRunDescriptor.deployedSytemId}
+	<br />
+</c:if>
+
+ <%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
index a403a8020..04a66b236 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
@@ -34,6 +34,12 @@
 		<property name="viewName" value="resultView" />
 	</bean>
 
+	<bean name="/testRunView.web"
+		class="org.argeo.slc.web.mvc.result.TestRunViewController">
+		<constructor-arg ref="testRunDescriptorDao" />
+		<property name="viewName" value="testRunView" />
+	</bean>
+
 	<bean id="handlerMapping"
 		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
 	</bean>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
index 00c110d14..f6366997d 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
@@ -44,6 +44,7 @@
 	<bean name="resultPartRequestEp"
 		class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">
 		<constructor-arg ref="testResultDao" />
+		<constructor-arg ref="testRunDescriptorDao" />
 		<property name="marshaller" ref="slcDefault.castor.marshaller" />
 		<property name="unmarshaller"
 			ref="slcDefault.castor.marshaller" />