Skip to content

Commit d838315

Browse files
committed
Fix tests
1 parent c81a73a commit d838315

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -978,15 +978,9 @@ public void testPatternTextNotAllowedByLicense() throws IOException {
978978
"{\"properties\":{\"foo\":{\"type\":\"pattern_text\"}}}",
979979
"{\"properties\":{\"bar\":{\"properties\":{\"baz\":{\"type\":\"pattern_text\"}}}}}" };
980980

981-
var expectedSettings = Settings.builder()
982-
.put(IndexSettings.LOGSDB_ADD_HOST_NAME_FIELD.getKey(), true)
983-
.put(IndexSettings.LOGSDB_SORT_ON_HOST_NAME.getKey(), true)
984-
.put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true)
985-
.build();
986-
987981
for (String mapping : patternTextLicenceCheckedFieldMappings) {
988982
var result = generateLogsdbSettings(Settings.EMPTY, getMapping(mapping), Version.CURRENT, basicLogsdbLicenseService);
989-
assertEquals(expectedSettings, result);
983+
assertTrue(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.get(result));
990984
}
991985
}
992986

@@ -1006,10 +1000,12 @@ public void testSortAndHostNamePropagateValue() throws Exception {
10061000
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB)
10071001
.put(IndexSettings.LOGSDB_SORT_ON_HOST_NAME.getKey(), true)
10081002
.put(IndexSettings.LOGSDB_ADD_HOST_NAME_FIELD.getKey(), true)
1003+
.put(IndexSettings.LOGSDB_SORT_ON_MESSAGE_TEMPLATE.getKey(), true)
10091004
.build();
10101005
Settings result = generateLogsdbSettings(settings);
10111006
assertTrue(IndexSettings.LOGSDB_SORT_ON_HOST_NAME.get(result));
10121007
assertTrue(IndexSettings.LOGSDB_ADD_HOST_NAME_FIELD.get(result));
1008+
assertTrue(IndexSettings.LOGSDB_SORT_ON_MESSAGE_TEMPLATE.get(result));
10131009
assertEquals(0, newMapperServiceCounter.get());
10141010
}
10151011

0 commit comments

Comments
 (0)