From 48162fa90b4c4aefd434ad8f818260b866ee9d5a Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Thu, 8 Oct 2015 16:13:48 +0200 Subject: [PATCH] remove another redundant test --- .../index/engine/InternalEngine.java | 1 - .../MetaDataIndexUpgradeServiceTests.java | 59 ------------------- 2 files changed, 60 deletions(-) delete mode 100644 core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index 245ee7a0a23..eadf65057e1 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -67,7 +67,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Function; -import java.util.function.Supplier; /** * diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java deleted file mode 100644 index 88f27bcf609..00000000000 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.elasticsearch.cluster.metadata; - -import com.carrotsearch.randomizedtesting.generators.RandomPicks; -import org.elasticsearch.Version; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.store.IndexStoreModule; -import org.elasticsearch.test.ESTestCase; - -import java.util.Arrays; -import java.util.Locale; - -public class MetaDataIndexUpgradeServiceTests extends ESTestCase { - - public void testUpgradeStoreSettings() { - final String type = RandomPicks.randomFrom(random(), Arrays.asList("nio_fs", "mmap_fs", "simple_fs", "default", "fs")); - MetaDataIndexUpgradeService metaDataIndexUpgradeService = new MetaDataIndexUpgradeService(Settings.EMPTY, null); - Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexStoreModule.STORE_TYPE, randomBoolean() ? type : type.toUpperCase(Locale.ROOT)) - .build(); - IndexMetaData test = IndexMetaData.builder("test") - .settings(indexSettings) - .numberOfShards(1) - .numberOfReplicas(1) - .build(); - IndexMetaData indexMetaData = metaDataIndexUpgradeService.upgradeSettings(test); - assertEquals(type.replace("_", ""), indexMetaData.getSettings().get(IndexStoreModule.STORE_TYPE)); - } - - public void testNoStoreSetting() { - Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) - .build(); - IndexMetaData test = IndexMetaData.builder("test") - .settings(indexSettings) - .numberOfShards(1) - .numberOfReplicas(1) - .build(); - MetaDataIndexUpgradeService metaDataIndexUpgradeService = new MetaDataIndexUpgradeService(Settings.EMPTY, null); - IndexMetaData indexMetaData = metaDataIndexUpgradeService.upgradeSettings(test); - assertSame(indexMetaData, test); - } -}