You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bd...@apache.org on 2023/12/16 06:24:59 UTC

(directory-scimple) 02/03: Fix merge conflicts

This is an automated email from the ASF dual-hosted git repository.

bdemers pushed a commit to branch handle-azure-group-member-removes
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git

commit 8f91a6c957882045abca0a23f2bf203bfe02fadc
Author: Brian Demers <bd...@apache.org>
AuthorDate: Sat Dec 16 01:18:58 2023 -0500

    Fix merge conflicts
    
    - ResourceReference split renamed to GroupMembership/UserGroup (they have slightly different use cases)
    - Add ScimGroup to SchemaRegistry in PatchHandlerTest
---
 .../scim/core/repository/PatchHandlerTest.java     | 23 +++++++++++++++-------
 .../scim/test/assertj/ScimGroupAssert.java         | 15 +++++++++++---
 .../scim/test/assertj/ScimpleAssertions.java       |  5 +++++
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java b/scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java
index a145b8cc..2df84326 100644
--- a/scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java
+++ b/scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java
@@ -29,15 +29,16 @@ import org.apache.directory.scim.spec.patch.PatchOperationPath;
 import org.apache.directory.scim.spec.phonenumber.PhoneNumberParseException;
 import org.apache.directory.scim.spec.resources.Address;
 import org.apache.directory.scim.spec.resources.Email;
+import org.apache.directory.scim.spec.resources.GroupMembership;
 import org.apache.directory.scim.spec.resources.Name;
 import org.apache.directory.scim.spec.resources.PhoneNumber;
 import org.apache.directory.scim.spec.resources.ScimGroup;
 import org.apache.directory.scim.spec.resources.ScimUser;
-import org.apache.directory.scim.spec.schema.ResourceReference;
 import org.junit.jupiter.api.Test;
 
 import static org.apache.directory.scim.spec.patch.PatchOperation.Type.*;
 import static java.util.Map.entry;
+import static org.apache.directory.scim.test.assertj.ScimpleAssertions.scimAssertThat;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
@@ -51,6 +52,7 @@ public class PatchHandlerTest {
   public PatchHandlerTest() {
     SchemaRegistry schemaRegistry = new SchemaRegistry();
     schemaRegistry.addSchema(ScimUser.class, List.of(EnterpriseExtension.class));
+    schemaRegistry.addSchema(ScimGroup.class, null);
     this.patchHandler = new DefaultPatchHandler(schemaRegistry);
   }
 
@@ -479,8 +481,15 @@ public class PatchHandlerTest {
         "type", "User")
     ));
 
+    GroupMembership member1 = userRef("1234");
+    GroupMembership member2 = userRef("5678");
+    GroupMembership member3 = new GroupMembership()
+      .setValue("9876")
+      .setDisplay("testUser2")
+      .setType(GroupMembership.Type.USER);
+
     ScimGroup updatedGroup = patchHandler.apply(group(), List.of(op));
-    assertThat(updatedGroup.getMembers().size()).isEqualTo(3);
+    scimAssertThat(updatedGroup).containsOnlyMembers(member1, member2, member3);
   }
 
   /**
@@ -666,8 +675,8 @@ public class PatchHandlerTest {
   }
 
   private static ScimGroup group() {
-    ResourceReference member1 = userRef("1234");
-    ResourceReference member2 = userRef("5678");
+    GroupMembership member1 = userRef("1234");
+    GroupMembership member2 = userRef("5678");
 
     return new ScimGroup()
       .setDisplayName("Test Group")
@@ -675,9 +684,9 @@ public class PatchHandlerTest {
       .setMembers(List.of(member1, member2));
   }
 
-  private static ResourceReference userRef(String id) {
-    ResourceReference member = new ResourceReference();
-    member.setType(ResourceReference.ReferenceType.USER);
+  private static GroupMembership userRef(String id) {
+    GroupMembership member = new GroupMembership();
+    member.setType(GroupMembership.Type.USER);
     member.setValue(id);
     member.setRef("https://example.com/Users/" + id);
     member.setDisplay("Test User" + id);
diff --git a/scim-test/src/main/java/org/apache/directory/scim/test/assertj/ScimGroupAssert.java b/scim-test/src/main/java/org/apache/directory/scim/test/assertj/ScimGroupAssert.java
index 0772d0ec..9a02463c 100644
--- a/scim-test/src/main/java/org/apache/directory/scim/test/assertj/ScimGroupAssert.java
+++ b/scim-test/src/main/java/org/apache/directory/scim/test/assertj/ScimGroupAssert.java
@@ -27,8 +27,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class ScimGroupAssert extends AbstractAssert<ScimGroupAssert, ScimGroup> {
 
-  protected ScimGroupAssert(ScimGroup scimGroup, Class<?> selfType) {
-    super(scimGroup, selfType);
+  protected ScimGroupAssert(ScimGroup scimGroup) {
+    super(scimGroup, ScimGroupAssert.class);
   }
 
   public ScimGroupAssert membersHasSize(int expected) {
@@ -38,13 +38,22 @@ public class ScimGroupAssert extends AbstractAssert<ScimGroupAssert, ScimGroup>
     return this;
   }
 
-  public ScimGroupAssert containsMember(GroupMembership... expected) {
+  public ScimGroupAssert containsMembers(GroupMembership... expected) {
     isNotNull();
     assertMembersNotNull();
     assertThat(actual.getMembers()).contains(expected);
     return this;
   }
 
+  @SafeVarargs
+  public final ScimGroupAssert containsOnlyMembers(GroupMembership... groupMemberships) {
+    isNotNull();
+    assertThat(actual.getMembers())
+      .as("ScimGroup.members")
+      .containsOnly(groupMemberships);
+    return this;
+  }
+
   private void assertMembersNotNull() {
     assertThat(actual.getMembers()).isNotNull();
   }
diff --git a/scim-test/src/main/java/org/apache/directory/scim/test/assertj/ScimpleAssertions.java b/scim-test/src/main/java/org/apache/directory/scim/test/assertj/ScimpleAssertions.java
index f11373a2..7acadd2f 100644
--- a/scim-test/src/main/java/org/apache/directory/scim/test/assertj/ScimpleAssertions.java
+++ b/scim-test/src/main/java/org/apache/directory/scim/test/assertj/ScimpleAssertions.java
@@ -20,6 +20,7 @@
 package org.apache.directory.scim.test.assertj;
 
 import org.apache.directory.scim.spec.patch.PatchOperation;
+import org.apache.directory.scim.spec.resources.ScimGroup;
 import org.assertj.core.api.Condition;
 
 public final class ScimpleAssertions {
@@ -32,6 +33,10 @@ public final class ScimpleAssertions {
     return new PatchOperationAssert(actual);
   }
 
+  public static ScimGroupAssert scimAssertThat(ScimGroup actual) {
+    return new ScimGroupAssert(actual);
+  }
+
   public static Condition<PatchOperation> patchOpMatching(PatchOperation.Type type, String path) {
     return patchOpMatching(type, path, null);
   }