Improve SystemCall

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / services / impl / test / TestManagerServiceImpl.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java
index a70adc8521ef8f021631c392a95fe83cde01782b..59b7b37db734b8b1976b27895b5663b63919955a 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java
@@ -8,6 +8,7 @@ import org.argeo.slc.dao.process.SlcExecutionDao;
 import org.argeo.slc.dao.test.TestRunDescriptorDao;\r
 import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;\r
+import org.argeo.slc.msg.test.tree.AddTreeTestResultAttachmentRequest;\r
 import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;\r
 import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;\r
 import org.argeo.slc.msg.test.tree.ResultPartRequest;\r
@@ -15,7 +16,9 @@ import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.services.test.TestManagerService;\r
 import org.argeo.slc.test.TestRunDescriptor;\r
 \r
-/** Implementation of complex operations impacting the underlying data. */\r
+/**\r
+ * Implementation of complex operations impacting the underlying data.\r
+ */\r
 public class TestManagerServiceImpl implements TestManagerService {\r
        private Log log = LogFactory.getLog(getClass());\r
 \r
@@ -56,9 +59,9 @@ public class TestManagerServiceImpl implements TestManagerService {
                                                        .getTestResultUuid());\r
                                }\r
                        } else {\r
-                                log\r
-                                               .trace("ResultUUID="\r
-                                                               + testRunDescriptor.getTestResultUuid());\r
+                               if (log.isTraceEnabled())\r
+                                       log.trace("ResultUUID="\r
+                                                       + testRunDescriptor.getTestResultUuid());\r
                                addResultToCollection("default", testRunDescriptor\r
                                                .getTestResultUuid());\r
                        }\r
@@ -66,6 +69,7 @@ public class TestManagerServiceImpl implements TestManagerService {
        }\r
 \r
        public void addResultToCollection(String collectionId, String resultUuid) {\r
+               // TODO: improve collections\r
                TreeTestResultCollection ttrc = treeTestResultCollectionDao\r
                                .getTestResultCollection(collectionId);\r
                if (ttrc == null) {\r
@@ -99,10 +103,15 @@ public class TestManagerServiceImpl implements TestManagerService {
                treeTestResultDao.create(treeTestResult);\r
 \r
                registerTestRunDescriptor(msg.getTestRunDescriptor());\r
+\r
+               // FIXME: temporary hack before better collection management is found\r
+               if (msg.getTestRunDescriptor() == null) {\r
+                       addResultToCollection("default", treeTestResult.getUuid());\r
+               }\r
        }\r
 \r
        public void addResultPart(ResultPartRequest msg) {\r
-//             registerTestRunDescriptor(msg.getTestRunDescriptor());\r
+               // registerTestRunDescriptor(msg.getTestRunDescriptor());\r
 \r
                if (log.isTraceEnabled())\r
                        log.trace("Adding result part to test result #"\r
@@ -122,4 +131,13 @@ public class TestManagerServiceImpl implements TestManagerService {
                treeTestResultDao.close(msg.getResultUuid(), msg.getCloseDate());\r
        }\r
 \r
+       public void addAttachment(AddTreeTestResultAttachmentRequest msg) {\r
+               if (log.isTraceEnabled())\r
+                       log.trace("Adding attachment " + msg.getAttachment()\r
+                                       + " to result #" + msg.getResultUuid());\r
+               treeTestResultDao.addAttachment(msg.getResultUuid(), msg\r
+                               .getAttachment());\r
+\r
+       }\r
+\r
 }\r