From f8f323715fcebdf357c4a8e807c3ce0a63275a6a Mon Sep 17 00:00:00 2001 From: sitara-a Date: Tue, 15 Oct 2024 14:26:52 -0500 Subject: [PATCH 1/2] Fix flaky test testAssignmentFromOther in UserRoleTest.java --- .../com/intuit/wasabi/authorizationobjects/UserRole.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/authorization-objects/src/main/java/com/intuit/wasabi/authorizationobjects/UserRole.java b/modules/authorization-objects/src/main/java/com/intuit/wasabi/authorizationobjects/UserRole.java index dc2e52251..13f888fdb 100644 --- a/modules/authorization-objects/src/main/java/com/intuit/wasabi/authorizationobjects/UserRole.java +++ b/modules/authorization-objects/src/main/java/com/intuit/wasabi/authorizationobjects/UserRole.java @@ -147,7 +147,13 @@ public String toString() { @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + return new HashCodeBuilder().append(this.getApplicationName()) + .append(this.getRole()) + .append(this.getUserID()) + .append(this.getUserEmail()) + .append(this.getFirstName()) + .append(this.getLastName()) + .toHashCode(); } @Override From 519f77a2c4f7626458e06ee8b7c885f1f2a39cb5 Mon Sep 17 00:00:00 2001 From: sitara-a Date: Tue, 15 Oct 2024 14:38:09 -0500 Subject: [PATCH 2/2] Fix flaky test testHashCodeAndEquals in LoginCredetialsTest.java --- .../wasabi/authenticationobjects/LoginCredentials.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/authentication-objects/src/main/java/com/intuit/wasabi/authenticationobjects/LoginCredentials.java b/modules/authentication-objects/src/main/java/com/intuit/wasabi/authenticationobjects/LoginCredentials.java index a304fe34d..06fd05f86 100644 --- a/modules/authentication-objects/src/main/java/com/intuit/wasabi/authenticationobjects/LoginCredentials.java +++ b/modules/authentication-objects/src/main/java/com/intuit/wasabi/authenticationobjects/LoginCredentials.java @@ -90,7 +90,10 @@ public LoginCredentials build() { @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + return new HashCodeBuilder().append(this.getUsername()) + .append(this.getPassword()) + .append(this.getNamespaceId()) + .toHashCode(); } @Override