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=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..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
@@ -47,8 +47,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 +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,
@@ -71,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);
 		}
 	}