Auxiliary cosmetics

Evolveum · Jun 18, 2015 · f45fc6c · f45fc6c
1 parent 31574c7
commit f45fc6c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.../src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java b/.../src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
@@ -364,6 +364,8 @@ protected <F extends FocusType> ObjectDelta<F> addModificationToContextAddProjec
 			LensContext<F> context, Class<F> focusType, File file) throws JAXBException, SchemaException,
             IOException {
 		PrismObject<ShadowType> account = PrismTestUtil.parseObject(file);
+		account.trim();
+		account.checkConsistence();
 		LensFocusContext<F> focusContext = context.getOrCreateFocusContext();
 		ObjectDelta<F> userDelta = ObjectDelta.createModificationAddReference(focusType, focusContext
 				.getObjectOld().getOid(), FocusType.F_LINK_REF, prismContext, account);

diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
@@ -271,7 +271,7 @@ public void test100AddAccountToJackDirect() throws Exception {
                 accountToAddPrimary.findProperty(ShadowType.F_OBJECT_CLASS).getRealValue());
         PrismReference resourceRef = accountToAddPrimary.findReference(ShadowType.F_RESOURCE_REF);
         assertEquals(resourceDummyType.getOid(), resourceRef.getOid());
-        PrismAsserts.assertNoEmptyItem(accountToAddPrimary);
+        accountToAddPrimary.checkConsistence();
 
         ObjectDelta<ShadowType> accountSecondaryDelta = accContext.getSecondaryDelta();
         assertEquals(ChangeType.MODIFY, accountSecondaryDelta.getChangeType());

diff --git a/...isioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java b/...isioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
@@ -122,7 +122,7 @@ <T extends ShadowType> PrismObject<T> convertToResourceObject(ConnectorObject co
 		shadow.setObjectClass(attributesContainerDefinition.getTypeName());
 
 		Set<ObjectClass> auxiliaryIcfObjectClasses = co.getAuxiliaryObjectClasses();
-		if (auxiliaryIcfObjectClasses != null) {
+		if (auxiliaryIcfObjectClasses != null && !auxiliaryIcfObjectClasses.isEmpty()) {
 			List<QName> auxiliaryObjectClasses = shadow.getAuxiliaryObjectClass();
 			for (ObjectClass auxiliaryIcfObjectClass: auxiliaryIcfObjectClasses) {
 				auxiliaryObjectClasses.add(icfNameMapper.objectClassToQname(auxiliaryIcfObjectClass.getObjectClassValue(), resourceSchemaNamespace, false));