Author: ilgrosso
Date: Thu Feb 7 13:59:04 2013
New Revision: 1443482
URL: http://svn.apache.org/viewvc?rev=1443482&view=rev
Log:
[SYNCOPE-265] Making ws-target-resource-2 non propagation-primary so that
propagation failures aren't blocking
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1443482&r1=1443481&r2=1443482&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Thu Feb 7 13:59:04 2013
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.search.AttributableCond;
import org.apache.syncope.common.search.AttributeCond;
import org.apache.syncope.common.search.MembershipCond;
@@ -47,7 +48,6 @@ import org.apache.syncope.common.to.Sync
import org.apache.syncope.common.to.TaskExecTO;
import org.apache.syncope.common.to.TaskTO;
import org.apache.syncope.common.to.UserTO;
-import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.types.PolicyType;
@@ -825,7 +825,7 @@ public class TaskTestITCase extends Abst
userMod.addAttributeToBeUpdated(attributeMod("email",
"s...@apache.org"));
userTO = userService.update(userMod.getId(), userMod);
-
+
execSyncTask(actual.getId(), 50, false);
SyncTaskTO executed = taskService.read(TaskType.SYNCHRONIZATION,
actual.getId());
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=1443482&r1=1443481&r2=1443482&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
Thu Feb 7 13:59:04 2013
@@ -33,9 +33,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
-
import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.mod.MembershipMod;
import org.apache.syncope.common.mod.UserMod;
@@ -1912,7 +1910,7 @@ public class UserTestITCase extends Abst
// 4. update user, assign a propagation primary resource but don't
provide any password
UserMod userMod = new UserMod();
userMod.setId(userTO.getId());
- userMod.addResourceToBeAdded("ws-target-resource-2");
+ userMod.addResourceToBeAdded("ws-target-resource-1");
userTO = userService.update(userMod.getId(), userMod);
assertNotNull(userTO);
@@ -1923,7 +1921,7 @@ public class UserTestITCase extends Abst
assertEquals(1, props.size());
PropagationStatusTO prop = props.iterator().next();
assertNotNull(prop);
- assertEquals("ws-target-resource-2", prop.getResource());
+ assertEquals("ws-target-resource-1", prop.getResource());
assertEquals(PropagationTaskExecStatus.SUCCESS, prop.getStatus());
} catch (Exception e) {
LOG.error("Unexpected exception", e);
@@ -1978,5 +1976,4 @@ public class UserTestITCase extends Abst
}
return newMaxId;
}
-
}
Modified: syncope/trunk/core/src/test/resources/content.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1443482&r1=1443481&r2=1443482&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Thu Feb 7 13:59:04 2013
@@ -344,7 +344,7 @@ under the License.
propagationPriority="0" propagationPrimary="1"
createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL"
syncTraceLevel="ALL"/>
<ExternalResource name="ws-target-resource-2" connector_id="100"
randomPwdIfNotProvided="0" enforceMandatoryCondition="1"
propagationMode="TWO_PHASES"
- propagationPriority="0" propagationPrimary="1"
createTraceLevel="FAILURES" deleteTraceLevel="NONE" updateTraceLevel="ALL"
syncTraceLevel="ALL"
+ propagationPriority="0" propagationPrimary="0"
createTraceLevel="FAILURES" deleteTraceLevel="NONE" updateTraceLevel="ALL"
syncTraceLevel="ALL"
syncPolicy_id="9"/>
<ExternalResource name="ws-target-resource-timeout" connector_id="102"
randomPwdIfNotProvided="0" enforceMandatoryCondition="1"
propagationMode="TWO_PHASES"
@@ -386,11 +386,11 @@ under the License.
<!-- The following three resources has been added to verify the issue
SYNCOPE-68 -->
<ExternalResource name="ws-target-resource-nopropagation2"
connector_id="103" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
- randomPwdIfNotProvided="0" propagationPriority="0"
propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL"
updateTraceLevel="ALL" syncTraceLevel="ALL" />
+ randomPwdIfNotProvided="0" propagationPriority="0"
propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL"
updateTraceLevel="ALL" syncTraceLevel="ALL"/>
<ExternalResource name="ws-target-resource-nopropagation3"
connector_id="103" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
- randomPwdIfNotProvided="0" propagationPriority="0"
propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL"
updateTraceLevel="ALL" syncTraceLevel="ALL" />
+ randomPwdIfNotProvided="0" propagationPriority="0"
propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL"
updateTraceLevel="ALL" syncTraceLevel="ALL"/>
<ExternalResource name="ws-target-resource-nopropagation4"
connector_id="103" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
- randomPwdIfNotProvided="0" propagationPriority="0"
propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL"
updateTraceLevel="ALL" syncTraceLevel="ALL" />
+ randomPwdIfNotProvided="0" propagationPriority="0"
propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL"
updateTraceLevel="ALL" syncTraceLevel="ALL"/>
<!-- External resource for issue SYNCOPE-230 -->
<ExternalResource name="resource-db-sync" connector_id="107"
@@ -404,16 +404,16 @@ under the License.
enforceMandatoryCondition="0"
propagationMode="TWO_PHASES" propagationPrimary="0"
propagationPriority="0"/>
- <SyncopeUser_ExternalResource user_id="3"
resource_name="ws-target-resource-delete" />
- <SyncopeRole_ExternalResource role_id="3"
resource_name="ws-target-resource-list-mappings-1" />
- <SyncopeUser_ExternalResource user_id="3"
resource_name="ws-target-resource-2" />
- <SyncopeRole_ExternalResource role_id="8"
resource_name="ws-target-resource-2" />
- <SyncopeRole_ExternalResource role_id="3"
resource_name="ws-target-resource-list-mappings-2" />
- <SyncopeUser_ExternalResource user_id="3"
resource_name="ws-target-resource-1" />
- <SyncopeRole_ExternalResource role_id="7"
resource_name="ws-target-resource-nopropagation" />
- <SyncopeRole_ExternalResource role_id="10"
resource_name="ws-target-resource-nopropagation3" />
- <SyncopeRole_ExternalResource role_id="12" resource_name="resource-csv" />
- <SyncopeRole_ExternalResource role_id="13" resource_name="resource-csv" />
+ <SyncopeUser_ExternalResource user_id="3"
resource_name="ws-target-resource-delete"/>
+ <SyncopeUser_ExternalResource user_id="3"
resource_name="ws-target-resource-2"/>
+ <SyncopeUser_ExternalResource user_id="3"
resource_name="ws-target-resource-1"/>
+ <SyncopeRole_ExternalResource role_id="3"
resource_name="ws-target-resource-list-mappings-1"/>
+ <SyncopeRole_ExternalResource role_id="8"
resource_name="ws-target-resource-2"/>
+ <SyncopeRole_ExternalResource role_id="3"
resource_name="ws-target-resource-list-mappings-2"/>
+ <SyncopeRole_ExternalResource role_id="7"
resource_name="ws-target-resource-nopropagation"/>
+ <SyncopeRole_ExternalResource role_id="10"
resource_name="ws-target-resource-nopropagation3"/>
+ <SyncopeRole_ExternalResource role_id="12" resource_name="resource-csv"/>
+ <SyncopeRole_ExternalResource role_id="13" resource_name="resource-csv"/>
<UMapping id="15" resource_name="ws-target-resource-1"/>
<UMappingItem id="99" mapping_id="15" extAttrName="__NAME__"
@@ -616,7 +616,7 @@ under the License.
mandatoryCondition="true"/>
<UMappingItem id="332" mapping_id="17" accountid="0" password="0"
extAttrName="USERNAME" intAttrName="virtualdata"
intMappingType="UserVirtualSchema"
- mandatoryCondition="false" />
+ mandatoryCondition="false"/>
<UMapping id="18" resource_name="ws-target-resource-timeout"/>
<UMappingItem id="333" mapping_id="18" accountid="1" password="0"
