Skip to content

Commit 86256f6

Browse files
committed
Added another test case
1 parent 8843756 commit 86256f6

File tree

1 file changed

+39
-9
lines changed

1 file changed

+39
-9
lines changed

server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
package org.elasticsearch.index.mapper;
1010

1111
import com.carrotsearch.randomizedtesting.generators.RandomStrings;
12-
1312
import org.apache.lucene.analysis.Analyzer;
1413
import org.apache.lucene.analysis.LowerCaseFilter;
1514
import org.apache.lucene.analysis.TokenFilter;
@@ -313,11 +312,11 @@ public void test_isIgnoreAboveSet_returns_true_when_ignore_above_is_given() {
313312
doReturn(indexSettings).when(mappingParserContext).getIndexSettings();
314313
doReturn(mock(ScriptCompiler.class)).when(mappingParserContext).scriptCompiler();
315314

316-
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("child", mappingParserContext);
315+
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("field", mappingParserContext);
317316
builder.ignoreAbove(123);
318317

319318
KeywordFieldMapper.KeywordFieldType fieldType = new KeywordFieldMapper.KeywordFieldType(
320-
"child",
319+
"field",
321320
mock(FieldType.class),
322321
mock(NamedAnalyzer.class),
323322
mock(NamedAnalyzer.class),
@@ -344,10 +343,10 @@ public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_not_given()
344343
doReturn(indexSettings).when(mappingParserContext).getIndexSettings();
345344
doReturn(mock(ScriptCompiler.class)).when(mappingParserContext).scriptCompiler();
346345

347-
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("child", mappingParserContext);
346+
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("field", mappingParserContext);
348347

349348
KeywordFieldMapper.KeywordFieldType fieldType = new KeywordFieldMapper.KeywordFieldType(
350-
"child",
349+
"field",
351350
mock(FieldType.class),
352351
mock(NamedAnalyzer.class),
353352
mock(NamedAnalyzer.class),
@@ -374,11 +373,11 @@ public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_given_but_i
374373
doReturn(indexSettings).when(mappingParserContext).getIndexSettings();
375374
doReturn(mock(ScriptCompiler.class)).when(mappingParserContext).scriptCompiler();
376375

377-
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("child", mappingParserContext);
376+
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("field", mappingParserContext);
378377
builder.ignoreAbove(IGNORE_ABOVE_DEFAULT);
379378

380379
KeywordFieldMapper.KeywordFieldType fieldType = new KeywordFieldMapper.KeywordFieldType(
381-
"child",
380+
"field",
382381
mock(FieldType.class),
383382
mock(NamedAnalyzer.class),
384383
mock(NamedAnalyzer.class),
@@ -405,11 +404,11 @@ public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_given_but_i
405404
doReturn(indexSettings).when(mappingParserContext).getIndexSettings();
406405
doReturn(mock(ScriptCompiler.class)).when(mappingParserContext).scriptCompiler();
407406

408-
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("child", mappingParserContext);
407+
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("field", mappingParserContext);
409408
builder.ignoreAbove(IGNORE_ABOVE_DEFAULT_LOGSDB);
410409

411410
KeywordFieldMapper.KeywordFieldType fieldType = new KeywordFieldMapper.KeywordFieldType(
412-
"child",
411+
"field",
413412
mock(FieldType.class),
414413
mock(NamedAnalyzer.class),
415414
mock(NamedAnalyzer.class),
@@ -422,6 +421,37 @@ public void test_isIgnoreAboveSet_returns_false_when_ignore_above_is_given_but_i
422421
assertFalse(fieldType.isIgnoreAboveSet());
423422
}
424423

424+
public void test_isIgnoreAboveSet_returns_true_when_ignore_above_is_given_as_logsdb_default_but_index_mod_is_not_logsdb() {
425+
// given
426+
Settings settings = Settings.builder()
427+
.put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
428+
.put(IndexSettings.MODE.getKey(), IndexMode.STANDARD)
429+
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
430+
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1)
431+
.build();
432+
IndexSettings indexSettings = new IndexSettings(IndexMetadata.builder("index").settings(settings).build(), settings);
433+
MappingParserContext mappingParserContext = mock(MappingParserContext.class);
434+
doReturn(settings).when(mappingParserContext).getSettings();
435+
doReturn(indexSettings).when(mappingParserContext).getIndexSettings();
436+
doReturn(mock(ScriptCompiler.class)).when(mappingParserContext).scriptCompiler();
437+
438+
KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder("field", mappingParserContext);
439+
builder.ignoreAbove(IGNORE_ABOVE_DEFAULT_LOGSDB);
440+
441+
KeywordFieldMapper.KeywordFieldType fieldType = new KeywordFieldMapper.KeywordFieldType(
442+
"field",
443+
mock(FieldType.class),
444+
mock(NamedAnalyzer.class),
445+
mock(NamedAnalyzer.class),
446+
mock(NamedAnalyzer.class),
447+
builder,
448+
true
449+
);
450+
451+
// when/then
452+
assertTrue(fieldType.isIgnoreAboveSet());
453+
}
454+
425455
public void test_isIgnoreAboveSet_returns_false_for_non_primary_constructor() {
426456
// given
427457
KeywordFieldType fieldType1 = new KeywordFieldType("field");

0 commit comments

Comments
 (0)