From fe6e3b5ae96132e1f5620e213c0b840224d334c4 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Fri, 7 Feb 2025 12:08:15 +0100 Subject: [PATCH 1/3] Add test to ensure backports from 9.1 are done correctly --- .../java/org/elasticsearch/TransportVersionTests.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index 9b02b66583e78..0ad83dfcdbf6b 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/server/src/test/java/org/elasticsearch/TransportVersionTests.java @@ -27,6 +27,14 @@ public class TransportVersionTests extends ESTestCase { + /** + * This test is specific for V9, to ensure that transport versions are backported correctly. + */ + public void testMaximumAllowedTransportVersion() { + assertThat(TransportVersions.LATEST_DEFINED.onOrBefore(TransportVersions.ELASTICSEARCH_9_0) || + TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ELASTICSEARCH_9_0), is(true)); + } + public void testVersionComparison() { TransportVersion V_8_2_0 = TransportVersions.V_8_2_0; TransportVersion V_8_16_0 = TransportVersions.V_8_16_0; From e4c726f63928e4691be3dd9a511c9727b2c38ce2 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Fri, 7 Feb 2025 11:17:42 +0000 Subject: [PATCH 2/3] [CI] Auto commit changes from spotless --- .../test/java/org/elasticsearch/TransportVersionTests.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index 0ad83dfcdbf6b..5f9ea3a0853bc 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/server/src/test/java/org/elasticsearch/TransportVersionTests.java @@ -31,8 +31,11 @@ public class TransportVersionTests extends ESTestCase { * This test is specific for V9, to ensure that transport versions are backported correctly. */ public void testMaximumAllowedTransportVersion() { - assertThat(TransportVersions.LATEST_DEFINED.onOrBefore(TransportVersions.ELASTICSEARCH_9_0) || - TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ELASTICSEARCH_9_0), is(true)); + assertThat( + TransportVersions.LATEST_DEFINED.onOrBefore(TransportVersions.ELASTICSEARCH_9_0) + || TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ELASTICSEARCH_9_0), + is(true) + ); } public void testVersionComparison() { From 5fee47cabbef68306faf28a365225784ff68f1a3 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Tue, 11 Feb 2025 09:18:59 +0100 Subject: [PATCH 3/3] Simplify assertion --- .../test/java/org/elasticsearch/TransportVersionTests.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index 5f9ea3a0853bc..5b07fc50b13ba 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/server/src/test/java/org/elasticsearch/TransportVersionTests.java @@ -31,11 +31,7 @@ public class TransportVersionTests extends ESTestCase { * This test is specific for V9, to ensure that transport versions are backported correctly. */ public void testMaximumAllowedTransportVersion() { - assertThat( - TransportVersions.LATEST_DEFINED.onOrBefore(TransportVersions.ELASTICSEARCH_9_0) - || TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ELASTICSEARCH_9_0), - is(true) - ); + assertThat(TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ELASTICSEARCH_9_0), is(true)); } public void testVersionComparison() {