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 2018/07/06 13:32:05 UTC

[03/10] syncope git commit: Clean up some tests

Clean up some tests


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c4d7d936
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c4d7d936
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c4d7d936

Branch: refs/heads/master
Commit: c4d7d936fc2eba717476b5289f09a262928efe59
Parents: 2dd80d4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jul 6 14:23:24 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jul 6 14:23:24 2018 +0200

----------------------------------------------------------------------
 .../apache/syncope/fit/core/PropagationTaskITCase.java    | 10 ++++++++--
 .../java/org/apache/syncope/fit/core/PullTaskITCase.java  |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/c4d7d936/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
index 5c9944d..4e009af 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
@@ -28,6 +28,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.syncope.common.lib.patch.AttrPatch;
 import org.apache.syncope.common.lib.patch.UserPatch;
@@ -156,13 +157,18 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
         ResourceTO ldap = resourceService.read(RESOURCE_NAME_LDAP);
         ldap.setKey("ldapWithPrivileges");
 
+        ProvisionTO provision = ldap.getProvision(AnyTypeKind.USER.name()).orElse(null);
+        provision.getMapping().getItems().removeIf(item -> "mail".equals(item.getIntAttrName()));
+        provision.getVirSchemas().clear();
+
+        ldap.getProvisions().clear();
+        ldap.getProvisions().add(provision);
+
         ItemTO item = new ItemTO();
         item.setIntAttrName("privileges[mightyApp]");
         item.setExtAttrName("businessCategory");
         item.setPurpose(MappingPurpose.PROPAGATION);
 
-        ProvisionTO provision = ldap.getProvision(AnyTypeKind.USER.name()).get();
-        provision.getVirSchemas().clear();
         provision.getMapping().add(item);
 
         ldap = createResource(ldap);

http://git-wip-us.apache.org/repos/asf/syncope/blob/c4d7d936/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index 788ce04..2825f00 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -672,8 +672,12 @@ public class PullTaskITCase extends AbstractTaskITCase {
         ldap.setKey("ldapForRemediation");
 
         ProvisionTO provision = ldap.getProvision(AnyTypeKind.USER.name()).get();
-        provision.getVirSchemas().clear();
         provision.getMapping().getItems().removeIf(item -> "userId".equals(item.getIntAttrName()));
+        provision.getMapping().getItems().removeIf(item -> "mail".equals(item.getIntAttrName()));
+        provision.getVirSchemas().clear();
+
+        ldap.getProvisions().clear();
+        ldap.getProvisions().add(provision);
 
         ldap = createResource(ldap);