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=8c1d109c295e5485ff14655f6d0e1e3a77cdb542;hb=c21f3ae9746cd2bbc81dad813e9e590300433a52;hp=1a7e110bfe3dc03972222d105729d56f5f3b592d;hpb=b9f779525f00905e9de9a733757a5670e8ae1cf5;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 1a7e110bf..8c1d109c2 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
@@ -41,11 +41,18 @@ public class TestManagerServiceImpl implements TestManagerService {
 
 			// Update tree test result collection
 			// TODO: optimize
-			SlcExecution slcExecution = slcExecutionDao
-					.getSlcExecution(testRunDescriptor.getSlcExecutionUuid());
-			if (slcExecution != null) {
-				addResultToCollection(slcExecution.getUser(), testRunDescriptor
-						.getTestResultUuid());
+
+			if (testRunDescriptor.getSlcExecutionUuid() != null) {
+				SlcExecution slcExecution = slcExecutionDao
+						.getSlcExecution(testRunDescriptor
+								.getSlcExecutionUuid());
+				if (slcExecution != null) {
+					String collectionId = slcExecution.getUser() != null ? slcExecution
+							.getUser()
+							: "default";
+					addResultToCollection(collectionId, testRunDescriptor
+							.getTestResultUuid());
+				}
 			}
 		}
 	}
@@ -57,9 +64,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,
@@ -67,10 +72,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);
 		}
 	}