Change toString of RunnableCallFlow

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

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
index 0679cf306d177a39e2a9509a7819abf09c5a4623..e8feff02007dd037297cf80a4acf6016f38ed658 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
@@ -1,3 +1,19 @@
+/*\r
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
 package org.argeo.slc.services.impl;\r
 \r
 import org.apache.commons.logging.Log;\r
@@ -27,6 +43,8 @@ public class TestManagerServiceImpl implements TestManagerService {
        private final SlcExecutionDao slcExecutionDao;\r
        private final TreeTestResultCollectionDao treeTestResultCollectionDao;\r
 \r
+       private String defaultCollectionId = "default";\r
+       \r
        public TestManagerServiceImpl(TreeTestResultDao treeTestResultDao,\r
                        TestRunDescriptorDao testRunDescriptorDao,\r
                        SlcExecutionDao slcExecutionDao,\r
@@ -52,9 +70,10 @@ public class TestManagerServiceImpl implements TestManagerService {
                                                .getSlcExecution(testRunDescriptor\r
                                                                .getSlcExecutionUuid());\r
                                if (slcExecution != null) {\r
-                                       String collectionId = slcExecution.getUser() != null ? slcExecution\r
-                                                       .getUser()\r
-                                                       : "default";\r
+                                       // Use Host as collection ID if host is available\r
+                                       String collectionId = slcExecution.getHost() != null ? slcExecution\r
+                                                       .getHost()\r
+                                                       : defaultCollectionId;\r
                                        addResultToCollection(collectionId, testRunDescriptor\r
                                                        .getTestResultUuid());\r
                                }\r
@@ -62,7 +81,7 @@ public class TestManagerServiceImpl implements TestManagerService {
                                if (log.isTraceEnabled())\r
                                        log.trace("ResultUUID="\r
                                                        + testRunDescriptor.getTestResultUuid());\r
-                               addResultToCollection("default", testRunDescriptor\r
+                               addResultToCollection(defaultCollectionId, testRunDescriptor\r
                                                .getTestResultUuid());\r
                        }\r
                }\r
@@ -140,4 +159,8 @@ public class TestManagerServiceImpl implements TestManagerService {
 \r
        }\r
 \r
+       public void setDefaultCollectionId(String defaultCollectionId) {\r
+               this.defaultCollectionId = defaultCollectionId;\r
+       }\r
+\r
 }\r