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 2016/04/05 15:46:47 UTC
[2/3] syncope git commit: [SYNCOPE-806] Resource provisioning
validated, and management of aux classes in Provision instances added
http://git-wip-us.apache.org/repos/asf/syncope/blob/692e1f91/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java
index 25434e9..b51670b 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java
@@ -455,6 +455,35 @@ public class VirAttrITCase extends AbstractITCase {
try {
// -------------------------------------------
+ // Create a VirAttrITCase ad-hoc
+ // -------------------------------------------
+ VirSchemaTO rvirtualdata;
+ try {
+ rvirtualdata = schemaService.read(SchemaType.VIRTUAL, "rvirtualdata");
+ } catch (SyncopeClientException e) {
+ LOG.warn("rvirtualdata not found, re-creating", e);
+
+ rvirtualdata = new VirSchemaTO();
+ rvirtualdata.setKey("rvirtualdata");
+ rvirtualdata.setExtAttrName("businessCategory");
+ rvirtualdata.setProvision(20);
+
+ rvirtualdata = createSchema(SchemaType.VIRTUAL, rvirtualdata);
+ }
+ assertNotNull(rvirtualdata);
+
+ if (!"minimal group".equals(rvirtualdata.getAnyTypeClass())) {
+ LOG.warn("rvirtualdata not in minimal group, restoring");
+
+ AnyTypeClassTO minimalGroup = anyTypeClassService.read("minimal group");
+ minimalGroup.getVirSchemas().add(rvirtualdata.getKey());
+ anyTypeClassService.update(minimalGroup);
+
+ rvirtualdata = schemaService.read(SchemaType.VIRTUAL, rvirtualdata.getKey());
+ assertEquals("minimal group", rvirtualdata.getAnyTypeClass());
+ }
+
+ // -------------------------------------------
// Create a resource ad-hoc
// -------------------------------------------
ResourceTO resourceTO = new ResourceTO();
@@ -465,6 +494,7 @@ public class VirAttrITCase extends AbstractITCase {
ProvisionTO provisionTO = new ProvisionTO();
provisionTO.setAnyType(AnyTypeKind.USER.name());
provisionTO.setObjectClass(ObjectClass.ACCOUNT_NAME);
+ provisionTO.getAuxClasses().add("minimal group");
resourceTO.getProvisions().add(provisionTO);
MappingTO mapping = new MappingTO();
@@ -495,34 +525,6 @@ public class VirAttrITCase extends AbstractITCase {
assertNotNull(getObject(
resourceService.create(resourceTO).getLocation(), ResourceService.class, ResourceTO.class));
// -------------------------------------------
- // -------------------------------------------
- // Create a VirAttrITCase ad-hoc
- // -------------------------------------------
- VirSchemaTO rvirtualdata;
- try {
- rvirtualdata = schemaService.read(SchemaType.VIRTUAL, "rvirtualdata");
- } catch (SyncopeClientException e) {
- LOG.warn("rvirtualdata not found, re-creating", e);
-
- rvirtualdata = new VirSchemaTO();
- rvirtualdata.setKey("rvirtualdata");
- rvirtualdata.setExtAttrName("businessCategory");
- rvirtualdata.setProvision(20);
-
- rvirtualdata = createSchema(SchemaType.VIRTUAL, rvirtualdata);
- }
- assertNotNull(rvirtualdata);
-
- if (!"minimal group".equals(rvirtualdata.getAnyTypeClass())) {
- LOG.warn("rvirtualdata not in minimal group, restoring");
-
- AnyTypeClassTO minimalGroup = anyTypeClassService.read("minimal group");
- minimalGroup.getVirSchemas().add(rvirtualdata.getKey());
- anyTypeClassService.update(minimalGroup);
-
- rvirtualdata = schemaService.read(SchemaType.VIRTUAL, rvirtualdata.getKey());
- assertEquals("minimal group", rvirtualdata.getAnyTypeClass());
- }
GroupTO groupTO = new GroupTO();
groupTO.setName(groupName);