MID-8894: sqale: Fixed join access cert work case and work item.

Evolveum · Jun 14, 2023 · ca162a0 · ca162a0
1 parent 92bcd30
commit ca162a0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/...est/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityGovernance.java b/...est/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityGovernance.java
@@ -20,7 +20,6 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
-import org.testng.SkipException;
 import org.testng.annotations.Test;
 
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -298,10 +297,6 @@ public void test150StandardApproversAsDeputies() throws Exception {
 
     @Test
     public void test200StandardReviewerLegacyRole() throws Exception {
-        if (isNativeRepository()) {
-            throw new SkipException("FIXME skipped because of MID-8894");
-        }
-
         given();
         doStandardSetup(USER_MANAGER1, ROLE_REVIEWER_STANDARD_LEGACY);
 
@@ -314,10 +309,6 @@ public void test200StandardReviewerLegacyRole() throws Exception {
 
     @Test
     public void test210StandardReviewerNewRole() throws Exception {
-        if (isNativeRepository()) {
-            throw new SkipException("FIXME skipped because of MID-8894");
-        }
-
         given();
         doStandardSetup(USER_MANAGER1, ROLE_REVIEWER_STANDARD_NEW);
 

diff --git a/...a/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationCaseMapping.java b/...a/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationCaseMapping.java
@@ -127,7 +127,7 @@ private QAccessCertificationCaseMapping(@NotNull SqaleRepoContext repositoryCont
 
         addContainerTableMapping(F_WORK_ITEM,
                 QAccessCertificationWorkItemMapping.init(repositoryContext),
-                joinOn((c, wi) -> c.ownerOid.eq(wi.ownerOid)));
+                joinOn((c, wi) -> c.ownerOid.eq(wi.ownerOid).and(c.cid.eq(wi.accessCertCaseCid))  ));
     }
 
     @Override

diff --git a/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java b/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
@@ -2393,7 +2393,7 @@ public void test630SearchContainersByCidWithOrderById() throws SchemaException {
                 .containsExactly("assignment1-2", "assignment1-3-ext"); // in this order
     }
 
-    @Test(enabled = false) // See MID-8894
+    @Test // See
     public void test640SearchAccessCertificationCasesByAssignee() throws SchemaException {
         SearchResultList<AccessCertificationCaseType> result = searchContainerTest(
                 "by work item assignee", AccessCertificationCaseType.class,