This is an automated email from the ASF dual-hosted git repository.
angela pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 41ba9eb566 OAK-10169 : improve output of test-assertions
41ba9eb566 is described below
commit 41ba9eb5660ed11aa5ff4f2219d63b845673f4ad
Author: angela <anch...@adobe.com>
AuthorDate: Thu Mar 30 15:10:40 2023 +0200
OAK-10169 : improve output of test-assertions
---
.../security/authentication/external/impl/DynamicGroupsTest.java | 8 ++++----
.../authentication/external/impl/DynamicSyncContextTest.java | 4 +++-
.../security/authentication/external/impl/DynamicSyncTest.java | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicGroupsTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicGroupsTest.java
index 28975e3254..445c99b3f7 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicGroupsTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicGroupsTest.java
@@ -302,11 +302,11 @@ public class DynamicGroupsTest extends
DynamicSyncContextTest {
String groupId2 = declaredGroupRefs.get(1).getId();
Group local = um.createGroup("localGroup");
local.addMembers(groupId, groupId2);
- userManager.createGroup(EveryonePrincipal.getInstance());
+ um.createGroup(EveryonePrincipal.getInstance());
r.commit();
- Authorizable a = getUserManager(r).getAuthorizable(PREVIOUS_SYNCED_ID);
- assertFalse(Iterators.contains(a.memberOf(), local));
+ Authorizable a = um.getAuthorizable(PREVIOUS_SYNCED_ID);
+ assertTrue(getIds(a.memberOf()).contains(local.getID()));
// sync again to establish dynamic membership
syncContext.setForceUserSync(true);
@@ -322,7 +322,7 @@ public class DynamicGroupsTest extends
DynamicSyncContextTest {
assertFalse(groupIds.contains("localGroup"));
assertFalse(local.isMember(a));
} else {
- assertEquals((membershipNestingDepth > 1) ? 5 : 4,
groupIds.size());
+ assertEquals("Found "+groupIds, (membershipNestingDepth > 1) ? 5 :
4, groupIds.size());
assertTrue(groupIds.contains("localGroup"));
assertTrue(local.isMember(a));
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java
index dcd69d6ee9..712fc8eaca 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java
@@ -49,6 +49,7 @@ import org.junit.Test;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import java.util.HashSet;
+import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
@@ -159,7 +160,8 @@ public class DynamicSyncContextTest extends
AbstractDynamicTest {
Group gr = userManager.getAuthorizable(ref.getId(), Group.class);
assertNotNull(gr);
assertTrue(gr.isMember(a));
- assertTrue(Iterators.contains(a.memberOf(), gr));
+ List<String> ids = getIds(a.memberOf());
+ assertTrue("Expected "+ids+ " to contain "+gr.getID(),
ids.contains(gr.getID()));
if (Iterables.contains(declaredGroupRefs, ref)) {
assertTrue(gr.isDeclaredMember(a));
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncTest.java
index 1f83bfad5d..61a67c8ebc 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncTest.java
@@ -230,8 +230,8 @@ public class DynamicSyncTest extends AbstractDynamicTest {
private static void assertExpectedIds(@NotNull Set<String> expectedIds,
@NotNull Iterator<? extends Authorizable>... iterators) {
for (Iterator<? extends Authorizable> it : iterators) {
List<String> ids = getIds(it);
- assertEquals(expectedIds.size(), ids.size());
- assertTrue(ids.containsAll(expectedIds));
+ assertEquals("Expected "+expectedIds+" found "+ids,
expectedIds.size(), ids.size());
+ assertTrue("Expected "+expectedIds+" found "+ids,
ids.containsAll(expectedIds));
}
}
}
\ No newline at end of file
