Skip to content

Commit ae1c019

Browse files
committed
Tests: index.version.created must be set
Due to this [change](#8018), we need to fix our tests for elasticsearch 1.4.0 and above. Closes #33.
1 parent a8a2e83 commit ae1c019

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

src/test/java/org/elasticsearch/index/analysis/PolishAnalysisTests.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121

2222
import org.apache.lucene.analysis.Analyzer;
2323
import org.apache.lucene.analysis.pl.PolishAnalyzer;
24+
import org.elasticsearch.Version;
25+
import org.elasticsearch.cluster.metadata.IndexMetaData;
2426
import org.elasticsearch.common.inject.Injector;
2527
import org.elasticsearch.common.inject.ModulesBuilder;
28+
import org.elasticsearch.common.settings.Settings;
2629
import org.elasticsearch.common.settings.SettingsModule;
2730
import org.elasticsearch.env.Environment;
2831
import org.elasticsearch.env.EnvironmentModule;
@@ -38,6 +41,7 @@
3841
import org.junit.Test;
3942

4043
import static org.elasticsearch.common.settings.ImmutableSettings.Builder.EMPTY_SETTINGS;
44+
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
4145
import static org.hamcrest.Matchers.instanceOf;
4246

4347
/**
@@ -47,10 +51,13 @@ public class PolishAnalysisTests extends ElasticsearchTestCase {
4751
@Test
4852
public void testDefaultsPolishAnalysis() {
4953
Index index = new Index("test");
54+
Settings settings = settingsBuilder()
55+
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
56+
.build();
5057

5158
Injector parentInjector = new ModulesBuilder().add(new SettingsModule(EMPTY_SETTINGS), new EnvironmentModule(new Environment(EMPTY_SETTINGS)), new IndicesAnalysisModule()).createInjector();
5259
Injector injector = new ModulesBuilder().add(
53-
new IndexSettingsModule(index, EMPTY_SETTINGS),
60+
new IndexSettingsModule(index, settings),
5461
new IndexNameModule(index),
5562
new AnalysisModule(EMPTY_SETTINGS, parentInjector.getInstance(IndicesAnalysisService.class)).addProcessor(new PolishAnalysisBinderProcessor()))
5663
.createChildInjector(parentInjector);

src/test/java/org/elasticsearch/index/analysis/SimplePolishTokenFilterTests.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.apache.lucene.analysis.TokenStream;
2424
import org.apache.lucene.analysis.core.KeywordTokenizer;
2525
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
26+
import org.elasticsearch.Version;
27+
import org.elasticsearch.cluster.metadata.IndexMetaData;
2628
import org.elasticsearch.common.inject.Injector;
2729
import org.elasticsearch.common.inject.ModulesBuilder;
2830
import org.elasticsearch.common.settings.ImmutableSettings;
@@ -59,6 +61,7 @@ public void testBasicUsage() throws Exception {
5961
private void testToken(String source, String expected) throws IOException {
6062
Index index = new Index("test");
6163
Settings settings = ImmutableSettings.settingsBuilder()
64+
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
6265
.put("index.analysis.filter.myStemmer.type", "polish_stem")
6366
.build();
6467
AnalysisService analysisService = createAnalysisService(index, settings);
@@ -76,7 +79,9 @@ private void testToken(String source, String expected) throws IOException {
7679

7780
private void testAnalyzer(String source, String... expected_terms) throws IOException {
7881
Index index = new Index("test");
79-
Settings settings = ImmutableSettings.settingsBuilder().build();
82+
Settings settings = ImmutableSettings.settingsBuilder()
83+
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
84+
.build();
8085
AnalysisService analysisService = createAnalysisService(index, settings);
8186

8287
Analyzer analyzer = analysisService.analyzer("polish").analyzer();

0 commit comments

Comments
 (0)