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 da1f13900b42c2c9c703d56e0e0dc0ec0cc9f6f4..7727629dc665e4615c91825b1951ebbf6635f01d 100644 (file)
--- 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" />\r
        </bean>\r
 \r
+       <bean id="testRunDescriptorDao"\r
+               parent="slcTemplates.dao.testRunDescriptorDao">\r
+               <property name="sessionFactory" ref="sessionFactory" />\r
+       </bean>\r
+\r
        <bean id="slcExecutionDao"\r
                parent="slcTemplates.dao.slcExecutionDao">\r
                <property name="sessionFactory" ref="sessionFactory" />\r

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 62121268221c35c7ae75708a511c4df073247aeb..ae95c9502f03e1e0c666efa16a53980ed4295b68 100644 (file)
--- 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>\r
 \r
 <jsp:useBean id="describedPaths" type="java.util.SortedMap"\r
-       scope="request" /> \r
-<jsp:useBean id="toc" type="java.util.SortedMap"\r
+       scope="request" /> <jsp:useBean id="toc" type="java.util.SortedMap"\r
        scope="request" />\r
 \r
 <table>\r
@@ -34,6 +33,12 @@
                        <tr>\r
                                <td class="${part.status == 0 ? 'passed' : 'failed'}">\r
                                ${part.message}</td>\r
+                               <c:if test="${part.testRunUuid!=null}">\r
+                                       <td>\r
+                                       <a href="testRunView.web?uuid=${part.testRunUuid}">related\r
+                                       test run</a>\r
+                                       </td>\r
+                               </c:if>\r
                        </tr>\r
                </c:forEach>\r
        </table>\r

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 (file)
index 0000000..8152342
--- /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" ?>\r
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
+       pageEncoding="ISO-8859-1"%>\r
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
+\r
+<%@include file="header.txt"%>\r
+<jsp:include page="common.jsp" />\r
+\r
+<div id="main">\r
+<h1>TestRun #${testRunDescriptor.testRunUuid}</h1>\r
+\r
+<c:if test="${testRunDescriptor.slcExecutionUuid !=null}">\r
+       Related SLC Execution: <a\r
+               href="slcExecutionView.web?uuid=${testRunDescriptor.slcExecutionUuid}">${testRunDescriptor.slcExecutionUuid}</a>\r
+       <br />\r
+       <c:if test="${testRunDescriptor.slcExecutionStepUuid !=null}">\r
+       Related SLC Execution Step:     <a\r
+                       href="slcExecutionView.web?uuid=${testRunDescriptor.slcExecutionUuid}#step_${testRunDescriptor.slcExecutionStepUuid}">${testRunDescriptor.slcExecutionStepUuid}</a>\r
+               <br />\r
+       </c:if>\r
+</c:if> <c:if test="${testRunDescriptor.testResultUuid !=null}">\r
+       Related Test Result: <a\r
+               href="resultView.web?uuid=${testRunDescriptor.testResultUuid}">${testRunDescriptor.testResultUuid}</a>\r
+       <br />\r
+</c:if> \r
+\r
+<c:if test="${testRunDescriptor.deployedSytemId !=null}">\r
+       Related Deployed System: ${testRunDescriptor.deployedSytemId}\r
+       <br />\r
+</c:if>\r
+\r
+ <%@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 a403a80201342635fa69fb634dc07e6a29a5f219..04a66b23626ed424a3ea0d082535551fb2e0ab89 100644 (file)
--- 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" />\r
        </bean>\r
 \r
+       <bean name="/testRunView.web"\r
+               class="org.argeo.slc.web.mvc.result.TestRunViewController">\r
+               <constructor-arg ref="testRunDescriptorDao" />\r
+               <property name="viewName" value="testRunView" />\r
+       </bean>\r
+\r
        <bean id="handlerMapping"\r
                class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">\r
        </bean>\r

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 00c110d14f5afe21c28619262ddd6d0ecee3942a..f6366997d4996d43ef3ea6f3c4cf8d9df44f2499 100644 (file)
--- 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"\r
                class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">\r
                <constructor-arg ref="testResultDao" />\r
+               <constructor-arg ref="testRunDescriptorDao" />\r
                <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
                <property name="unmarshaller"\r
                        ref="slcDefault.castor.marshaller" />\r