Fix tests asserting error message

albertzaharovits · Jun 10, 2024 · f7fd4e8 · f7fd4e8
1 parent 6eebc4b
commit f7fd4e8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...security/src/main/java/org/elasticsearch/xpack/security/support/FieldNameTranslators.java b/...security/src/main/java/org/elasticsearch/xpack/security/support/FieldNameTranslators.java
@@ -253,7 +253,7 @@ public void translateFieldSortBuilders(
         final Consumer<String> fieldNameVisitor = visitor != null ? visitor : ignored -> {};
         fieldSortBuilders.forEach(fieldSortBuilder -> {
             if (fieldSortBuilder.getNestedSort() != null) {
-                throw new IllegalArgumentException("nested sorting is not supported for querying");
+                throw new IllegalArgumentException("nested sorting is not currently supported in this context");
             }
             if (FieldSortBuilder.DOC_FIELD_NAME.equals(fieldSortBuilder.getFieldName())) {
                 searchSourceBuilder.sort(fieldSortBuilder);

diff --git a/.../java/org/elasticsearch/xpack/security/action/apikey/TransportQueryApiKeyActionTests.java b/.../java/org/elasticsearch/xpack/security/action/apikey/TransportQueryApiKeyActionTests.java
@@ -102,7 +102,7 @@ public void testNestedSortingIsNotAllowed() {
                 ignored -> {}
             )
         );
-        assertThat(e.getMessage(), equalTo("nested sorting is not supported for API Key query"));
+        assertThat(e.getMessage(), equalTo("nested sorting is not currently supported in this context"));
     }
 
     private FieldSortBuilder randomFieldSortBuilderWithName(String name) {

diff --git a/...y/src/test/java/org/elasticsearch/xpack/security/support/ApiKeyBoolQueryBuilderTests.java b/...y/src/test/java/org/elasticsearch/xpack/security/support/ApiKeyBoolQueryBuilderTests.java
@@ -678,7 +678,7 @@ public void testTermsLookupIsNotAllowed() {
             IllegalArgumentException.class,
             () -> ApiKeyBoolQueryBuilder.build(q1, ignored -> {}, authentication)
         );
-        assertThat(e1.getMessage(), containsString("terms query with terms lookup is not supported for API Key query"));
+        assertThat(e1.getMessage(), containsString("terms query with terms lookup is not currently supported in this context"));
     }
 
     public void testRangeQueryWithRelationIsNotAllowed() {
@@ -688,7 +688,7 @@ public void testRangeQueryWithRelationIsNotAllowed() {
             IllegalArgumentException.class,
             () -> ApiKeyBoolQueryBuilder.build(q1, ignored -> {}, authentication)
         );
-        assertThat(e1.getMessage(), containsString("range query with relation is not supported for API Key query"));
+        assertThat(e1.getMessage(), containsString("range query with relation is not currently supported in this context"));
     }
 
     public void testDisallowedQueryTypes() {
@@ -734,7 +734,7 @@ public void testDisallowedQueryTypes() {
             IllegalArgumentException.class,
             () -> ApiKeyBoolQueryBuilder.build(q1, ignored -> {}, authentication)
         );
-        assertThat(e1.getMessage(), containsString("Query type [" + q1.getName() + "] is not supported for API Key query"));
+        assertThat(e1.getMessage(), containsString("Query type [" + q1.getName() + "] is not currently supported in this context"));
 
         // also wrapped in a boolean query
         {
@@ -756,7 +756,7 @@ public void testDisallowedQueryTypes() {
                 IllegalArgumentException.class,
                 () -> ApiKeyBoolQueryBuilder.build(q2, ignored -> {}, authentication)
             );
-            assertThat(e2.getMessage(), containsString("Query type [" + q1.getName() + "] is not supported for API Key query"));
+            assertThat(e2.getMessage(), containsString("Query type [" + q1.getName() + "] is not currently supported in this context"));
         }
     }