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/08/13 17:18:03 UTC
[21/26] syncope git commit: [SYNCOPE-652] Now account lockout is
working properly again
http://git-wip-us.apache.org/repos/asf/syncope/blob/5cf6aae8/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java
index 3fc1b98..92bca46 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java
@@ -134,8 +134,9 @@ public class VirAttrITCase extends AbstractITCase {
// suspend/reactivate user and check virtual attribute value (unchanged)
// ----------------------------------
StatusMod statusMod = new StatusMod();
+ statusMod.setKey(userTO.getKey());
statusMod.setType(StatusMod.ModType.SUSPEND);
- userTO = userService.status(userTO.getKey(), statusMod).readEntity(UserTO.class);
+ userTO = userService.status(statusMod).readEntity(UserTO.class);
assertEquals("suspended", userTO.getStatus());
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
@@ -144,8 +145,9 @@ public class VirAttrITCase extends AbstractITCase {
assertEquals("virtualvalue2", connObjectTO.getPlainAttrMap().get("NAME").getValues().get(0));
statusMod = new StatusMod();
+ statusMod.setKey(userTO.getKey());
statusMod.setType(StatusMod.ModType.REACTIVATE);
- userTO = userService.status(userTO.getKey(), statusMod).readEntity(UserTO.class);
+ userTO = userService.status(statusMod).readEntity(UserTO.class);
assertEquals("active", userTO.getStatus());
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
http://git-wip-us.apache.org/repos/asf/syncope/blob/5cf6aae8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bc1e2f4..e5d21f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,7 +336,7 @@ under the License.
<spring-security.version>4.0.2.RELEASE</spring-security.version>
<openjpa.version>2.4.0</openjpa.version>
- <commons-dbcp.version>2.1</commons-dbcp.version>
+ <commons-dbcp.version>2.1.1</commons-dbcp.version>
<hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
<jasypt.version>1.9.2</jasypt.version>