From 463202f5cda5822917c9393cfc7cfbb2994be3ad Mon Sep 17 00:00:00 2001
From: Adrian Hoelzl <adrian.hoelzl@sap.com>
Date: Wed, 10 Apr 2024 16:48:25 +0200
Subject: [PATCH] Add method 'entitiesAreEqual' to later on support equality
 checks for ScimUsers

---
 .../alias/EntityAliasHandlerEnsureConsistencyTest.java   | 9 ++++++++-
 ...dentityProviderAliasHandlerEnsureConsistencyTest.java | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandlerEnsureConsistencyTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandlerEnsureConsistencyTest.java
index 890da5889e5..d181a77d9e4 100644
--- a/server/src/test/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandlerEnsureConsistencyTest.java
+++ b/server/src/test/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/server/src/test/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandlerEnsureConsistencyTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandlerEnsureConsistencyTest.java
index d47901438ec..9a0f6691a4c 100644
--- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandlerEnsureConsistencyTest.java
+++ b/server/src/test/java/org/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);
+    }
 }