Fixed failing tests in model-impl.

Evolveum · Feb 3, 2023 · 1e076c6 · 1e076c6
1 parent ecba809
commit 1e076c6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 99 deletions.
diff --git a/...-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java b/...-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
@@ -521,104 +521,6 @@ public void test051CalypsoRecon() throws Exception {
         TestUtil.assertSuccess(result);
     }
 
-    /**
-     * Mancomb is protected using shadow marks, no reaction should be applied.
-     */
-    @Test
-    public void test070AddedAccountMancomb() throws Exception {
-        // GIVEN
-        Task task = getTestTask();
-        OperationResult result = task.getResult();
-        setDebugListener();
-
-        // Add tags and archetype
-        repoAdd(CommonInitialObjects.ARCHETYPE_SHADOW_MARK, result);
-        repoAddObjectFromFile(SHADOW_MARK_CUSTOM_PROTECTED_ACCOUNT_DUMMY_FILE, result);
-
-        PrismObject<ShadowType> accountShadowMancomb = repoAddObjectFromFile(ACCOUNT_SHADOW_MANCOMB_DUMMY_FILE, result);
-        accountShadowMancombDummyOid = accountShadowMancomb.getOid();
-        provisioningService.applyDefinition(accountShadowMancomb, task, result);
-        provisioningService.determineShadowState(accountShadowMancomb, task, result);
-        assertNotNull("No oid in shadow", accountShadowMancomb.getOid());
-
-
-        DummyAccount dummyAccount = new DummyAccount();
-        dummyAccount.setName(ACCOUNT_MANCOMB_DUMMY_USERNAME);
-        dummyAccount.setPassword("h1ghS3AS");
-        dummyAccount.setEnabled(true);
-        dummyAccount.addAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME, "Mancomb");
-        getDummyResource().addAccount(dummyAccount);
-
-        ResourceObjectShadowChangeDescription change = new ResourceObjectShadowChangeDescription();
-        change.setShadowedResourceObject(accountShadowMancomb);
-        change.setResource(getDummyResourceObject());
-        change.setSourceChannel(SchemaConstants.CHANNEL_LIVE_SYNC_URI);
-
-        // WHEN
-        when();
-        synchronizationService.notifyChange(change, task, result);
-
-        // THEN
-        then();
-        LensContext<UserType> context = cleanDebugListener();
-
-        displayDumpable("Resulting context (as seen by debug listener)", context);
-        assertNull("Unexpected lens context", context);
-
-        PrismObject<UserType> userMancomb = findUserByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
-        assertNull("Unexpected user "+userMancomb, userMancomb);
-
-        PrismObject<ShadowType> shadow = getShadowModelNoFetch(accountShadowMancombDummyOid);
-        assertSituation(shadow, null);
-
-        assertSuccess(result);
-    }
-
-    /**
-     * Mancomb is protected using shadow mark, no reaction should be applied.
-     */
-    @Test
-    public void test071MancombRecon() throws Exception {
-        // GIVEN
-        Task task = getTestTask();
-        OperationResult result = task.getResult();
-        setDebugListener();
-
-        // Lets make this a bit more interesting by setting up a fake situation in the shadow
-        ObjectDelta<ShadowType> objectDelta = createModifyAccountShadowReplaceDelta(accountShadowMancombDummyOid,
-                getDummyResourceObject(), ShadowType.F_SYNCHRONIZATION_SITUATION, SynchronizationSituationType.DISPUTED);
-        repositoryService.modifyObject(ShadowType.class, accountShadowMancombDummyOid, objectDelta.getModifications(), result);
-
-        PrismObject<ShadowType> accountShadowCalypso = getShadowModelNoFetch(accountShadowMancombDummyOid);
-
-        ResourceObjectShadowChangeDescription change = new ResourceObjectShadowChangeDescription();
-        change.setShadowedResourceObject(accountShadowCalypso);
-        change.setResource(getDummyResourceObject());
-        change.setSourceChannel(SchemaConstants.CHANNEL_LIVE_SYNC_URI);
-
-        displayDumpable("Change notification", change);
-
-        // WHEN
-        when();
-        synchronizationService.notifyChange(change, task, result);
-
-        // THEN
-        then();
-        LensContext<UserType> context = cleanDebugListener();
-
-        displayDumpable("Resulting context (as seen by debug listener)", context);
-        assertNull("Unexpected lens context", context);
-
-        PrismObject<UserType> userMancomb = findUserByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
-        assertNull("Unexpected user "+userMancomb, userMancomb);
-
-        PrismObject<ShadowType> shadow = getShadowModelNoFetch(accountShadowMancombDummyOid);
-        assertSituation(shadow, SynchronizationSituationType.DISPUTED);
-
-        result.computeStatus();
-        TestUtil.assertSuccess(result);
-    }
-
     @Test
     public void test100AddedAccountJack() throws Exception {
         // GIVEN

diff --git a/repo/system-init/src/main/resources/initial-objects/archetype/702-archetype-shadow-mark.xml b/repo/system-init/src/main/resources/initial-objects/archetype/702-archetype-shadow-mark.xml
@@ -11,7 +11,7 @@
     <description>Denotes tags for shadow marking</description>
     <assignment>
         <assignmentRelation>
-            <holderType>TagType</holderType>
+            <holderType>MarkType</holderType>
         </assignmentRelation>
     </assignment>
     <archetypeType>structural</archetypeType>