Add method 'entitiesAreEqual' to later on support equality checks for…

… ScimUsers
cloudfoundry · Apr 10, 2024 · 463202f · 463202f
1 parent b4fb274
commit 463202f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...est/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandlerEnsureConsistencyTest.java b/...est/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandlerEnsureConsistencyTest.java
@@ -9,6 +9,7 @@
 import java.util.UUID;
 
 import org.cloudfoundry.identity.uaa.EntityWithAlias;
+import org.cloudfoundry.identity.uaa.scim.ScimUser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatcher;
@@ -43,6 +44,12 @@ public abstract class EntityAliasHandlerEnsureConsistencyTest<T extends EntityWi
 
     protected abstract void arrangeEntityDoesNotExist(final String id, final String zoneId);
 
+    /**
+     * Check whether the given two entities are equal. This method is required since the {@link ScimUser} class does not
+     * implement an {@code equals} method that is precise enough.
+     */
+    protected abstract boolean entitiesAreEqual(final T entity1, final T entity2);
+
     protected final String customZoneId = UUID.randomUUID().toString();
 
     private abstract class Base {
@@ -65,7 +72,7 @@ final void shouldIgnore_AliasZidEmptyInOriginalEntity() {
             changeNonAliasProperties(existingEntity);
 
             final T result = aliasHandler.ensureConsistencyOfAliasEntity(originalEntity, existingEntity);
-            assertThat(result).isEqualTo(originalEntity);
+            assertThat(entitiesAreEqual(result, originalEntity)).isTrue();
         }
     }
 

diff --git a/...cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandlerEnsureConsistencyTest.java b/...cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandlerEnsureConsistencyTest.java
@@ -9,6 +9,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.Objects;
 import java.util.UUID;
 
 import org.cloudfoundry.identity.uaa.alias.EntityAliasHandler;
@@ -206,4 +207,9 @@ protected void arrangeEntityExists(final String id, final String zoneId, final I
     protected void arrangeEntityDoesNotExist(final String id, final String zoneId) {
         when(identityProviderProvisioning.retrieve(id, zoneId)).thenReturn(null);
     }
+
+    @Override
+    protected boolean entitiesAreEqual(final IdentityProvider<?> entity1, final IdentityProvider<?> entity2) {
+        return Objects.equals(entity1, entity2);
+    }
 }