Test cases where the upgraded version is before the created version too

DaveCTurner · DaveCTurner · commit 4c0ee9a5066f · 2019-07-12T12:50:04.000+01:00
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java
@@ -160,18 +160,14 @@ private MetaDataIndexUpgradeService getMetaDataIndexUpgradeService() {
             Collections.emptyList());
     }
 
-    public IndexMetaData newIndexMeta(String name, Settings indexSettings) {
-        final Version createdVersion = VersionUtils.randomVersionBetween(random(),
-            Version.CURRENT.minimumIndexCompatibilityVersion(), VersionUtils.getPreviousVersion());
-        final Version upgradedVersion = VersionUtils.randomVersionBetween(random(), createdVersion, VersionUtils.getPreviousVersion());
-
+    public static IndexMetaData newIndexMeta(String name, Settings indexSettings) {
         final Settings settings = Settings.builder()
-            .put(IndexMetaData.SETTING_VERSION_CREATED, createdVersion)
+            .put(IndexMetaData.SETTING_VERSION_CREATED, randomEarlierCompatibleVersion())
             .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, between(0, 5))
             .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, between(1, 5))
             .put(IndexMetaData.SETTING_CREATION_DATE, randomNonNegativeLong())
             .put(IndexMetaData.SETTING_INDEX_UUID, UUIDs.randomBase64UUID(random()))
-            .put(IndexMetaData.SETTING_VERSION_UPGRADED, upgradedVersion)
+            .put(IndexMetaData.SETTING_VERSION_UPGRADED, randomEarlierCompatibleVersion())
             .put(indexSettings)
             .build();
         final IndexMetaData.Builder indexMetaDataBuilder = IndexMetaData.builder(name).settings(settings);
@@ -181,4 +177,9 @@ public IndexMetaData newIndexMeta(String name, Settings indexSettings) {
         return indexMetaDataBuilder.build();
     }
 
+    private static Version randomEarlierCompatibleVersion() {
+        return VersionUtils.randomVersionBetween(random(),
+            Version.CURRENT.minimumIndexCompatibilityVersion(), VersionUtils.getPreviousVersion());
+    }
+
 }
