Fixing operations that include just the aux objectclass changes

Evolveum · May 9, 2016 · b663401 · b663401
1 parent 1286c56
commit b663401
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java b/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
@@ -473,7 +473,7 @@ public Collection<PropertyDelta<PrismPropertyValue>> modifyResourceObject(
 					break;
 				}
 			} else if (QNameUtil.match(firstPathName, ShadowType.F_ACTIVATION) || QNameUtil.match(firstPathName, ShadowType.F_CREDENTIALS) ||
-					QNameUtil.match(firstPathName, ShadowType.F_ASSOCIATION)) {
+					QNameUtil.match(firstPathName, ShadowType.F_ASSOCIATION) || QNameUtil.match(firstPathName, ShadowType.F_AUXILIARY_OBJECT_CLASS)) {
 				hasResourceModification = true;
 			}
 		}

diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
@@ -944,7 +944,7 @@ public void test135UnAssignUserLargoUnix() throws Exception {
 	 * Modify the account directly on resource: add aux object class, add the
 	 * attributes. Then reconcile the user. The recon should fix it.
 	 */
-	@Test(enabled=false) // MID-2883
+	@Test // MID-2883
     public void test136MeddleWithAccountAndReconcileUserLargo() throws Exception {
 		final String TEST_NAME = "test136MeddleWithAccountAndReconcileUserLargo";
         TestUtil.displayTestTile(this, TEST_NAME);