Improve error management:

- register in collection the first result part
- catches errors in slc.test executions
- improve web display of errors

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

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java
index 7ffa5c081a8d080a1abb87d196a43903c113b280..f61d86666de25ceb123b51d98aac267fa7da56d2 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java
@@ -8,6 +8,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;
 import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
+import org.argeo.slc.services.test.TestManagerService;
 
 public class CreateTreeTestResultRequestEp extends
                AbstractMarshallingPayloadEndpoint {
@@ -15,9 +16,12 @@ public class CreateTreeTestResultRequestEp extends
        private Log log = LogFactory.getLog(getClass());
 
        private final TreeTestResultDao treeTestResultDao;
+       private final TestManagerService testManagerService;
 
-       public CreateTreeTestResultRequestEp(TreeTestResultDao treeTestResultDao) {
+       public CreateTreeTestResultRequestEp(TreeTestResultDao treeTestResultDao,
+                       TestManagerService testManagerService) {
                this.treeTestResultDao = treeTestResultDao;
+               this.testManagerService = testManagerService;
        }
 
        @Override
@@ -27,9 +31,14 @@ public class CreateTreeTestResultRequestEp extends
 
                if (log.isTraceEnabled())
                        log.trace("Creating result #" + treeTestResult.getUuid());
-
                treeTestResultDao.create(treeTestResult);
 
+               if (log.isTraceEnabled())
+                       log.trace("Registering test run descriptor #"
+                                       + msg.getTestRunDescriptor().getTestRunUuid());
+               testManagerService
+                               .registerTestRunDescriptor(msg.getTestRunDescriptor());
+
                return null;
        }
 

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 3dcff1949177b40a679c27a7919de131969ee265..c7d930897c1b8693c6ebf4a919789a6bf49db27b 100644 (file)
--- 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
@@ -37,6 +37,8 @@ public class ResultPartRequestEp extends AbstractMarshallingPayloadEndpoint {
 
                treeTestResultDao.addResultPart(msg.getResultUuid(), msg.getPath(), msg
                                .getResultPart(), msg.getRelatedElements());
+               treeTestResultDao.updateAttributes(msg.getResultUuid(), msg
+                               .getAttributes());
 
                return null;
        }

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml
index b6125df19faa479ac13a3cada339c910af1eec19..e5300af7af64ee25886884be68cc6508cdbdce23 100644 (file)
--- a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml
@@ -32,6 +32,7 @@
        <bean name="createTreeTestResultRequestEp"
                class="org.argeo.slc.ws.test.tree.CreateTreeTestResultRequestEp">
                <constructor-arg ref="testResultDao" />
+        <constructor-arg ref="testManagerService" />
                <property name="marshaller" ref="slcDefault.castor.marshaller" />
                <property name="unmarshaller"
                        ref="slcDefault.castor.marshaller" />