svn commit: r1429713 - in /syncope/trunk/core/src: main/java/org/apache/syncope/core/propagation/PropagationManager.java test/java/org/apache/syncope/core/rest/UserTestITCase.java

[fmartelli]

Author: fmartelli
Date: Mon Jan  7 09:03:56 2013
New Revision: 1429713

URL: http://svn.apache.org/viewvc?rev=1429713&view=rev
Log:
SYNCOPE-260 manually merged

Modified:
    
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
    
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java

Modified: 
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java?rev=1429713&r1=1429712&r2=1429713&view=diff
==============================================================================
--- 
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
 (original)
+++ 
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
 Mon Jan  7 09:03:56 2013
@@ -220,11 +220,11 @@ public class PropagationManager {
 
         return getUpdateTaskIds(
                 user, // SyncopeUser to be updated on external resources
-                null, // no propagation by resources
-                enable, // status to be propagated
                 null, // no password
-                null, // no virtual attributes to be managed
-                null, // no virtual attributes to be managed
+                enable, // status to be propagated
+                Collections.<String>emptySet(), // no virtual attributes to be 
managed
+                Collections.<AttributeMod>emptySet(), // no virtual attributes 
to be managed
+                null, // no propagation by resources
                 syncResourceNames);
     }
 
@@ -239,7 +239,8 @@ public class PropagationManager {
     public List<PropagationTask> getUserUpdateTaskIds(final 
WorkflowResult<Map.Entry<Long, Boolean>> wfResult)
             throws NotFoundException, UnauthorizedRoleException {
 
-        return getUserUpdateTaskIds(wfResult, null, null, null, null);
+        return getUserUpdateTaskIds(
+                wfResult, null, Collections.<String>emptySet(), 
Collections.<AttributeMod>emptySet(), null);
     }
 
     /**

Modified: 
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1429713&r1=1429712&r2=1429713&view=diff
==============================================================================
--- 
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
 (original)
+++ 
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
 Mon Jan  7 09:03:56 2013
@@ -1762,6 +1762,26 @@ public class UserTestITCase extends Abst
         // ----------------------------------
 
         // ----------------------------------
+        // suspend/reactivate user and check virtual attribute value 
(unchanged)
+        // ----------------------------------
+        userTO = userService.suspend(userTO.getId());
+        assertEquals("suspended", userTO.getStatus());
+
+        connObjectTO = readUserConnObj("ws-target-resource-2", 
userTO.getUsername());
+        assertNotNull(connObjectTO);
+        
assertFalse(connObjectTO.getAttributeMap().get("NAME").getValues().isEmpty());
+        assertEquals("virtualvalue2", 
connObjectTO.getAttributeMap().get("NAME").getValues().get(0));
+
+        userTO = userService.reactivate(userTO.getId());
+        assertEquals("active", userTO.getStatus());
+
+        connObjectTO = readUserConnObj("ws-target-resource-2", 
userTO.getUsername());
+        assertNotNull(connObjectTO);
+        
assertFalse(connObjectTO.getAttributeMap().get("NAME").getValues().isEmpty());
+        assertEquals("virtualvalue2", 
connObjectTO.getAttributeMap().get("NAME").getValues().get(0));
+        // ----------------------------------
+
+        // ----------------------------------
         // update user attribute and check virtual attribute value (unchanged)
         // ----------------------------------
         userMod = new UserMod();