From d07a664d1bde3227f9e6883ae6a124aeb1597fd8 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 3 Jun 2020 11:32:35 +0200
Subject: [PATCH] OO-4634: Fix unit tests
---
.../modules/quality/manager/QualityReportAccessDAOTest.java | 4 ++++
.../org/olat/modules/quality/manager/QualityTestHelper.java | 1 +
2 files changed, 5 insertions(+)
diff --git a/src/test/java/org/olat/modules/quality/manager/QualityReportAccessDAOTest.java b/src/test/java/org/olat/modules/quality/manager/QualityReportAccessDAOTest.java
index ead624abd54..f6e532de8ac 100644
--- a/src/test/java/org/olat/modules/quality/manager/QualityReportAccessDAOTest.java
+++ b/src/test/java/org/olat/modules/quality/manager/QualityReportAccessDAOTest.java
@@ -35,6 +35,7 @@ import org.olat.basesecurity.Group;
import org.olat.basesecurity.GroupRoles;
import org.olat.basesecurity.IdentityRelationshipService;
import org.olat.basesecurity.OrganisationRoles;
+import org.olat.basesecurity.OrganisationService;
import org.olat.basesecurity.RelationRight;
import org.olat.basesecurity.RelationRole;
import org.olat.basesecurity.manager.GroupDAO;
@@ -91,6 +92,8 @@ public class QualityReportAccessDAOTest extends OlatTestCase {
private IdentityRelationshipService identityRelationshipService;
@Autowired
private BaseSecurityManager baseSecurityManager;
+ @Autowired
+ private OrganisationService organisatioService;
@Autowired
private QualityReportAccessDAO sut;
@@ -561,6 +564,7 @@ public class QualityReportAccessDAOTest extends OlatTestCase {
dc = qualityService.updateDataCollectionStatus(dc, QualityDataCollectionStatus.FINISHED);
RepositoryEntry entry = JunitTestHelper.createAndPersistRepositoryEntry();
repositoryService.addOrganisation(entry, organisation11);
+ repositoryService.removeOrganisation(entry, organisatioService.getDefaultOrganisation());
List<EvaluationFormParticipation> participations = qualityService.addParticipations(dc, Collections.singletonList(executor));
qualityService.createContextBuilder(dc, participations.get(0), entry, GroupRoles.participant).build();
dbInstance.commitAndCloseSession();
diff --git a/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java b/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
index e1f42c53646..3df1caf16cd 100644
--- a/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
+++ b/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
@@ -237,6 +237,7 @@ public class QualityTestHelper {
public Organisation createOrganisation() {
return createOrganisation(null);
}
+
public Organisation createOrganisation(Organisation parent) {
return organisationService.createOrganisation(UUID.randomUUID().toString(), UUID.randomUUID().toString(), null, parent, null);
}
--
GitLab