Author: cschneider
Date: Thu Jan 31 14:24:26 2013
New Revision: 1440971
URL: http://svn.apache.org/viewvc?rev=1440971&view=rev
Log:
SYNCOPE-231 Fixing create issues in PolicyTestITCase and authorization issue in
UserTestITCase
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1440971&r1=1440970&r2=1440971&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
Thu Jan 31 14:24:26 2013
@@ -70,9 +70,11 @@ import org.apache.syncope.common.service
import org.apache.syncope.common.services.SchemaService.SchemaType;
import org.apache.syncope.common.to.AbstractSchemaTO;
import org.apache.syncope.common.to.AttributeTO;
+import org.apache.syncope.common.to.PolicyTO;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
+import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.common.validation.SyncopeClientErrorHandler;
import org.junit.Before;
import org.junit.runner.RunWith;
@@ -375,4 +377,15 @@ public abstract class AbstractTest {
return getObject(response, RoleTO.class, roleService);
}
+
+ protected Response createPolicy(PolicyService policyService, PolicyType
policyType, PolicyTO policy) {
+ Response response = policyService.create(policyType, policy);
+ if (response.getStatus() != org.apache.http.HttpStatus.SC_CREATED) {
+ Exception ex = clientExceptionMapper.fromResponse(response);
+ if (ex != null) {
+ throw (RuntimeException) ex;
+ }
+ }
+ return response;
+ }
}
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java?rev=1440971&r1=1440970&r2=1440971&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
Thu Jan 31 14:24:26 2013
@@ -81,14 +81,12 @@ public class PolicyTestITCase extends Ab
policy.setDescription("global password policy");
System.out.println(policy.getType());
- Throwable t = null;
try {
- policyService.create(PolicyType.PASSWORD, policy);
+ createPolicy(policyService, PolicyType.PASSWORD, policy);
fail();
} catch (SyncopeClientCompositeErrorException sccee) {
- t =
sccee.getException(SyncopeClientExceptionType.InvalidPasswordPolicy);
+
assertNotNull(sccee.getException(SyncopeClientExceptionType.InvalidPasswordPolicy));
}
- assertNotNull(t);
}
@Test
@@ -96,21 +94,19 @@ public class PolicyTestITCase extends Ab
SyncPolicyTO policy = new SyncPolicyTO();
policy.setSpecification(new SyncPolicySpec());
- Throwable t = null;
try {
- policyService.create(PolicyType.SYNC, policy);
+ createPolicy(policyService, PolicyType.SYNC, policy);
fail();
} catch (SyncopeClientCompositeErrorException sccee) {
- t =
sccee.getException(SyncopeClientExceptionType.InvalidSyncPolicy);
+
assertNotNull(sccee.getException(SyncopeClientExceptionType.InvalidSyncPolicy));
}
- assertNotNull(t);
}
@Test
public void create() {
SyncPolicyTO policy = buildSyncPolicyTO();
- Response response = policyService.create(PolicyType.SYNC, policy);
+ Response response = createPolicy(policyService, PolicyType.SYNC,
policy);
SyncPolicyTO policyTO = getObject(response, SyncPolicyTO.class,
policyService);
assertNotNull(policyTO);
@@ -127,7 +123,7 @@ public class PolicyTestITCase extends Ab
policy.setSpecification(globalPolicy.getSpecification());
// create a new password policy using global password as a template
- Response response = policyService.create(PolicyType.PASSWORD, policy);
+ Response response = createPolicy(policyService, PolicyType.PASSWORD,
policy);
policy = getObject(response, PasswordPolicyTO.class, policyService);
// read new password policy
@@ -152,7 +148,7 @@ public class PolicyTestITCase extends Ab
@Test
public void delete() {
SyncPolicyTO policy = buildSyncPolicyTO();
- Response response = policyService.create(PolicyType.SYNC, policy);
+ Response response = createPolicy(policyService, PolicyType.SYNC,
policy);
SyncPolicyTO policyTO = getObject(response, SyncPolicyTO.class,
policyService);
assertNotNull(policyTO);
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=1440971&r1=1440970&r2=1440971&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 Jan 31 14:24:26 2013
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.security.AccessControlException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Collections;
@@ -114,6 +115,9 @@ public class UserTestITCase extends Abst
fail();
} catch (HttpClientErrorException e) {
assertEquals(HttpStatus.FORBIDDEN, e.getStatusCode());
+ } catch (AccessControlException e) {
+ // Will be thrown by cxf service
+ assertNotNull(e);
}
UserTO userTO = userService2.readSelf();
