SqaleTest: Changed from behaviour/authentication to adminGui/userDash…

…board The test in question was testing automatic container creation for single value containers and since behavior/authentivation is now multivalue, different path needed to be used. Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
Evolveum · Mar 8, 2023 · e5cfb19 · e5cfb19
1 parent bae8f13
commit e5cfb19
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObjectMapping.java b/...main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObjectMapping.java
@@ -7,6 +7,7 @@
 import com.evolveum.midpoint.repo.sqale.SqaleRepoContext;
 import com.evolveum.midpoint.repo.sqale.SqaleUtils;
 import com.evolveum.midpoint.repo.sqale.qmodel.common.QContainerMapping;
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObjectType;
 import com.evolveum.midpoint.repo.sqlbase.JdbcSession;
 import com.evolveum.midpoint.repo.sqlbase.mapping.TableRelationResolver;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -51,7 +52,7 @@ public QProcessedObjectMapping(@NotNull SqaleRepoContext repositoryContext) {
         addItemMapping(F_OID, uuidMapper(q -> q.oid));
         addItemMapping(F_NAME, polyStringMapper(
                 q -> q.nameOrig, q -> q.nameNorm));
-        // addItemMapping(F_OBJECT_TYPE, ));
+        //addItemMapping(F_TYPE, ));
         addItemMapping(F_TRANSACTION_ID, stringMapper(q -> q.transactionId));
         addItemMapping(F_STATE, enumMapper(q -> q.state));
         addRefMapping(F_EVENT_MARK_REF, QProcessedObjectEventMarkReferenceMapping.init(repositoryContext));
@@ -107,6 +108,7 @@ public MProcessedObject insert(SimulationResultProcessedObjectType object, MSimu
         }
         row.state = object.getState();
 
+        row.objectType = MObjectType.fromTypeQName(object.getType());
         row.fullObject = createFullObject(object);
         row.transactionId = object.getTransactionId();
         row.focusRecordId = object.getFocusRecordId();

diff --git a/...-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java b/...-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java
@@ -3785,16 +3785,16 @@ public void test990ChangeOfNonPersistedItemWorksOk()
         assertThat(row.version).isEqualTo(originalRow.version + 1);
     }
 
-    @Test //TODO adapt to multivalue
+    @Test
     public void test991ChangeInsideNonPersistedContainerWorksOk()
             throws ObjectAlreadyExistsException, ObjectNotFoundException, SchemaException {
         OperationResult result = createOperationResult();
         MUser originalRow = selectObjectByOid(QUser.class, user1Oid);
 
-        given("delta with email change for user 1 using property add modification");
+        given("delta with widget addition for user 1 using container add modification");
         ObjectDelta<UserType> delta = prismContext.deltaFor(UserType.class)
-                .item(UserType.F_BEHAVIOR, BehaviorType.F_AUTHENTICATION,
-                        AuthenticationBehavioralDataType.F_FAILED_LOGINS).replace(5)
+                .item(UserType.F_ADMIN_GUI_CONFIGURATION, AdminGuiConfigurationType.F_USER_DASHBOARD,
+                        DashboardLayoutType.F_WIDGET).add(new DashboardWidgetType())
                 .asObjectDelta(user1Oid);
 
         when("modifyObject is called");
@@ -3807,7 +3807,7 @@ public void test991ChangeInsideNonPersistedContainerWorksOk()
         UserType userObject = repositoryService.getObject(UserType.class, user1Oid, null, result)
                 .asObjectable();
         assertThat(userObject.getVersion()).isEqualTo(String.valueOf(originalRow.version + 1));
-//        assertThat(userObject.getBehavior().getAuthentication().getFailedLogins()).isEqualTo(5);
+        assertThat(userObject.getAdminGuiConfiguration().getUserDashboard().getWidget()).isNotEmpty();
 
         and("externalized version is updated");
         MUser row = selectObjectByOid(QUser.class, user1Oid);