From 6eac3ee8ba223265a8412014b08eb638753aa944 Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Mon, 28 Aug 2017 09:11:31 +0200 Subject: [PATCH] Avoid hardcoded error message that depends on the current version in tests. (#26391) It makes it painful to bump the current version. --- .../MetaDataIndexUpgradeServiceTests.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java index 0ed185dfea9..0fa6831fb06 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java @@ -87,22 +87,26 @@ public class MetaDataIndexUpgradeServiceTests extends ESTestCase { MetaDataIndexUpgradeService service = new MetaDataIndexUpgradeService(Settings.EMPTY, xContentRegistry(), new MapperRegistry(Collections.emptyMap(), Collections.emptyMap()), IndexScopedSettings.DEFAULT_SCOPED_SETTINGS, Collections.emptyList()); + Version minCompat = Version.CURRENT.minimumIndexCompatibilityVersion(); + Version indexUpgraded = VersionUtils.randomVersionBetween(random(), minCompat, VersionUtils.getPreviousVersion(Version.CURRENT)); + Version indexCreated = Version.fromString((minCompat.major - 1) + "." + randomInt(5) + "." + randomInt(5)); final IndexMetaData metaData = newIndexMeta("foo", Settings.builder() - .put(IndexMetaData.SETTING_VERSION_UPGRADED, Version.V_5_0_0_beta1) - .put(IndexMetaData.SETTING_VERSION_CREATED, Version.fromString("2.4.0")) + .put(IndexMetaData.SETTING_VERSION_UPGRADED, indexUpgraded) + .put(IndexMetaData.SETTING_VERSION_CREATED, indexCreated) .build()); - // norelease : having a hardcoded version message requires modifying this test when creating new major version. fix this... String message = expectThrows(IllegalStateException.class, () -> service.upgradeIndexMetaData(metaData, Version.CURRENT.minimumIndexCompatibilityVersion())).getMessage(); - assertEquals(message, "The index [[foo/BOOM]] was created with version [2.4.0] " + - "but the minimum compatible version is [6.0.0-beta1]." + - " It should be re-indexed in Elasticsearch 6.x before upgrading to " + Version.CURRENT.toString() + "."); + assertEquals(message, "The index [[foo/BOOM]] was created with version [" + indexCreated + "] " + + "but the minimum compatible version is [" + minCompat + "]." + + " It should be re-indexed in Elasticsearch " + minCompat.major + ".x before upgrading to " + Version.CURRENT.toString() + "."); + indexCreated = VersionUtils.randomVersionBetween(random(), minCompat, Version.CURRENT); + indexUpgraded = VersionUtils.randomVersionBetween(random(), indexCreated, Version.CURRENT); IndexMetaData goodMeta = newIndexMeta("foo", Settings.builder() - .put(IndexMetaData.SETTING_VERSION_UPGRADED, Version.V_5_0_0_beta1) - .put(IndexMetaData.SETTING_VERSION_CREATED, Version.fromString("5.1.0")) + .put(IndexMetaData.SETTING_VERSION_UPGRADED, indexUpgraded) + .put(IndexMetaData.SETTING_VERSION_CREATED, indexCreated) .build()); - service.upgradeIndexMetaData(goodMeta, Version.V_6_0_0_beta1.minimumIndexCompatibilityVersion()); + service.upgradeIndexMetaData(goodMeta, Version.CURRENT.minimumIndexCompatibilityVersion()); } public void testPluginUpgrade() {