|
@@ -85,7 +85,7 @@ public class EsqlMediaTypeParserTests extends ESTestCase {
|
|
|
var accept = randomFrom("text/plain", "text/csv", "text/tab-separated-values");
|
|
|
IllegalArgumentException e = expectThrows(
|
|
|
IllegalArgumentException.class,
|
|
|
- () -> getResponseMediaType(reqWithAccept(accept), createTestInstance(false, true))
|
|
|
+ () -> getResponseMediaType(reqWithAccept(accept), createTestInstance(false, true, false))
|
|
|
);
|
|
|
assertEquals(
|
|
|
"Invalid use of [include_ccs_metadata] argument: cannot be used in combination with [txt, csv, tsv] formats",
|
|
@@ -106,7 +106,7 @@ public class EsqlMediaTypeParserTests extends ESTestCase {
|
|
|
RestRequest restRequest = reqWithParams(Map.of("format", randomFrom("txt", "csv", "tsv")));
|
|
|
IllegalArgumentException e = expectThrows(
|
|
|
IllegalArgumentException.class,
|
|
|
- () -> getResponseMediaType(restRequest, createTestInstance(false, true))
|
|
|
+ () -> getResponseMediaType(restRequest, createTestInstance(false, true, false))
|
|
|
);
|
|
|
assertEquals(
|
|
|
"Invalid use of [include_ccs_metadata] argument: cannot be used in combination with [txt, csv, tsv] formats",
|
|
@@ -116,7 +116,24 @@ public class EsqlMediaTypeParserTests extends ESTestCase {
|
|
|
{
|
|
|
// check that no exception is thrown for the XContent types
|
|
|
RestRequest restRequest = reqWithParams(Map.of("format", randomFrom("SMILE", "YAML", "CBOR", "JSON")));
|
|
|
- MediaType responseMediaType = getResponseMediaType(restRequest, createTestInstance(true, true));
|
|
|
+ MediaType responseMediaType = getResponseMediaType(restRequest, createTestInstance(true, true, false));
|
|
|
+ assertNotNull(responseMediaType);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ public void testProfileWithNonJSONMediaTypesInParams() {
|
|
|
+ {
|
|
|
+ RestRequest restRequest = reqWithParams(Map.of("format", randomFrom("txt", "csv", "tsv")));
|
|
|
+ IllegalArgumentException e = expectThrows(
|
|
|
+ IllegalArgumentException.class,
|
|
|
+ () -> getResponseMediaType(restRequest, createTestInstance(false, false, true))
|
|
|
+ );
|
|
|
+ assertEquals("Invalid use of [profile] argument: cannot be used in combination with [txt, csv, tsv] formats", e.getMessage());
|
|
|
+ }
|
|
|
+ {
|
|
|
+ // check that no exception is thrown for the XContent types
|
|
|
+ RestRequest restRequest = reqWithParams(Map.of("format", randomFrom("SMILE", "YAML", "CBOR", "JSON")));
|
|
|
+ MediaType responseMediaType = getResponseMediaType(restRequest, createTestInstance(true, false, true));
|
|
|
assertNotNull(responseMediaType);
|
|
|
}
|
|
|
}
|
|
@@ -157,9 +174,10 @@ public class EsqlMediaTypeParserTests extends ESTestCase {
|
|
|
return request;
|
|
|
}
|
|
|
|
|
|
- protected EsqlQueryRequest createTestInstance(boolean columnar, boolean includeCCSMetadata) {
|
|
|
+ protected EsqlQueryRequest createTestInstance(boolean columnar, boolean includeCCSMetadata, boolean profile) {
|
|
|
var request = createTestInstance(columnar);
|
|
|
request.includeCCSMetadata(includeCCSMetadata);
|
|
|
+ request.profile(profile);
|
|
|
return request;
|
|
|
}
|
|
|
}
|