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 2018/02/13 16:02:00 UTC
[5/7] syncope git commit: [SYNCOPE-1262] Remove matrix parameters -
OpenApi wins :-(
http://git-wip-us.apache.org/repos/asf/syncope/blob/eb1cd3ff/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
index c46c445..7255ac5 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
@@ -79,7 +79,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
@Test
public void read() {
PushTaskTO pushTaskTO = taskService.<PushTaskTO>read(
- "0bc11a19-6454-45c2-a4e3-ceef84e5d79b", true);
+ TaskType.PUSH, "0bc11a19-6454-45c2-a4e3-ceef84e5d79b", true);
assertEquals(UnmatchingRule.ASSIGN, pushTaskTO.getUnmatchingRule());
assertEquals(MatchingRule.UPDATE, pushTaskTO.getMatchingRule());
}
@@ -105,11 +105,11 @@ public class PushTaskITCase extends AbstractTaskITCase {
SyncopeClient.getGroupSearchConditionBuilder().isNotNull("cool").query());
task.setMatchingRule(MatchingRule.LINK);
- final Response response = taskService.create(task);
+ final Response response = taskService.create(TaskType.PUSH, task);
final PushTaskTO actual = getObject(response.getLocation(), TaskService.class, PushTaskTO.class);
assertNotNull(actual);
- task = taskService.read(actual.getKey(), true);
+ task = taskService.read(TaskType.PUSH, actual.getKey(), true);
assertNotNull(task);
assertEquals(task.getKey(), actual.getKey());
assertEquals(task.getJobDelegate(), actual.getJobDelegate());
@@ -126,7 +126,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
assertFalse(groupService.read("29f96485-729e-4d31-88a1-6fc60e4677f3").
getResources().contains(RESOURCE_NAME_LDAP));
- execProvisioningTask(taskService, "fd905ba5-9d56-4f51-83e2-859096a67b75", 50, false);
+ execProvisioningTask(taskService, TaskType.PUSH, "fd905ba5-9d56-4f51-83e2-859096a67b75", 50, false);
assertNotNull(resourceService.readConnObject(
RESOURCE_NAME_LDAP, AnyTypeKind.GROUP.name(), "29f96485-729e-4d31-88a1-6fc60e4677f3"));
@@ -151,7 +151,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
// ------------------------------------------
// Unmatching --> Assign --> dryRuyn
// ------------------------------------------
- execProvisioningTask(taskService, "af558be4-9d2f-4359-bf85-a554e6e90be1", 50, true);
+ execProvisioningTask(taskService, TaskType.PUSH, "af558be4-9d2f-4359-bf85-a554e6e90be1", 50, true);
assertEquals(0, jdbcTemplate.queryForList("SELECT ID FROM test2 WHERE ID='vivaldi'").size());
assertFalse(userService.read("b3cbc78d-32e6-4bd4-92e0-bbe07566a2ee").
getResources().contains(RESOURCE_NAME_TESTDB2));
@@ -162,7 +162,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
pushTaskKeys.add("97f327b6-2eff-4d35-85e8-d581baaab855");
pushTaskKeys.add("03aa2a04-4881-4573-9117-753f81b04865");
pushTaskKeys.add("5e5f7c7e-9de7-4c6a-99f1-4df1af959807");
- execProvisioningTasks(taskService, pushTaskKeys, 50, false);
+ execProvisioningTasks(taskService, TaskType.PUSH, pushTaskKeys, 50, false);
// ------------------------------------------
// Unatching --> Ignore
@@ -213,7 +213,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
// ------------------------------------------
// Matching --> Deprovision --> dryRuyn
// ------------------------------------------
- execProvisioningTask(taskService, "c46edc3a-a18b-4af2-b707-f4a415507496", 50, true);
+ execProvisioningTask(taskService, TaskType.PUSH, "c46edc3a-a18b-4af2-b707-f4a415507496", 50, true);
assertTrue(userService.read("1417acbe-cbf6-4277-9372-e75e04f97000").
getResources().contains(RESOURCE_NAME_TESTDB2));
assertEquals(1, jdbcTemplate.queryForList("SELECT ID FROM test2 WHERE ID='rossini'").size());
@@ -224,7 +224,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
pushTaskKeys.add("c46edc3a-a18b-4af2-b707-f4a415507496");
pushTaskKeys.add("5e5f7c7e-9de7-4c6a-99f1-4df1af959807");
- execProvisioningTasks(taskService, pushTaskKeys, 50, false);
+ execProvisioningTasks(taskService, TaskType.PUSH, pushTaskKeys, 50, false);
// ------------------------------------------
// Matching --> Deprovision && Ignore
@@ -247,7 +247,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
// ------------------------------------------
// Matching --> Link
// ------------------------------------------
- execProvisioningTask(taskService, "51318433-cce4-4f71-8f45-9534b6c9c819", 50, false);
+ execProvisioningTask(taskService, TaskType.PUSH, "51318433-cce4-4f71-8f45-9534b6c9c819", 50, false);
assertTrue(userService.read("74cd8ece-715a-44a4-a736-e17b46c4e7e6").
getResources().contains(RESOURCE_NAME_TESTDB2));
assertEquals(1, jdbcTemplate.queryForList("SELECT ID FROM test2 WHERE ID='verdi'").size());
@@ -257,7 +257,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
pushTaskKeys.add("24b1be9c-7e3b-443a-86c9-798ebce5eaf2");
pushTaskKeys.add("375c7b7f-9e3a-4833-88c9-b7787b0a69f2");
- execProvisioningTasks(taskService, pushTaskKeys, 50, false);
+ execProvisioningTasks(taskService, TaskType.PUSH, pushTaskKeys, 50, false);
// ------------------------------------------
// Matching --> Unlink && Update
@@ -284,11 +284,11 @@ public class PushTaskITCase extends AbstractTaskITCase {
task.setPerformDelete(true);
task.setPerformUpdate(true);
- Response response = taskService.create(task);
+ Response response = taskService.create(TaskType.PUSH, task);
PushTaskTO pushTask = getObject(response.getLocation(), TaskService.class, PushTaskTO.class);
assertNotNull(pushTask);
- ExecTO exec = execProvisioningTask(taskService, pushTask.getKey(), 50, false);
+ ExecTO exec = execProvisioningTask(taskService, TaskType.PUSH, pushTask.getKey(), 50, false);
assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(exec.getStatus()));
// 2. check
@@ -371,12 +371,12 @@ public class PushTaskITCase extends AbstractTaskITCase {
task.getFilters().put(AnyTypeKind.GROUP.name(),
SyncopeClient.getGroupSearchConditionBuilder().is("name").equalTo(groupTO.getName()).query());
- response = taskService.create(task);
+ response = taskService.create(TaskType.PUSH, task);
PushTaskTO push = getObject(response.getLocation(), TaskService.class, PushTaskTO.class);
assertNotNull(push);
// execute the new task
- ExecTO exec = execProvisioningTask(taskService, push.getKey(), 50, false);
+ ExecTO exec = execProvisioningTask(taskService, TaskType.PUSH, push.getKey(), 50, false);
assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(exec.getStatus()));
} finally {
groupService.delete(groupTO.getKey());
@@ -401,7 +401,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
task.setMatchingRule(MatchingRule.IGNORE);
task.setUnmatchingRule(UnmatchingRule.IGNORE);
- Response response = taskService.create(task);
+ Response response = taskService.create(TaskType.PUSH, task);
PushTaskTO actual = getObject(response.getLocation(), TaskService.class, PushTaskTO.class);
assertNotNull(actual);
@@ -425,7 +425,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
notification = getObject(responseNotification.getLocation(), NotificationService.class, NotificationTO.class);
assertNotNull(notification);
- execProvisioningTask(taskService, actual.getKey(), 50, false);
+ execProvisioningTask(taskService, TaskType.PUSH, actual.getKey(), 50, false);
NotificationTaskTO taskTO = findNotificationTask(notification.getKey(), 50);
assertNotNull(taskTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/eb1cd3ff/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
index 7f2a9cc..1799e88 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
@@ -40,6 +40,7 @@ import org.apache.syncope.common.lib.to.ProvisioningResult;
import org.apache.syncope.common.lib.types.ClientExceptionType;
import org.apache.syncope.common.lib.types.ImplementationEngine;
import org.apache.syncope.common.lib.types.ImplementationType;
+import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.common.lib.types.PropagationTaskExecStatus;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.common.rest.api.service.RealmService;
@@ -144,7 +145,7 @@ public class RealmITCase extends AbstractITCase {
policy.setDescription("deletingAccountPolicy");
policy.getRules().add(rule.getKey());
- policy = createPolicy(policy);
+ policy = createPolicy(PolicyType.ACCOUNT, policy);
assertNotNull(policy);
// 2. create realm with policy assigned
@@ -169,7 +170,7 @@ public class RealmITCase extends AbstractITCase {
assertEquals(policy.getKey(), actual.getAccountPolicy());
// 3. remove policy
- policyService.delete(policy.getKey());
+ policyService.delete(PolicyType.ACCOUNT, policy.getKey());
// 4. verify
actual = getRealm(actual.getFullPath()).get();
http://git-wip-us.apache.org/repos/asf/syncope/blob/eb1cd3ff/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
index a88327f..358506a 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
@@ -72,7 +72,7 @@ public class SchedTaskITCase extends AbstractTaskITCase {
@Test
public void update() {
- SchedTaskTO task = taskService.read(SCHED_TASK_KEY, true);
+ SchedTaskTO task = taskService.read(TaskType.SCHEDULED, SCHED_TASK_KEY, true);
assertNotNull(task);
SchedTaskTO taskMod = new SchedTaskTO();
@@ -80,8 +80,8 @@ public class SchedTaskITCase extends AbstractTaskITCase {
taskMod.setName(task.getName());
taskMod.setCronExpression(null);
- taskService.update(taskMod);
- SchedTaskTO actual = taskService.read(taskMod.getKey(), true);
+ taskService.update(TaskType.SCHEDULED, taskMod);
+ SchedTaskTO actual = taskService.read(TaskType.SCHEDULED, taskMod.getKey(), true);
assertNotNull(actual);
assertEquals(task.getKey(), actual.getKey());
assertNull(actual.getCronExpression());
@@ -97,7 +97,7 @@ public class SchedTaskITCase extends AbstractTaskITCase {
task.setName("deferred");
task.setJobDelegate(taskJobDelegate.getKey());
- Response response = taskService.create(task);
+ Response response = taskService.create(TaskType.SCHEDULED, task);
task = getObject(response.getLocation(), TaskService.class, SchedTaskTO.class);
assertNotNull(task);
@@ -116,7 +116,7 @@ public class SchedTaskITCase extends AbstractTaskITCase {
} catch (InterruptedException e) {
}
- task = taskService.read(task.getKey(), true);
+ task = taskService.read(TaskType.SCHEDULED, task.getKey(), true);
assertNotNull(task);
assertNotNull(task.getExecutions());
@@ -142,13 +142,13 @@ public class SchedTaskITCase extends AbstractTaskITCase {
task.setDescription("issueSYNCOPE144 Description");
task.setJobDelegate(taskJobDelegate.getKey());
- Response response = taskService.create(task);
+ Response response = taskService.create(TaskType.SCHEDULED, task);
task = getObject(response.getLocation(), TaskService.class, SchedTaskTO.class);
assertNotNull(task);
assertEquals("issueSYNCOPE144", task.getName());
assertEquals("issueSYNCOPE144 Description", task.getDescription());
- task = taskService.read(task.getKey(), true);
+ task = taskService.read(TaskType.SCHEDULED, task.getKey(), true);
assertNotNull(task);
assertEquals("issueSYNCOPE144", task.getName());
assertEquals("issueSYNCOPE144 Description", task.getDescription());
@@ -156,7 +156,7 @@ public class SchedTaskITCase extends AbstractTaskITCase {
task.setName("issueSYNCOPE144_2");
task.setDescription("issueSYNCOPE144 Description_2");
- response = taskService.create(task);
+ response = taskService.create(TaskType.SCHEDULED, task);
task = getObject(response.getLocation(), TaskService.class, SchedTaskTO.class);
assertNotNull(task);
assertEquals("issueSYNCOPE144_2", task.getName());
@@ -176,7 +176,7 @@ public class SchedTaskITCase extends AbstractTaskITCase {
task.setDescription("issueSYNCOPE660 Description");
task.setJobDelegate(taskJobDelegate.getKey());
- Response response = taskService.create(task);
+ Response response = taskService.create(TaskType.SCHEDULED, task);
task = getObject(response.getLocation(), TaskService.class, SchedTaskTO.class);
jobs = taskService.listJobs();
http://git-wip-us.apache.org/repos/asf/syncope/blob/eb1cd3ff/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SwaggerITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SwaggerITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SwaggerITCase.java
deleted file mode 100644
index d928e3c..0000000
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SwaggerITCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.fit.core;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
-import java.io.InputStream;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.syncope.fit.AbstractITCase;
-import org.junit.jupiter.api.Test;
-
-public class SwaggerITCase extends AbstractITCase {
-
- @Test
- public void swagger() throws IOException {
- WebClient webClient = WebClient.create(ADDRESS + "/swagger.json").accept(MediaType.APPLICATION_JSON_TYPE);
- Response response = webClient.get();
- assumeTrue(response.getStatus() == 200);
-
- JsonNode tree = new ObjectMapper().readTree((InputStream) response.getEntity());
- assertNotNull(tree);
-
- JsonNode info = tree.get("info");
- assertEquals("Apache Syncope", info.get("title").asText());
-
- assertEquals("/syncope/rest", tree.get("basePath").asText());
-
- JsonNode tags = tree.get("tags");
- assertNotNull(tags);
- assertTrue(tags.isContainerNode());
-
- JsonNode paths = tree.get("paths");
- assertNotNull(paths);
- assertTrue(paths.isContainerNode());
-
- JsonNode definitions = tree.get("definitions");
- assertNotNull(definitions);
- assertTrue(definitions.isContainerNode());
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/eb1cd3ff/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
index 83d41c1..f962361 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
@@ -73,6 +73,7 @@ import org.apache.syncope.common.lib.types.ClientExceptionType;
import org.apache.syncope.common.lib.types.ImplementationEngine;
import org.apache.syncope.common.lib.types.ImplementationType;
import org.apache.syncope.common.lib.types.PatchOperation;
+import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.common.lib.types.PropagationTaskExecStatus;
import org.apache.syncope.common.lib.types.ResourceAssociationAction;
import org.apache.syncope.common.lib.types.ResourceDeassociationAction;
@@ -276,7 +277,7 @@ public class UserITCase extends AbstractITCase {
assertFalse(tasks.getResult().isEmpty());
String maxKey = tasks.getResult().iterator().next().getKey();
- PropagationTaskTO taskTO = taskService.read(maxKey, true);
+ PropagationTaskTO taskTO = taskService.read(TaskType.PROPAGATION, maxKey, true);
assertNotNull(taskTO);
int maxTaskExecutions = taskTO.getExecutions().size();
@@ -324,7 +325,7 @@ public class UserITCase extends AbstractITCase {
assertEquals(newMaxKey, maxKey);
// get last task
- taskTO = taskService.read(newMaxKey, true);
+ taskTO = taskService.read(TaskType.PROPAGATION, newMaxKey, true);
assertNotNull(taskTO);
assertEquals(maxTaskExecutions, taskTO.getExecutions().size());
@@ -680,7 +681,7 @@ public class UserITCase extends AbstractITCase {
// all update executions have to be registered
newMaxKey = tasks.getResult().iterator().next().getKey();
- PropagationTaskTO taskTO = taskService.read(newMaxKey, true);
+ PropagationTaskTO taskTO = taskService.read(TaskType.PROPAGATION, newMaxKey, true);
assertNotNull(taskTO);
assertEquals(1, taskTO.getExecutions().size());
@@ -950,7 +951,7 @@ public class UserITCase extends AbstractITCase {
AccountPolicyTO accountPolicy = new AccountPolicyTO();
accountPolicy.setDescription("Account Policy with custom rules");
accountPolicy.getRules().add(implementationTO.getKey());
- accountPolicy = createPolicy(accountPolicy);
+ accountPolicy = createPolicy(PolicyType.ACCOUNT, accountPolicy);
assertNotNull(accountPolicy);
implementationTO = new ImplementationTO();
@@ -964,7 +965,7 @@ public class UserITCase extends AbstractITCase {
PasswordPolicyTO passwordPolicy = new PasswordPolicyTO();
passwordPolicy.setDescription("Password Policy with custom rules");
passwordPolicy.getRules().add(implementationTO.getKey());
- passwordPolicy = createPolicy(passwordPolicy);
+ passwordPolicy = createPolicy(PolicyType.PASSWORD, passwordPolicy);
assertNotNull(passwordPolicy);
RealmTO realm = realmService.list("/even/two").get(0);
@@ -1002,8 +1003,8 @@ public class UserITCase extends AbstractITCase {
realm.setPasswordPolicy(oldPasswordPolicy);
realmService.update(realm);
- policyService.delete(passwordPolicy.getKey());
- policyService.delete(accountPolicy.getKey());
+ policyService.delete(PolicyType.PASSWORD, passwordPolicy.getKey());
+ policyService.delete(PolicyType.ACCOUNT, accountPolicy.getKey());
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/eb1cd3ff/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
index 2a1e944..8ff08a0 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
@@ -71,6 +71,7 @@ import org.apache.syncope.common.lib.types.ImplementationEngine;
import org.apache.syncope.common.lib.types.ImplementationType;
import org.apache.syncope.common.lib.types.MappingPurpose;
import org.apache.syncope.common.lib.types.PatchOperation;
+import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.common.lib.types.PropagationTaskExecStatus;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.common.rest.api.service.ImplementationService;
@@ -1228,7 +1229,7 @@ public class UserIssuesITCase extends AbstractITCase {
passwordPolicy.setDescription("Password Policy for SYNCOPE-626");
passwordPolicy.getRules().add(rule.getKey());
- passwordPolicy = createPolicy(passwordPolicy);
+ passwordPolicy = createPolicy(PolicyType.PASSWORD, passwordPolicy);
assertNotNull(passwordPolicy);
RealmTO realm = realmService.list("/even/two").get(0);
@@ -1255,7 +1256,7 @@ public class UserIssuesITCase extends AbstractITCase {
realm.setPasswordPolicy(oldPasswordPolicy);
realmService.update(realm);
- policyService.delete(passwordPolicy.getKey());
+ policyService.delete(PolicyType.PASSWORD, passwordPolicy.getKey());
}
}