You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/11/06 11:00:47 UTC
[2/5] syncope git commit: [SYNCOPE-725] Refactoring completed
http://git-wip-us.apache.org/repos/asf/syncope/blob/eec66245/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java
index 170ca91..d580152 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java
@@ -51,7 +51,6 @@ import org.apache.syncope.common.lib.patch.LongReplacePatchItem;
import org.apache.syncope.common.lib.patch.StringReplacePatchItem;
import org.apache.syncope.common.lib.to.AnyTypeClassTO;
import org.apache.syncope.common.lib.to.AnyTypeTO;
-import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.ConnInstanceTO;
import org.apache.syncope.common.lib.to.ConnObjectTO;
@@ -222,33 +221,13 @@ public class GroupITCase extends AbstractITCase {
assertEquals(modName, groupTO.getName());
assertEquals(2, groupTO.getPlainAttrs().size());
-
- groupTO.getPlainAttrMap().get("show").getValues().clear();
-
- groupTO = groupService.update(groupTO).readEntity(new GenericType<ProvisioningResult<GroupTO>>(){}).getAny();
-
- assertFalse(groupTO.getPlainAttrMap().containsKey("show"));
- }
-
- @Test
- public void updateRemovingDerAttribute() {
- GroupTO groupTO = getBasicSampleTO("withderived" + getUUIDString());
- groupTO.getDerAttrs().add(attrTO("rderivedschema", null));
- groupTO = createGroup(groupTO).getAny();
-
- assertNotNull(groupTO);
- assertEquals(1, groupTO.getDerAttrs().size());
+ groupTO.getPlainAttrMap().get("show").getValues().clear();
- GroupPatch groupPatch = new GroupPatch();
- groupPatch.setKey(groupTO.getKey());
- groupPatch.getDerAttrs().add(new AttrPatch.Builder().operation(PatchOperation.DELETE).
- attrTO(new AttrTO.Builder().schema("rderivedschema").build()).
- build());
+ groupTO = groupService.update(groupTO).readEntity(new GenericType<ProvisioningResult<GroupTO>>() {
+ }).getAny();
- groupTO = updateGroup(groupPatch).getAny();
- assertNotNull(groupTO);
- assertTrue(groupTO.getDerAttrs().isEmpty());
+ assertFalse(groupTO.getPlainAttrMap().containsKey("show"));
}
@Test
@@ -680,7 +659,7 @@ public class GroupITCase extends AbstractITCase {
assertEquals(RESOURCE_NAME_LDAP, result.getPropagationStatuses().get(0).getResource());
assertEquals(PropagationTaskExecStatus.SUCCESS, result.getPropagationStatuses().get(0).getStatus());
group = result.getAny();
-
+
// 3. set capability override with only search allowed, but not enable
ldap.getCapabilitiesOverride().add(ConnectorCapability.SEARCH);
resourceService.update(ldap);
@@ -748,6 +727,7 @@ public class GroupITCase extends AbstractITCase {
MappingItemTO connObjectKey = mapping.getConnObjectKeyItem();
connObjectKey.setIntMappingType(IntMappingType.GroupDerivedSchema);
connObjectKey.setIntAttrName("displayProperty");
+ connObjectKey.setPurpose(MappingPurpose.PROPAGATION);
mapping.setConnObjectKeyItem(connObjectKey);
mapping.setConnObjectLink("'cn=' + displayProperty + ',ou=groups,o=isp'");
@@ -873,5 +853,5 @@ public class GroupITCase extends AbstractITCase {
assertNotNull(groupTO);
assertEquals("11.23", groupTO.getPlainAttrMap().get(doubleSchemaName).getValues().get(0));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/eec66245/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 94e51d7..c502ed1 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
@@ -272,23 +272,27 @@ public class UserITCase extends AbstractITCase {
resourceTO = getObject(response.getLocation(), ResourceService.class, ResourceTO.class);
assertNotNull(resourceTO);
- UserTO userTO = getUniqueSampleTO("syncope222@apache.org");
- userTO.getResources().add(resourceTO.getKey());
- userTO.setPassword("newPassword12");
-
try {
- userTO = createUser(userTO).getAny();
- fail();
- } catch (SyncopeClientException e) {
- assertEquals(ClientExceptionType.RequiredValuesMissing, e.getType());
- }
+ UserTO userTO = getUniqueSampleTO("syncope222@apache.org");
+ userTO.getResources().add(resourceTO.getKey());
+ userTO.setPassword("newPassword12");
- userTO.getAuxClasses().add("csv");
- userTO.getDerAttrs().add(attrTO("csvuserid", null));
+ try {
+ userTO = createUser(userTO).getAny();
+ fail();
+ } catch (SyncopeClientException e) {
+ assertEquals(ClientExceptionType.RequiredValuesMissing, e.getType());
+ }
- userTO = createUser(userTO).getAny();
- assertNotNull(userTO);
- assertEquals(Collections.singleton("resource-csv-enforcing"), userTO.getResources());
+ userTO.getAuxClasses().add("csv");
+ userTO.getDerAttrs().add(new AttrTO.Builder().schema("csvuserid").build());
+
+ userTO = createUser(userTO).getAny();
+ assertNotNull(userTO);
+ assertEquals(Collections.singleton(resourceTO.getKey()), userTO.getResources());
+ } finally {
+ resourceService.delete(resourceTO.getKey());
+ }
}
@Test
@@ -590,7 +594,7 @@ public class UserITCase extends AbstractITCase {
}
@Test
- public void updateWithouPassword() {
+ public void updateWithoutPassword() {
UserTO userTO = getUniqueSampleTO("updatewithout@password.com");
userTO = createUser(userTO).getAny();
@@ -599,15 +603,15 @@ public class UserITCase extends AbstractITCase {
UserPatch userPatch = new UserPatch();
userPatch.setKey(userTO.getKey());
- userPatch.getDerAttrs().add(new AttrPatch.Builder().operation(PatchOperation.DELETE).
- attrTO(new AttrTO.Builder().schema("cn").build()).
+ userPatch.getPlainAttrs().add(new AttrPatch.Builder().operation(PatchOperation.DELETE).
+ attrTO(new AttrTO.Builder().schema("type").build()).
build());
userTO = updateUser(userPatch).getAny();
assertNotNull(userTO);
assertNotNull(userTO.getDerAttrMap());
- assertFalse(userTO.getDerAttrMap().containsKey("cn"));
+ assertFalse(userTO.getPlainAttrMap().containsKey("type"));
}
@Test(expected = SyncopeClientException.class)
@@ -660,8 +664,6 @@ public class UserITCase extends AbstractITCase {
String newFullName = getUUIDString() + "g.h@t.com";
userPatch.getPlainAttrs().add(attrAddReplacePatch("fullname", newFullName));
- userPatch.getDerAttrs().add(new AttrPatch.Builder().operation(PatchOperation.ADD_REPLACE).
- attrTO(new AttrTO.Builder().schema("cn").build()).build());
userPatch.getMemberships().add(new MembershipPatch.Builder().operation(PatchOperation.ADD_REPLACE).
membershipTO(new MembershipTO.Builder().group(8L).build()).build());
userPatch.getMemberships().add(new MembershipPatch.Builder().operation(PatchOperation.ADD_REPLACE).
@@ -972,9 +974,9 @@ public class UserITCase extends AbstractITCase {
});
assertEquals(PropagationTaskExecStatus.SUCCESS, byResource.get(RESOURCE_NAME_LDAP).getStatus());
assertTrue(byResource.get(RESOURCE_NAME_TESTDB).getStatus() == PropagationTaskExecStatus.CREATED
- || byResource.get(RESOURCE_NAME_TESTDB).getStatus() == PropagationTaskExecStatus.SUCCESS);
+ || byResource.get(RESOURCE_NAME_TESTDB).getStatus() == PropagationTaskExecStatus.SUCCESS);
assertTrue(byResource.get(RESOURCE_NAME_TESTDB2).getStatus() == PropagationTaskExecStatus.CREATED
- || byResource.get(RESOURCE_NAME_TESTDB2).getStatus() == PropagationTaskExecStatus.SUCCESS);
+ || byResource.get(RESOURCE_NAME_TESTDB2).getStatus() == PropagationTaskExecStatus.SUCCESS);
}
@Test
@@ -989,7 +991,7 @@ public class UserITCase extends AbstractITCase {
ProvisioningResult<UserTO> result = asyncService.create(user).readEntity(
new GenericType<ProvisioningResult<UserTO>>() {
- });
+ });
assertNotNull(result);
verifyAsyncResult(result.getPropagationStatuses());
@@ -1001,13 +1003,13 @@ public class UserITCase extends AbstractITCase {
result = asyncService.update(userPatch).readEntity(
new GenericType<ProvisioningResult<UserTO>>() {
- });
+ });
assertNotNull(result);
verifyAsyncResult(result.getPropagationStatuses());
result = asyncService.delete(result.getAny().getKey()).readEntity(
new GenericType<ProvisioningResult<UserTO>>() {
- });
+ });
assertNotNull(result);
verifyAsyncResult(result.getPropagationStatuses());
}