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 2023/01/10 11:50:33 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1720] Fixing test execution
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 4b2dd3e5ae [SYNCOPE-1720] Fixing test execution
4b2dd3e5ae is described below
commit 4b2dd3e5aeb8caa04e087e0a4f631463ddfbd568
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Jan 10 12:25:27 2023 +0100
[SYNCOPE-1720] Fixing test execution
---
.../org/apache/syncope/fit/core/AuditITCase.java | 21 +++++-----
.../org/apache/syncope/fit/core/UserITCase.java | 47 ++++++++++++++--------
2 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
index e3c0654ed0..a7f3a96530 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
@@ -66,8 +66,7 @@ public class AuditITCase extends AbstractITCase {
assertNotNull(userTO.getKey());
AuditQuery query = new AuditQuery.Builder().entityKey(userTO.getKey()).build();
- List<AuditEntry> entries = query(query, MAX_WAIT_SECONDS);
- assertEquals(1, entries.size());
+ int entriesBefore = query(query, MAX_WAIT_SECONDS).size();
PagedResult<UserTO> usersTOs = userService.search(
new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
@@ -77,8 +76,8 @@ public class AuditITCase extends AbstractITCase {
assertNotNull(usersTOs);
assertFalse(usersTOs.getResult().isEmpty());
- entries = query(query, MAX_WAIT_SECONDS);
- assertEquals(1, entries.size());
+ int entriesAfter = query(query, MAX_WAIT_SECONDS).size();
+ assertEquals(entriesBefore, entriesAfter);
}
@Test
@@ -137,8 +136,7 @@ public class AuditITCase extends AbstractITCase {
assertNotNull(groupTO.getKey());
AuditQuery query = new AuditQuery.Builder().entityKey(groupTO.getKey()).build();
- List<AuditEntry> entries = query(query, MAX_WAIT_SECONDS);
- assertEquals(1, entries.size());
+ int entriesBefore = query(query, MAX_WAIT_SECONDS).size();
PagedResult<GroupTO> groups = groupService.search(new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
fiql(SyncopeClient.getGroupSearchConditionBuilder().is("name").equalTo(groupTO.getName()).query()).
@@ -146,8 +144,8 @@ public class AuditITCase extends AbstractITCase {
assertNotNull(groups);
assertFalse(groups.getResult().isEmpty());
- entries = query(query, MAX_WAIT_SECONDS);
- assertEquals(1, entries.size());
+ int entriesAfter = query(query, MAX_WAIT_SECONDS).size();
+ assertEquals(entriesBefore, entriesAfter);
}
@Test
@@ -168,8 +166,7 @@ public class AuditITCase extends AbstractITCase {
assertNotNull(anyObjectTO);
AuditQuery query = new AuditQuery.Builder().entityKey(anyObjectTO.getKey()).build();
- List<AuditEntry> entries = query(query, MAX_WAIT_SECONDS);
- assertEquals(1, entries.size());
+ int entriesBefore = query(query, MAX_WAIT_SECONDS).size();
PagedResult<AnyObjectTO> anyObjects = anyObjectService.search(
new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
@@ -178,8 +175,8 @@ public class AuditITCase extends AbstractITCase {
assertNotNull(anyObjects);
assertFalse(anyObjects.getResult().isEmpty());
- entries = query(query, MAX_WAIT_SECONDS);
- assertEquals(1, entries.size());
+ int entriesAfter = query(query, MAX_WAIT_SECONDS).size();
+ assertEquals(entriesBefore, entriesAfter);
}
@Test
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 65c0496e82..48faca1f85 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
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -642,12 +643,14 @@ public class UserITCase extends AbstractITCase {
@Test
public void verifyTaskRegistration() {
// get task list
- PagedResult<PropagationTaskTO> tasks = taskService.search(
- new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
- assertNotNull(tasks);
- assertFalse(tasks.getResult().isEmpty());
+ List<PropagationTaskTO> tasks = taskService.<PropagationTaskTO>search(
+ new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1000).build()).getResult();
+ assertFalse(tasks.isEmpty());
- String maxKey = tasks.getResult().iterator().next().getKey();
+ String maxKey = tasks.stream().
+ max(Comparator.comparing(PropagationTaskTO::getStart, Comparator.nullsLast(Comparator.naturalOrder()))).
+ map(PropagationTaskTO::getKey).orElse(null);
+ assertNotNull(maxKey);
// --------------------------------------
// Create operation
@@ -663,11 +666,14 @@ public class UserITCase extends AbstractITCase {
assertNotNull(userTO);
// get the new task list
- tasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
- assertNotNull(tasks);
- assertFalse(tasks.getResult().isEmpty());
+ tasks = taskService.<PropagationTaskTO>search(
+ new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1000).build()).getResult();
+ assertFalse(tasks.isEmpty());
- String newMaxKey = tasks.getResult().iterator().next().getKey();
+ String newMaxKey = tasks.stream().
+ max(Comparator.comparing(PropagationTaskTO::getStart, Comparator.nullsLast(Comparator.naturalOrder()))).
+ map(PropagationTaskTO::getKey).orElse(null);
+ assertNotNull(newMaxKey);
// default configuration for ws-target-resource2 during create:
// only failed executions have to be registered
@@ -687,16 +693,18 @@ public class UserITCase extends AbstractITCase {
assertNotNull(userTO);
// get the new task list
- tasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.<PropagationTaskTO>search(
+ new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1000).build()).getResult();
+ assertFalse(tasks.isEmpty());
// default configuration for ws-target-resource2 during update:
// all update executions have to be registered
- newMaxKey = tasks.getResult().iterator().next().getKey();
+ newMaxKey = tasks.stream().
+ max(Comparator.comparing(PropagationTaskTO::getStart, Comparator.nullsLast(Comparator.naturalOrder()))).
+ map(PropagationTaskTO::getKey).orElse(null);
+ assertNotNull(newMaxKey);
- PropagationTaskTO taskTO = taskService.read(TaskType.PROPAGATION, newMaxKey, true);
-
- assertNotNull(taskTO);
- assertEquals(1, taskTO.getExecutions().size());
+ assertNotNull(taskService.read(TaskType.PROPAGATION, newMaxKey, false));
// --------------------------------------
// Delete operation
@@ -704,10 +712,15 @@ public class UserITCase extends AbstractITCase {
userService.delete(userTO.getKey());
// get the new task list
- tasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.<PropagationTaskTO>search(
+ new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1000).build()).getResult();
+ assertFalse(tasks.isEmpty());
maxKey = newMaxKey;
- newMaxKey = tasks.getResult().iterator().next().getKey();
+ newMaxKey = tasks.stream().
+ max(Comparator.comparing(PropagationTaskTO::getStart, Comparator.nullsLast(Comparator.naturalOrder()))).
+ map(PropagationTaskTO::getKey).orElse(null);
+ assertNotNull(newMaxKey);
// default configuration for ws-target-resource2: no delete executions have to be registered
// --> no more tasks/executions should be added