Fix for role-mining failed test.

Evolveum · Sep 4, 2023 · b86fd21 · b86fd21
1 parent ebedb7f
commit b86fd21
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java
@@ -85,7 +85,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
                 ROLE_APPLICATION_1, ROLE_APPLICATION_2, ROLE_BUSINESS_1,
                 USER_1, USER_2);
 
-        if(isNativeRepository()){
+        if (isNativeRepository()) {
             initTestObjects(initTask, initResult, SESSION_ROLE_BASED, CLUSTER_ROLE_BASED);
         }
     }
@@ -648,12 +648,14 @@ public void test400RoleAnalysisClusteringBasic() throws Exception {
     }
 
     @Test
-    public void test410RoleAnalysisPatternDetectionBasic() throws CommonException {
+    public void test410RoleAnalysisPatternDetectionBasic() throws Exception {
         skipIfNotNativeRepository();
 
         Task task = getTestTask();
         OperationResult result = task.getResult();
 
+        initTestObjects(task, result, CLUSTER_ROLE_BASED);
+
         when("task is run");
         TASK_ROLE_ANALYSIS_PATTERN_DETECTION_BASIC.init(this, task, result);
         TASK_ROLE_ANALYSIS_PATTERN_DETECTION_BASIC.rerun(result); // asserts success

diff --git a/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml b/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml
@@ -7,7 +7,6 @@
     <roleAnalysisSessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"
             relation="org:default"
             type="c:RoleAnalysisSessionType">
-        <!-- role_based_analysis_session -->
     </roleAnalysisSessionRef>
     <detectionOption>
         <minRolesOccupancy>10</minRolesOccupancy>

diff --git a/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml b/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml
@@ -13,7 +13,7 @@
     <activity>
         <work>
             <roleAnalysisClustering>
-                <sessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"/> <!-- random OID for now -->
+                <sessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"/>
             </roleAnalysisClustering>
         </work>
     </activity>

diff --git a/...model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml b/...model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml
@@ -13,7 +13,7 @@
     <activity>
         <work>
             <roleAnalysisPatternDetection>
-                <clusterRef oid="16a8b95a-8a37-4f91-b835-bb77670c2899"/> <!-- random OID for now -->
+                <clusterRef oid="16a8b95a-8a37-4f91-b835-bb77670c2899"/>
             </roleAnalysisPatternDetection>
         </work>
     </activity>