From bdb5e8478940e424c38ef5e7045860fa5887ad98 Mon Sep 17 00:00:00 2001
From: Daniel Widdis <widdis@gmail.com>
Date: Fri, 26 Sep 2025 12:53:16 -0700
Subject: [PATCH] Fix tests for updated User XContent requirements

Signed-off-by: Daniel Widdis <widdis@gmail.com>
---
 build.gradle                                      |  1 -
 .../flowframework/util/ParseUtilsTests.java       | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index c1f59e04b..5c0535dae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -264,7 +264,6 @@ dependencies {
             // Some other plugin dependencies that don't use version catalog conflict here
             force("com.google.guava:guava:${versions.guava}")
             force("org.slf4j:slf4j-api:${versions.slf4j}")
-            force("com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}")
 
             if (System.getenv('REMOTE_METADATA_SDK_IMPL') == 'ddb-client') {
                 // OpenSearch Java client brings in different versions of the below dependencies.
diff --git a/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java b/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java
index fb65ab2c0..6e63dfb97 100644
--- a/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java
+++ b/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java
@@ -122,7 +122,12 @@ public void testAddUserRoleFilterWithNullUser() {
     public void testAddUserRoleFilterWithNullUserBackendRole() {
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         ParseUtils.addUserBackendRolesFilter(
-            new User(randomAlphaOfLength(5), null, ImmutableList.of(randomAlphaOfLength(5)), ImmutableList.of(randomAlphaOfLength(5))),
+            new User(
+                randomAlphaOfLength(5),
+                null,
+                ImmutableList.of(randomAlphaOfLength(5)),
+                ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
+            ),
             searchSourceBuilder
         );
         assertEquals(
@@ -140,7 +145,7 @@ public void testAddUserRoleFilterWithEmptyUserBackendRole() {
                 randomAlphaOfLength(5),
                 ImmutableList.of(),
                 ImmutableList.of(randomAlphaOfLength(5)),
-                ImmutableList.of(randomAlphaOfLength(5))
+                ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
             ),
             searchSourceBuilder
         );
@@ -161,7 +166,7 @@ public void testAddUserRoleFilterWithUserBackendRole() {
                 randomAlphaOfLength(5),
                 ImmutableList.of(backendRole1, backendRole2),
                 ImmutableList.of(randomAlphaOfLength(5)),
-                ImmutableList.of(randomAlphaOfLength(5))
+                ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
             ),
             searchSourceBuilder
         );
@@ -420,7 +425,7 @@ public void testIsAdmin() {
             randomAlphaOfLength(5),
             ImmutableList.of(),
             ImmutableList.of("all_access"),
-            ImmutableList.of(randomAlphaOfLength(5))
+            ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
         );
         assertTrue(isAdmin(user1));
     }
@@ -431,7 +436,7 @@ public void testIsAdminBackendRoleIsAllAccess() {
             randomAlphaOfLength(5),
             ImmutableList.of(backendRole1),
             ImmutableList.of(randomAlphaOfLength(5)),
-            ImmutableList.of(randomAlphaOfLength(5))
+            ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
         );
         assertFalse(isAdmin(user1));
     }