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 2013/04/29 13:22:10 UTC
svn commit: r1476969 - in /syncope/trunk: ./
common/src/main/java/org/apache/syncope/common/types/
core/src/test/java/org/apache/syncope/core/rest/
Author: ilgrosso
Date: Mon Apr 29 11:22:10 2013
New Revision: 1476969
URL: http://svn.apache.org/r1476969
Log:
[SYNCOPE-368] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.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/ResourceTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1476263-1476963
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java?rev=1476969&r1=1476968&r2=1476969&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java Mon Apr 29 11:22:10 2013
@@ -117,7 +117,7 @@ public enum IntMappingType {
public static Set<IntMappingType> getEmbedded() {
return EnumSet.of(
IntMappingType.UserId, IntMappingType.Username, IntMappingType.Password,
- IntMappingType.RoleId, IntMappingType.RoleName,
+ IntMappingType.RoleId, IntMappingType.RoleName, IntMappingType.RoleOwnerSchema,
IntMappingType.MembershipId);
}
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=1476969&r1=1476968&r2=1476969&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 Mon Apr 29 11:22:10 2013
@@ -18,6 +18,8 @@
*/
package org.apache.syncope.core.rest;
+import static org.apache.syncope.common.types.PolicyType.GLOBAL_SYNC;
+import static org.apache.syncope.common.types.PolicyType.SYNC;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
@@ -71,10 +73,13 @@ import org.apache.syncope.common.service
import org.apache.syncope.common.services.UserWorkflowService;
import org.apache.syncope.common.services.WorkflowService;
import org.apache.syncope.common.to.AbstractSchemaTO;
+import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.AttributeTO;
+import org.apache.syncope.common.to.PasswordPolicyTO;
import org.apache.syncope.common.to.PolicyTO;
import org.apache.syncope.common.to.ResourceTO;
import org.apache.syncope.common.to.RoleTO;
+import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.PolicyType;
@@ -338,24 +343,13 @@ public abstract class AbstractTest {
return attr;
}
- protected UserTO createUser(final UserTO userTO) {
- Response response = userService.create(userTO);
- if (response.getStatus() != HttpStatus.SC_CREATED) {
- Exception ex = clientExceptionMapper.fromResponse(response);
- if (ex != null) {
- throw (RuntimeException) ex;
- }
- }
- return response.readEntity(UserTO.class);
- }
-
protected void assertCreated(final Response response) {
if (response.getStatus() != HttpStatus.SC_CREATED) {
StringBuilder builder = new StringBuilder();
MultivaluedMap<String, Object> headers = response.getHeaders();
builder.append("Headers (");
for (String key : headers.keySet()) {
- builder.append(key + ":" + headers.getFirst(key) + ",");
+ builder.append(key).append(':').append(headers.getFirst(key)).append(',');
}
builder.append(")");
fail("Error on create. Status is : " + response.getStatus() + " with headers "
@@ -363,8 +357,21 @@ public abstract class AbstractTest {
}
}
- protected <T extends AbstractSchemaTO> Response createSchema(final AttributableType kind,
+ protected UserTO createUser(final UserTO userTO) {
+ Response response = userService.create(userTO);
+ if (response.getStatus() != HttpStatus.SC_CREATED) {
+ Exception ex = clientExceptionMapper.fromResponse(response);
+ if (ex != null) {
+ throw (RuntimeException) ex;
+ }
+ }
+ return response.readEntity(UserTO.class);
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <T extends AbstractSchemaTO> T createSchema(final AttributableType kind,
final SchemaType type, final T schemaTO) {
+
Response response = schemaService.create(kind, type, schemaTO);
if (response.getStatus() != HttpStatus.SC_CREATED) {
Exception ex = clientExceptionMapper.fromResponse(response);
@@ -372,10 +379,11 @@ public abstract class AbstractTest {
throw (RuntimeException) ex;
}
}
- return response;
+
+ return (T) getObject(response, schemaTO.getClass(), schemaService);
}
- protected RoleTO createRole(RoleService roleService, RoleTO newRoleTO) {
+ protected RoleTO createRole(final RoleService roleService, final RoleTO newRoleTO) {
Response response = roleService.create(newRoleTO);
if (response.getStatus() != org.apache.http.HttpStatus.SC_CREATED) {
Exception ex = clientExceptionMapper.fromResponse(response);
@@ -386,7 +394,8 @@ public abstract class AbstractTest {
return getObject(response, RoleTO.class, roleService);
}
- protected Response createPolicy(PolicyService policyService, PolicyType policyType, PolicyTO policy) {
+ @SuppressWarnings("unchecked")
+ protected <T extends PolicyTO> T createPolicy(final PolicyType policyType, final T policy) {
Response response = policyService.create(policyType, policy);
if (response.getStatus() != org.apache.http.HttpStatus.SC_CREATED) {
Exception ex = clientExceptionMapper.fromResponse(response);
@@ -394,10 +403,10 @@ public abstract class AbstractTest {
throw (RuntimeException) ex;
}
}
- return response;
+ return (T) getObject(response, policy.getClass(), policyService);
}
- protected Response createResource(ResourceService resourceService, ResourceTO resourceTO) {
+ protected ResourceTO createResource(final ResourceTO resourceTO) {
Response response = resourceService.create(resourceTO);
if (response.getStatus() != org.apache.http.HttpStatus.SC_CREATED) {
Exception ex = clientExceptionMapper.fromResponse(response);
@@ -405,6 +414,6 @@ public abstract class AbstractTest {
throw (RuntimeException) ex;
}
}
- return response;
+ return getObject(response, ResourceTO.class, resourceService);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java?rev=1476969&r1=1476968&r2=1476969&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java Mon Apr 29 11:22:10 2013
@@ -83,8 +83,7 @@ public class AuthenticationTestITCase ex
authRoleTO.setParent(8L);
authRoleTO.addEntitlement("SCHEMA_READ");
- Response response = roleService.create(authRoleTO);
- authRoleTO = getObject(response, RoleTO.class, roleService);
+ authRoleTO = createRole(roleService, authRoleTO);
assertNotNull(authRoleTO);
String schemaName = "authTestSchema" + getUUIDString();
@@ -95,8 +94,7 @@ public class AuthenticationTestITCase ex
schemaTO.setMandatoryCondition("false");
schemaTO.setType(AttributeSchemaType.String);
- response = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
- SchemaTO newSchemaTO = getObject(response, SchemaTO.class, entitlementService);
+ SchemaTO newSchemaTO = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
assertEquals(schemaTO, newSchemaTO);
// 2. create an user with the role created above (as admin)
@@ -334,8 +332,7 @@ public class AuthenticationTestITCase ex
parentRole.addEntitlement("ROLE_1");
parentRole.setParent(1L);
- Response response = roleService.create(parentRole);
- parentRole = getObject(response, RoleTO.class, roleService);
+ parentRole = createRole(roleService, parentRole);
assertNotNull(parentRole);
// Child role, with no entitlements
@@ -343,8 +340,7 @@ public class AuthenticationTestITCase ex
childRole.setName("childAdminRole");
childRole.setParent(parentRole.getId());
- response = roleService.create(childRole);
- childRole = getObject(response, RoleTO.class, roleService);
+ childRole = createRole(roleService, childRole);
assertNotNull(childRole);
// User with child role, created by admin
@@ -366,7 +362,7 @@ public class AuthenticationTestITCase ex
membershipTO.setRoleId(1L);
role1User.addMembership(membershipTO);
- response = userService2.create(role1User);
+ Response response = userService2.create(role1User);
assertNotNull(response);
role1User = response.readEntity(UserTO.class);
assertNotNull(role1User);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java?rev=1476969&r1=1476968&r2=1476969&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java Mon Apr 29 11:22:10 2013
@@ -26,8 +26,6 @@ import static org.junit.Assert.fail;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.to.DerivedSchemaTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.SchemaType;
@@ -65,8 +63,7 @@ public class DerivedSchemaTestITCase ext
schema.setName("derived");
schema.setExpression("derived_sx + '_' + derived_dx");
- Response response = createSchema(AttributableType.USER, SchemaType.DERIVED, schema);
- DerivedSchemaTO actual = getObject(response, DerivedSchemaTO.class, schemaService);
+ DerivedSchemaTO actual = createSchema(AttributableType.USER, SchemaType.DERIVED, schema);
assertNotNull(actual);
actual = schemaService.read(AttributableType.USER, SchemaType.DERIVED, actual.getName());
@@ -91,9 +88,8 @@ public class DerivedSchemaTestITCase ext
assertNotNull(e.getException(SyncopeClientExceptionType.NotFound));
} finally {
// Recreate schema to make test re-runnable
- Response response = createSchema(AttributableType.ROLE, SchemaType.DERIVED, schema);
- assertNotNull(response);
- assertEquals(HttpStatus.CREATED.value(), response.getStatus());
+ schema = createSchema(AttributableType.ROLE, SchemaType.DERIVED, schema);
+ assertNotNull(schema);
}
assertNotNull(t);
}
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=1476969&r1=1476968&r2=1476969&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 Mon Apr 29 11:22:10 2013
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.fail;
import java.util.List;
-import javax.ws.rs.core.Response;
import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
@@ -80,7 +79,7 @@ public class PolicyTestITCase extends Ab
policy.setDescription("global password policy");
try {
- createPolicy(policyService, PolicyType.PASSWORD, policy);
+ createPolicy(PolicyType.PASSWORD, policy);
fail();
} catch (SyncopeClientCompositeErrorException sccee) {
assertNotNull(sccee.getException(SyncopeClientExceptionType.InvalidPasswordPolicy));
@@ -93,7 +92,7 @@ public class PolicyTestITCase extends Ab
policy.setSpecification(new SyncPolicySpec());
try {
- createPolicy(policyService, PolicyType.SYNC, policy);
+ createPolicy(PolicyType.SYNC, policy);
fail();
} catch (SyncopeClientCompositeErrorException sccee) {
assertNotNull(sccee.getException(SyncopeClientExceptionType.InvalidSyncPolicy));
@@ -104,12 +103,11 @@ public class PolicyTestITCase extends Ab
public void create() {
SyncPolicyTO policy = buildSyncPolicyTO();
- Response response = createPolicy(policyService, PolicyType.SYNC, policy);
- SyncPolicyTO policyTO = getObject(response, SyncPolicyTO.class, policyService);
+ SyncPolicyTO policyTO = createPolicy(PolicyType.SYNC, policy);
assertNotNull(policyTO);
assertEquals(PolicyType.SYNC, policyTO.getType());
- assertEquals(TestSyncRule.class.getName(), ((SyncPolicySpec) policyTO.getSpecification()).getUserJavaRule());
+ assertEquals(TestSyncRule.class.getName(), policyTO.getSpecification().getUserJavaRule());
}
@Test
@@ -122,8 +120,7 @@ public class PolicyTestITCase extends Ab
policy.setSpecification(globalPolicy.getSpecification());
// create a new password policy using global password as a template
- Response response = createPolicy(policyService, PolicyType.PASSWORD, policy);
- policy = getObject(response, PasswordPolicyTO.class, policyService);
+ policy = createPolicy(PolicyType.PASSWORD, policy);
// read new password policy
policy = policyService.read(PolicyType.PASSWORD, policy.getId());
@@ -147,8 +144,8 @@ public class PolicyTestITCase extends Ab
@Test
public void delete() {
SyncPolicyTO policy = buildSyncPolicyTO();
- Response response = createPolicy(policyService, PolicyType.SYNC, policy);
- SyncPolicyTO policyTO = getObject(response, SyncPolicyTO.class, policyService);
+
+ SyncPolicyTO policyTO = createPolicy(PolicyType.SYNC, policy);
assertNotNull(policyTO);
policyService.delete(PolicyType.SYNC, policyTO.getId());
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java?rev=1476969&r1=1476968&r2=1476969&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java Mon Apr 29 11:22:10 2013
@@ -194,7 +194,7 @@ public class ResourceTestITCase extends
resourceTO.setUmapping(mapping);
try {
- createResource(resourceService, resourceTO);
+ createResource(resourceTO);
fail("Create should not have worked");
} catch (SyncopeClientCompositeErrorException e) {
SyncopeClientException requiredValueMissing = e
@@ -228,7 +228,7 @@ public class ResourceTestITCase extends
resourceTO.setUmapping(mapping);
- createResource(resourceService, resourceTO);
+ createResource(resourceTO);
}
@Test
@@ -395,7 +395,7 @@ public class ResourceTestITCase extends
assertNotNull(actual);
try {
- createResource(resourceService, actual);
+ createResource(actual);
fail();
} catch (SyncopeClientCompositeErrorException scce) {
assertEquals(HttpStatus.CONFLICT, scce.getStatusCode());
@@ -404,7 +404,7 @@ public class ResourceTestITCase extends
actual.setName(null);
try {
- createResource(resourceService, actual);
+ createResource(actual);
fail();
} catch (SyncopeClientCompositeErrorException scce) {
assertEquals(HttpStatus.BAD_REQUEST, scce.getStatusCode());
@@ -458,6 +458,35 @@ public class ResourceTestITCase extends
assertNull(resource.getUmapping());
}
+ @Test
+ public void issueSYNCOPE368() {
+ final String name = "SYNCOPE368-" + getUUIDString();
+
+ ResourceTO resourceTO = new ResourceTO();
+
+ resourceTO.setName(name);
+ resourceTO.setConnectorId(105L);
+
+ MappingTO mapping = new MappingTO();
+
+ MappingItemTO item = new MappingItemTO();
+ item.setIntMappingType(IntMappingType.RoleName);
+ item.setPurpose(MappingPurpose.BOTH);
+ mapping.setAccountIdItem(item);
+
+ item = new MappingItemTO();
+ item.setIntMappingType(IntMappingType.RoleOwnerSchema);
+ item.setExtAttrName("owner");
+ item.setPurpose(MappingPurpose.BOTH);
+ mapping.addItem(item);
+
+ resourceTO.setRmapping(mapping);
+
+ resourceTO = createResource(resourceTO);
+ assertNotNull(resourceTO);
+ assertEquals(2, resourceTO.getRmapping().getItems().size());
+ }
+
private ResourceTO buildResourceTO(String resourceName) {
ResourceTO resourceTO = new ResourceTO();
@@ -477,7 +506,6 @@ public class ResourceTestITCase extends
item.setExtAttrName("username");
item.setIntAttrName("fullname");
item.setIntMappingType(IntMappingType.UserId);
- item.setAccountid(true);
item.setPurpose(MappingPurpose.BOTH);
mapping.setAccountIdItem(item);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java?rev=1476969&r1=1476968&r2=1476969&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java Mon Apr 29 11:22:10 2013
@@ -29,8 +29,6 @@ import java.security.AccessControlExcept
import java.util.ArrayList;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.mod.RoleMod;
import org.apache.syncope.common.services.RoleService;
import org.apache.syncope.common.to.ConnObjectTO;
@@ -148,8 +146,7 @@ public class RoleTestITCase extends Abst
roleTO.addResource("resource-ldap");
- Response response = roleService.create(roleTO);
- roleTO = getObject(response, RoleTO.class, roleService);
+ roleTO = createRole(roleService, roleTO);
assertNotNull(roleTO);
RoleTO deletedRole = roleService.delete(roleTO.getId());
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java?rev=1476969&r1=1476968&r2=1476969&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java Mon Apr 29 11:22:10 2013
@@ -27,8 +27,6 @@ import static org.junit.Assert.fail;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.to.MembershipTO;
import org.apache.syncope.common.to.SchemaTO;
@@ -55,12 +53,10 @@ public class SchemaTestITCase extends Ab
SchemaTO schemaTO = buildSchemaTO("testAttribute", AttributeSchemaType.String);
schemaTO.setMandatoryCondition("false");
- Response response = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
- SchemaTO newSchemaTO = getObject(response, SchemaTO.class, schemaService);
+ SchemaTO newSchemaTO = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
assertEquals(schemaTO, newSchemaTO);
- response = createSchema(AttributableType.MEMBERSHIP, SchemaType.NORMAL, schemaTO);
- newSchemaTO = getObject(response, SchemaTO.class, schemaService);
+ newSchemaTO = createSchema(AttributableType.MEMBERSHIP, SchemaType.NORMAL, schemaTO);
assertEquals(schemaTO, newSchemaTO);
}
@@ -184,8 +180,7 @@ public class SchemaTestITCase extends Ab
schemaTO.setName("schema_issue258");
schemaTO.setType(AttributeSchemaType.Double);
- Response response = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
- schemaTO = getObject(response, SchemaTO.class, schemaService);
+ schemaTO = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
assertNotNull(schemaTO);
UserTO userTO = UserTestITCase.getUniqueSampleTO("issue258@syncope.apache.org");
@@ -209,8 +204,7 @@ public class SchemaTestITCase extends Ab
SchemaTO schemaTO = buildSchemaTO("schema_issue259", AttributeSchemaType.Double);
schemaTO.setUniqueConstraint(true);
- Response response = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
- schemaTO = getObject(response, SchemaTO.class, schemaService);
+ schemaTO = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
assertNotNull(schemaTO);
UserTO userTO = UserTestITCase.getUniqueSampleTO("issue259@syncope.apache.org");
@@ -234,8 +228,7 @@ public class SchemaTestITCase extends Ab
SchemaTO schemaTO = buildSchemaTO("schema_issue260", AttributeSchemaType.Double);
schemaTO.setUniqueConstraint(true);
- Response response = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
- schemaTO = getObject(response, SchemaTO.class, schemaService);
+ schemaTO = createSchema(AttributableType.USER, SchemaType.NORMAL, schemaTO);
assertNotNull(schemaTO);
UserTO userTO = UserTestITCase.getUniqueSampleTO("issue260@syncope.apache.org");
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java?rev=1476969&r1=1476968&r2=1476969&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java Mon Apr 29 11:22:10 2013
@@ -26,8 +26,6 @@ import static org.junit.Assert.fail;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.to.VirtualSchemaTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.SchemaType;
@@ -64,8 +62,7 @@ public class VirtualSchemaTestITCase ext
VirtualSchemaTO schema = new VirtualSchemaTO();
schema.setName("virtual");
- Response response = createSchema(AttributableType.USER, SchemaType.VIRTUAL, schema);
- VirtualSchemaTO actual = getObject(response, VirtualSchemaTO.class, schemaService);
+ VirtualSchemaTO actual = createSchema(AttributableType.USER, SchemaType.VIRTUAL, schema);
assertNotNull(actual);
actual = schemaService.read(AttributableType.USER, SchemaType.VIRTUAL, actual.getName());