Fix TestUuidNonUniqueName

Its configuration was outdated.
Evolveum · Mar 6, 2024 · ee257a7 · ee257a7
1 parent f280ce3
commit ee257a7
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 32 deletions.
diff --git a/...a/src/main/java/com/evolveum/midpoint/schema/config/AssociationsCapabilityConfigItem.java b/...a/src/main/java/com/evolveum/midpoint/schema/config/AssociationsCapabilityConfigItem.java
@@ -42,4 +42,9 @@ public SimulatedAssociationClassConfigItem getAssociationClass(@NotNull QName cl
         }
         return single(matching, "Multiple definitions for simulated association '%s' in %s", className, DESC);
     }
+
+    @Override
+    public @NotNull String localDescription() {
+        return "simulated associations capability configuration";
+    }
 }
diff --git a/...rc/main/java/com/evolveum/midpoint/schema/config/SimulatedAssociationClassConfigItem.java b/...rc/main/java/com/evolveum/midpoint/schema/config/SimulatedAssociationClassConfigItem.java
@@ -150,4 +150,9 @@ public Collection<SimulatedAssociationClassParticipantDelineation> getObjectDeli
         }
         return delineations;
     }
+
+    @Override
+    public @NotNull String localDescription() {
+        return "simulated association class '%s' definition".formatted(value().getName());
+    }
 }
diff --git a/...ema/src/main/java/com/evolveum/midpoint/schema/processor/RefinedResourceSchemaParser.java b/...ema/src/main/java/com/evolveum/midpoint/schema/processor/RefinedResourceSchemaParser.java
@@ -684,7 +684,7 @@ void parse() throws ConfigurationException {
                 return definitions;
             } else {
                 // May happen if the simulated participant has no delineations.
-                throw new ConfigurationException("No object type definitions found for " + simulatedParticipant);
+                throw new ConfigurationException("No object type/class definitions found for " + simulatedParticipant);
             }
         }
     }

diff --git a/model/model-intest/src/test/resources/misc/resource-dummy-uuid-nonunique-name.xml b/model/model-intest/src/test/resources/misc/resource-dummy-uuid-nonunique-name.xml
@@ -108,41 +108,59 @@
             <objectClass>ri:CustomprivilegeObjectClass</objectClass>
         </objectType>
 
-        <associationTypes>
-            <simulated>
-                <name>ri:group</name>
-                <subject>
-                    <kind>account</kind>
-                    <intent>default</intent>
-                    <!-- name is not unique, so we must use something else -->
-                    <primaryBindingAttributeRef>icfs:uid</primaryBindingAttributeRef>
-                </subject>
-                <object>
-                    <kind>entitlement</kind>
-                    <intent>group</intent>
-                    <primaryBindingAttributeRef>ri:members</primaryBindingAttributeRef>
-                </object>
-                <direction>objectToSubject</direction>
-            </simulated>
-            <simulated>
-                <name>ri:priv</name>
-                <subject>
-                    <kind>account</kind>
-                    <intent>default</intent>
-                    <primaryBindingAttributeRef>ri:privileges</primaryBindingAttributeRef>
-                </subject>
-                <object>
-                    <kind>entitlement</kind>
-                    <intent>privilege</intent>
-                    <primaryBindingAttributeRef>icfs:name</primaryBindingAttributeRef>
-                </object>
-                <direction>subjectToObject</direction>
-            </simulated>
-        </associationTypes>
+        <associationType>
+            <name>ri:groupMembership</name>
+            <associationClass>ri:groupMembership</associationClass>
+            <!-- Will apply to all relevant object types -->
+        </associationType>
+
+        <associationType>
+            <name>ri:privilegePossession</name>
+            <associationClass>ri:privilegePossession</associationClass>
+            <!-- Will apply to all relevant object types -->
+        </associationType>
+
     </schemaHandling>
 
     <capabilities>
         <configured>
+            <cap:associations>
+                <cap:associationClass>
+                    <cap:name>ri:groupMembership</cap:name>
+                    <cap:subject>
+                        <cap:delineation>
+                            <cap:objectClass>ri:AccountObjectClass</cap:objectClass>
+                        </cap:delineation>
+                        <!-- name is not unique, so we must use something else -->
+                        <cap:primaryBindingAttributeRef>icfs:uid</cap:primaryBindingAttributeRef>
+                        <cap:localItemName>ri:group</cap:localItemName>
+                    </cap:subject>
+                    <cap:object>
+                        <cap:delineation>
+                            <cap:objectClass>ri:GroupObjectClass</cap:objectClass>
+                        </cap:delineation>
+                        <cap:primaryBindingAttributeRef>ri:members</cap:primaryBindingAttributeRef>
+                    </cap:object>
+                    <cap:direction>objectToSubject</cap:direction>
+                </cap:associationClass>
+                <cap:associationClass>
+                    <cap:name>ri:privilegePossession</cap:name>
+                    <cap:subject>
+                        <cap:delineation>
+                            <cap:objectClass>ri:AccountObjectClass</cap:objectClass>
+                        </cap:delineation>
+                        <cap:primaryBindingAttributeRef>ri:privileges</cap:primaryBindingAttributeRef>
+                        <cap:localItemName>ri:priv</cap:localItemName>
+                    </cap:subject>
+                    <cap:object>
+                        <cap:delineation>
+                            <cap:objectClass>ri:CustomprivilegeObjectClass</cap:objectClass>
+                        </cap:delineation>
+                        <cap:primaryBindingAttributeRef>icfs:name</cap:primaryBindingAttributeRef>
+                    </cap:object>
+                    <cap:direction>subjectToObject</cap:direction>
+                </cap:associationClass>
+            </cap:associations>
             <cap:countObjects>
                 <cap:simulate>pagedSearchEstimate</cap:simulate>
             </cap:countObjects>