http://git-wip-us.apache.org/repos/asf/syncope/blob/6dfedd8f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java index f6d2e57..9f277fa 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java @@ -126,7 +126,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { task = taskService.read(actual.getKey()); assertNotNull(task); assertEquals(actual.getKey(), task.getKey()); - assertEquals(actual.getJobClassName(), task.getJobClassName()); + assertEquals(actual.getJobDelegateClassName(), task.getJobDelegateClassName()); assertEquals(userTemplate, task.getTemplates().get(AnyTypeKind.USER.name())); assertEquals(groupTemplate, task.getTemplates().get(AnyTypeKind.GROUP.name())); } @@ -231,14 +231,11 @@ public class SyncTaskITCase extends AbstractTaskITCase { assertNotNull(userTO); assertEquals("active", userTO.getStatus()); - // SYNCOPE-317 - execProvisioningTask(SYNC_TASK_ID, 50, false); - - final Set<Long> pushTaskIds = new HashSet<>(); - pushTaskIds.add(25L); - pushTaskIds.add(26L); + Set<Long> otherSyncTaskKeys = new HashSet<>(); + otherSyncTaskKeys.add(25L); + otherSyncTaskKeys.add(26L); + execProvisioningTasks(otherSyncTaskKeys, 50, false); - execProvisioningTasks(pushTaskIds, 50, false); // Matching --> UNLINK assertFalse(readUser("test9").getResources().contains(RESOURCE_NAME_CSV)); assertFalse(readUser("test7").getResources().contains(RESOURCE_NAME_CSV)); @@ -290,7 +287,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { build()); if (matchingGroups.getSize() > 0) { for (GroupTO group : matchingGroups.getResult()) { - groupService.bulkDeassociation(group.getKey(), + groupService.deassociate(group.getKey(), ResourceDeassociationActionType.UNLINK, CollectionWrapper.wrap(RESOURCE_NAME_LDAP, ResourceKey.class)); groupService.delete(group.getKey()); @@ -302,7 +299,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { build()); if (matchingUsers.getSize() > 0) { for (UserTO user : matchingUsers.getResult()) { - userService.bulkDeassociation(user.getKey(), + userService.deassociate(user.getKey(), ResourceDeassociationActionType.UNLINK, CollectionWrapper.wrap(RESOURCE_NAME_LDAP, ResourceKey.class)); userService.delete(user.getKey()); @@ -352,6 +349,9 @@ public class SyncTaskITCase extends AbstractTaskITCase { assertEquals("true", groupTO.getPlainAttrMap().get("show").getValues().get(0)); assertEquals(matchingUsers.getResult().iterator().next().getKey(), groupTO.getUserOwner(), 0); assertNull(groupTO.getGroupOwner()); + + // SYNCOPE-317 + execProvisioningTask(11L, 50, false); } @Test @@ -376,7 +376,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { is("location").equalTo("sync*").query()).build()); assertTrue(matchingPrinters.getSize() > 0); for (AnyObjectTO printer : matchingPrinters.getResult()) { - anyObjectService.bulkDeassociation(printer.getKey(), + anyObjectService.deassociate(printer.getKey(), ResourceDeassociationActionType.UNLINK, CollectionWrapper.wrap(RESOURCE_NAME_DBSCRIPTED, ResourceKey.class)); anyObjectService.delete(printer.getKey()); @@ -678,7 +678,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { syncTask = taskService.read(actual.getKey()); assertNotNull(syncTask); assertEquals(actual.getKey(), syncTask.getKey()); - assertEquals(actual.getJobClassName(), syncTask.getJobClassName()); + assertEquals(actual.getJobDelegateClassName(), syncTask.getJobDelegateClassName()); TaskExecTO execution = execProvisioningTask(syncTask.getKey(), 50, false); final String status = execution.getStatus(); @@ -755,7 +755,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { syncTask = taskService.read(actual.getKey()); assertNotNull(syncTask); assertEquals(actual.getKey(), syncTask.getKey()); - assertEquals(actual.getJobClassName(), syncTask.getJobClassName()); + assertEquals(actual.getJobDelegateClassName(), syncTask.getJobDelegateClassName()); TaskExecTO execution = execProvisioningTask(syncTask.getKey(), 50, false); String status = execution.getStatus();
http://git-wip-us.apache.org/repos/asf/syncope/blob/6dfedd8f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java index 10b07bf..4cecdf7 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java @@ -47,7 +47,6 @@ import org.apache.syncope.client.lib.SyncopeClient; import org.apache.syncope.common.lib.AnyOperations; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.SyncopeConstants; -import org.apache.syncope.common.lib.mod.AttrMod; import org.apache.syncope.common.lib.mod.ResourceAssociationMod; import org.apache.syncope.common.lib.mod.StatusMod; import org.apache.syncope.common.lib.mod.UserMod; @@ -70,7 +69,7 @@ import org.apache.syncope.common.lib.types.CipherAlgorithm; import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.MappingPurpose; import org.apache.syncope.common.lib.types.PropagationTaskExecStatus; -import org.apache.syncope.common.lib.types.ResourceAssociationActionType; +import org.apache.syncope.common.lib.types.ResourceAssociationAction; import org.apache.syncope.common.lib.types.ResourceDeassociationActionType; import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.common.lib.wrap.ResourceKey; @@ -436,7 +435,7 @@ public class UserITCase extends AbstractITCase { createUser(userTO); fail(); } catch (SyncopeClientException e) { - assertEquals(ClientExceptionType.DataIntegrityViolation, e.getType()); + assertEquals(ClientExceptionType.GenericPersistence, e.getType()); } } @@ -923,8 +922,9 @@ public class UserITCase extends AbstractITCase { assertTrue(getBooleanAttribute(connObjectTO, OperationalAttributes.ENABLE_NAME)); } + @Test public void updateMultivalueAttribute() { - UserTO userTO = getSampleTO("[email protected]"); + UserTO userTO = getUniqueSampleTO("[email protected]"); userTO.getResources().clear(); userTO.getDerAttrs().clear(); userTO.getVirAttrs().clear(); @@ -938,11 +938,8 @@ public class UserITCase extends AbstractITCase { UserMod userMod = new UserMod(); - AttrMod loginDateMod = new AttrMod(); - loginDateMod.getValuesToBeAdded().add("2000-01-01"); - userMod.setKey(userTO.getKey()); - userMod.getPlainAttrsToUpdate().add(loginDateMod); + userMod.getPlainAttrsToUpdate().add(attrMod("loginDate", "2000-01-01")); userTO = updateUser(userMod); assertNotNull(userTO); @@ -1519,18 +1516,15 @@ public class UserITCase extends AbstractITCase { @Test public void issueSYNCOPE265() { - for (long i = 1; i <= 5; i++) { + for (long key = 1; key <= 5; key++) { UserMod userMod = new UserMod(); - userMod.setKey(i); - - AttrMod attributeMod = new AttrMod(); - attributeMod.setSchema("type"); - attributeMod.getValuesToBeAdded().add("a type"); + userMod.setKey(key); userMod.getPlainAttrsToRemove().add("type"); - userMod.getPlainAttrsToUpdate().add(attributeMod); + userMod.getPlainAttrsToUpdate().add(attrMod("type", "a type")); UserTO userTO = updateUser(userMod); + assertEquals("a type", userTO.getPlainAttrMap().get("type").getValues().get(0)); } } @@ -1549,21 +1543,21 @@ public class UserITCase extends AbstractITCase { assertEquals(11, bulkAction.getTargets().size()); - bulkAction.setOperation(BulkAction.Type.SUSPEND); + bulkAction.setType(BulkAction.Type.SUSPEND); BulkActionResult res = userService.bulk(bulkAction); assertEquals(10, res.getResultByStatus(Status.SUCCESS).size()); assertEquals(1, res.getResultByStatus(Status.FAILURE).size()); assertEquals("suspended", userService.read( Long.parseLong(res.getResultByStatus(Status.SUCCESS).get(3))).getStatus()); - bulkAction.setOperation(BulkAction.Type.REACTIVATE); + bulkAction.setType(BulkAction.Type.REACTIVATE); res = userService.bulk(bulkAction); assertEquals(10, res.getResultByStatus(Status.SUCCESS).size()); assertEquals(1, res.getResultByStatus(Status.FAILURE).size()); assertEquals("active", userService.read( Long.parseLong(res.getResultByStatus(Status.SUCCESS).get(3))).getStatus()); - bulkAction.setOperation(BulkAction.Type.DELETE); + bulkAction.setType(BulkAction.Type.DELETE); res = userService.bulk(bulkAction); assertEquals(10, res.getResultByStatus(Status.SUCCESS).size()); assertEquals(1, res.getResultByStatus(Status.FAILURE).size()); @@ -1765,7 +1759,7 @@ public class UserITCase extends AbstractITCase { assertNotNull(actual); assertNotNull(resourceService.readConnObject(RESOURCE_NAME_CSV, AnyTypeKind.USER.name(), actual.getKey())); - assertNotNull(userService.bulkDeassociation(actual.getKey(), + assertNotNull(userService.deassociate(actual.getKey(), ResourceDeassociationActionType.UNLINK, CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceKey.class)). readEntity(BulkActionResult.class)); @@ -1801,8 +1795,7 @@ public class UserITCase extends AbstractITCase { final ResourceAssociationMod associationMod = new ResourceAssociationMod(); associationMod.getTargetResources().addAll(CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceKey.class)); - assertNotNull(userService.bulkAssociation( - actual.getKey(), ResourceAssociationActionType.LINK, associationMod).readEntity(BulkActionResult.class)); + assertNotNull(userService.associate(actual.getKey(), ResourceAssociationAction.LINK, associationMod).readEntity(BulkActionResult.class)); actual = userService.read(actual.getKey()); assertNotNull(actual); @@ -1831,7 +1824,7 @@ public class UserITCase extends AbstractITCase { assertNotNull(actual); assertNotNull(resourceService.readConnObject(RESOURCE_NAME_CSV, AnyTypeKind.USER.name(), actual.getKey())); - assertNotNull(userService.bulkDeassociation(actual.getKey(), + assertNotNull(userService.deassociate(actual.getKey(), ResourceDeassociationActionType.UNASSIGN, CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceKey.class)). readEntity(BulkActionResult.class)); @@ -1869,12 +1862,12 @@ public class UserITCase extends AbstractITCase { assertNotNull(e); } - final ResourceAssociationMod associationMod = new ResourceAssociationMod(); + ResourceAssociationMod associationMod = new ResourceAssociationMod(); associationMod.getTargetResources().addAll(CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceKey.class)); associationMod.setChangePwd(true); associationMod.setPassword("password"); - assertNotNull(userService.bulkAssociation(actual.getKey(), ResourceAssociationActionType.ASSIGN, associationMod) + assertNotNull(userService.associate(actual.getKey(), ResourceAssociationAction.ASSIGN, associationMod) .readEntity(BulkActionResult.class)); actual = userService.read(actual.getKey()); @@ -1898,7 +1891,7 @@ public class UserITCase extends AbstractITCase { assertNotNull(actual); assertNotNull(resourceService.readConnObject(RESOURCE_NAME_CSV, AnyTypeKind.USER.name(), actual.getKey())); - assertNotNull(userService.bulkDeassociation(actual.getKey(), + assertNotNull(userService.deassociate(actual.getKey(), ResourceDeassociationActionType.DEPROVISION, CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceKey.class)). readEntity(BulkActionResult.class)); @@ -1936,14 +1929,13 @@ public class UserITCase extends AbstractITCase { assertNotNull(e); } - final ResourceAssociationMod associationMod = new ResourceAssociationMod(); + ResourceAssociationMod associationMod = new ResourceAssociationMod(); associationMod.getTargetResources().addAll(CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceKey.class)); associationMod.setChangePwd(true); associationMod.setPassword("password"); - assertNotNull(userService.bulkAssociation(actual.getKey(), ResourceAssociationActionType.PROVISION, - associationMod) - .readEntity(BulkActionResult.class)); + assertNotNull(userService.associate(actual.getKey(), ResourceAssociationAction.PROVISION, associationMod). + readEntity(BulkActionResult.class)); actual = userService.read(actual.getKey()); assertNotNull(actual); @@ -1977,7 +1969,7 @@ public class UserITCase extends AbstractITCase { associationMod.setChangePwd(true); associationMod.setPassword("password"); - assertNotNull(userService.bulkAssociation(actual.getKey(), ResourceAssociationActionType.PROVISION, + assertNotNull(userService.associate(actual.getKey(), ResourceAssociationAction.PROVISION, associationMod) .readEntity(BulkActionResult.class)); @@ -1986,7 +1978,7 @@ public class UserITCase extends AbstractITCase { assertTrue(actual.getResources().isEmpty()); assertNotNull(resourceService.readConnObject(RESOURCE_NAME_CSV, AnyTypeKind.USER.name(), actual.getKey())); - assertNotNull(userService.bulkDeassociation(actual.getKey(), + assertNotNull(userService.deassociate(actual.getKey(), ResourceDeassociationActionType.DEPROVISION, CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceKey.class)). readEntity(BulkActionResult.class));
