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 2022/02/09 15:18:14 UTC
[syncope] 02/02: Upgrading slf4j
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 75b892482fb58828ffcd146209ba3c2b2373f9b3
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Feb 9 16:10:26 2022 +0100
Upgrading slf4j
---
.../java/org/apache/syncope/fit/core/UserSelfITCase.java | 12 ++++++++++--
pom.xml | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
index 687d281..6f3ed90 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.fit.core;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -31,6 +32,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import javax.ws.rs.ForbiddenException;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
@@ -347,8 +349,14 @@ public class UserSelfITCase extends AbstractITCase {
// ignore
}
}
- PagedResult<UserTO> tokenized = userService.search(new AnyQuery.Builder().fiql("token!=$null").build());
- assertTrue(tokenized.getResult().stream().anyMatch(u -> user.getUsername().equals(u.getUsername())));
+ await().atMost(MAX_WAIT_SECONDS, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until(() -> {
+ try {
+ PagedResult<UserTO> tokenized = userService.search(new AnyQuery.Builder().fiql("token!=$null").build());
+ return tokenized.getResult().stream().anyMatch(u -> user.getUsername().equals(u.getUsername()));
+ } catch (Exception e) {
+ return false;
+ }
+ });
// 4. get token (normally sent via e-mail, now reading as admin)
String token = userService.read(read.getKey()).getToken();
diff --git a/pom.xml b/pom.xml
index c0d85f1..8fb5996 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,7 +428,7 @@ under the License.
<camel.version>3.15.0</camel.version>
- <slf4j.version>1.7.35</slf4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
<elasticsearch.version>7.17.0</elasticsearch.version>