X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fservices%2Ftest%2Fimpl%2FTestManagerServiceImpl.java;h=b9a3a7045b6a14e0dad8c8950b141443d365876a;hb=c129ced90007016c50e3b66d773d00a96cc6e728;hp=17ee530468d7643134085f98aa5a4f6021d04c46;hpb=f3099a6b7eff5df6d3bb828d34e58ec66f1a6152;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java
index 17ee53046..b9a3a7045 100644
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java
@@ -2,10 +2,8 @@ package org.argeo.slc.services.test.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.argeo.slc.core.process.SlcExecution;
 import org.argeo.slc.core.test.TestRunDescriptor;
-import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.core.test.tree.TreeTestResultCollection;
 import org.argeo.slc.dao.process.SlcExecutionDao;
 import org.argeo.slc.dao.test.TestRunDescriptorDao;
@@ -33,10 +31,6 @@ public class TestManagerServiceImpl implements TestManagerService {
 
 	public void registerTestRunDescriptor(TestRunDescriptor testRunDescriptor) {
 		if (testRunDescriptor != null) {
-			if (log.isDebugEnabled())
-				log.debug("Updating test run descriptor with id "
-						+ testRunDescriptor.getTestRunUuid());
-
 			testRunDescriptorDao.saveOrUpdate(testRunDescriptor);
 
 			// Update tree test result collection
@@ -47,8 +41,11 @@ public class TestManagerServiceImpl implements TestManagerService {
 						.getSlcExecution(testRunDescriptor
 								.getSlcExecutionUuid());
 				if (slcExecution != null) {
-					addResultToCollection(slcExecution.getUser(),
-							testRunDescriptor.getTestResultUuid());
+					String collectionId = slcExecution.getUser() != null ? slcExecution
+							.getUser()
+							: "default";
+					addResultToCollection(collectionId, testRunDescriptor
+							.getTestResultUuid());
 				}
 			}
 		}
@@ -61,9 +58,7 @@ public class TestManagerServiceImpl implements TestManagerService {
 			ttrc = new TreeTestResultCollection(collectionId);
 			treeTestResultCollectionDao.create(ttrc);
 		}
-		TreeTestResult ttr = treeTestResultDao.getTestResult(resultUuid);
-		ttrc.getResults().add(ttr);
-		treeTestResultCollectionDao.update(ttrc);
+		treeTestResultCollectionDao.addResultToCollection(ttrc, resultUuid);
 	}
 
 	public void removeResultFromCollection(String collectionId,
@@ -71,10 +66,8 @@ public class TestManagerServiceImpl implements TestManagerService {
 		TreeTestResultCollection ttrc = treeTestResultCollectionDao
 				.getTestResultCollection(collectionId);
 		if (ttrc != null) {
-			TreeTestResult ttr = treeTestResultDao.getTestResult(resultUuid);
-			if (ttrc.getResults().remove(ttr)) {
-				treeTestResultCollectionDao.update(ttrc);
-			}
+			treeTestResultCollectionDao.removeResultFromCollection(ttrc,
+					resultUuid);
 		}
 	}