From 6265fb70adf04c4f9a40f1f5321dea032e116653 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Wed, 23 Oct 2024 13:51:39 -0400 Subject: [PATCH] ESQL: Fix test muting Fix the test muting on the test for grapheme clusters - it should only allow the test if we're on the 20+ jvm. Closes #114536 --- muted-tests.yml | 3 --- .../org/elasticsearch/xpack/esql/action/EsqlCapabilities.java | 2 +- .../src/test/java/org/elasticsearch/xpack/esql/CsvTests.java | 4 ++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 2b3e7bbfe1663..dd4ce0677c02e 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -375,9 +375,6 @@ tests: - class: org.elasticsearch.xpack.enrich.EnrichIT method: testEnrichSpecialTypes issue: https://github.com/elastic/elasticsearch/issues/114773 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {string.ReverseGraphemeClusters} - issue: https://github.com/elastic/elasticsearch/issues/114560 - class: org.elasticsearch.license.LicensingTests issue: https://github.com/elastic/elasticsearch/issues/114865 - class: org.elasticsearch.xpack.enrich.EnrichIT diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java index 63e9718e53e5f..ce9040e8451c8 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java @@ -36,7 +36,7 @@ public enum Cap { * Support for reversing whole grapheme clusters. This is not supported * on JDK versions less than 20. */ - FN_REVERSE_GRAPHEME_CLUSTERS(Runtime.version().feature() < 20), + FN_REVERSE_GRAPHEME_CLUSTERS(Runtime.version().feature() >= 20), /** * Support for function {@code CBRT}. Done in #108574. diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java index 63233f0c46a0d..20864a7ee8268 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java @@ -259,6 +259,10 @@ public final void test() throws Throwable { testCase.requiredCapabilities, everyItem(in(EsqlCapabilities.capabilities(true))) ); + assumeTrue( + "Capability is not included in the enabled list capabilities on a snapshot build. Spelling mistake?", + EsqlCapabilities.capabilities(false).containsAll(testCase.requiredCapabilities) + ); } else { for (EsqlCapabilities.Cap c : EsqlCapabilities.Cap.values()) { if (false == c.isEnabled()) {