Skip to content

Commit aa3eadd

Browse files
committed
Fix tests for updated User XContent requirements
Signed-off-by: Daniel Widdis <[email protected]>
1 parent 1ef7546 commit aa3eadd

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,16 @@ public void testAddUserRoleFilterWithNullUser() {
121121

122122
public void testAddUserRoleFilterWithNullUserBackendRole() {
123123
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
124-
ParseUtils.addUserBackendRolesFilter(
125-
new User(randomAlphaOfLength(5), null, ImmutableList.of(randomAlphaOfLength(5)), ImmutableList.of(randomAlphaOfLength(5))),
126-
searchSourceBuilder
127-
);
124+
ParseUtils
125+
.addUserBackendRolesFilter(
126+
new User(
127+
randomAlphaOfLength(5),
128+
null,
129+
ImmutableList.of(randomAlphaOfLength(5)),
130+
ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
131+
),
132+
searchSourceBuilder
133+
);
128134
assertEquals(
129135
"{\"query\":{\"bool\":{\"must\":[{\"nested\":{\"query\":{\"terms\":{\"user.backend_roles.keyword\":[],"
130136
+ "\"boost\":1.0}},\"path\":\"user\",\"ignore_unmapped\":false,\"score_mode\":\"none\",\"boost\":1.0}}],"
@@ -140,7 +146,7 @@ public void testAddUserRoleFilterWithEmptyUserBackendRole() {
140146
randomAlphaOfLength(5),
141147
ImmutableList.of(),
142148
ImmutableList.of(randomAlphaOfLength(5)),
143-
ImmutableList.of(randomAlphaOfLength(5))
149+
ImmutableList.of(String.join("=",randomAlphaOfLength(5),randomAlphaOfLength(5)))
144150
),
145151
searchSourceBuilder
146152
);
@@ -161,7 +167,7 @@ public void testAddUserRoleFilterWithUserBackendRole() {
161167
randomAlphaOfLength(5),
162168
ImmutableList.of(backendRole1, backendRole2),
163169
ImmutableList.of(randomAlphaOfLength(5)),
164-
ImmutableList.of(randomAlphaOfLength(5))
170+
ImmutableList.of(String.join("=",randomAlphaOfLength(5),randomAlphaOfLength(5)))
165171
),
166172
searchSourceBuilder
167173
);
@@ -420,7 +426,7 @@ public void testIsAdmin() {
420426
randomAlphaOfLength(5),
421427
ImmutableList.of(),
422428
ImmutableList.of("all_access"),
423-
ImmutableList.of(randomAlphaOfLength(5))
429+
ImmutableList.of(String.join("=",randomAlphaOfLength(5),randomAlphaOfLength(5)))
424430
);
425431
assertTrue(isAdmin(user1));
426432
}
@@ -431,7 +437,7 @@ public void testIsAdminBackendRoleIsAllAccess() {
431437
randomAlphaOfLength(5),
432438
ImmutableList.of(backendRole1),
433439
ImmutableList.of(randomAlphaOfLength(5)),
434-
ImmutableList.of(randomAlphaOfLength(5))
440+
ImmutableList.of(String.join("=",randomAlphaOfLength(5),randomAlphaOfLength(5)))
435441
);
436442
assertFalse(isAdmin(user1));
437443
}

0 commit comments

Comments
 (0)