honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use expectThrows in YamlSettingsLoaderTests 

This commit refactors the unit tests in YamlSettingsLoaderTests to use
exceptThrows for simplification.
This commit is contained in:
Jason Tedor 2016-03-23 21:50:01 -04:00
parent 84a308db80
commit ad5438a6a9
1 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
core/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java
View File

@ -49,46 +49,34 @@ public class YamlSettingsLoaderTests extends ESTestCase {
}
public void testIndentation() {
String yaml = "/org/elasticsearch/common/settings/loader/indentation-settings.yml";
try {
settingsBuilder()
.loadFromStream(yaml, getClass().getResourceAsStream(yaml))
.build();
fail("Expected SettingsException");
} catch(SettingsException e ) {
assertThat(e.getMessage(), containsString("Failed to load settings"));
}
final String yaml = "/org/elasticsearch/common/settings/loader/indentation-settings.yml";
final SettingsException e =
expectThrows(
SettingsException.class,
() -> settingsBuilder().loadFromStream(yaml, getClass().getResourceAsStream(yaml)).build());
assertThat(e.getMessage(), containsString("Failed to load settings"));
}
public void testIndentationWithExplicitDocumentStart() {
String yaml = "/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml";
try {
settingsBuilder()
.loadFromStream(yaml, getClass().getResourceAsStream(yaml))
.build();
fail("Expected SettingsException");
} catch (SettingsException e) {
assertThat(e.getMessage(), containsString("Failed to load settings"));
}
final String yaml = "/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml";
final SettingsException e =
expectThrows(
SettingsException.class,
() -> settingsBuilder().loadFromStream(yaml, getClass().getResourceAsStream(yaml)).build());
assertThat(e.getMessage(), containsString("Failed to load settings"));
}
public void testDuplicateKeysThrowsException() {
String yaml = "foo: bar\nfoo: baz";
try {
settingsBuilder()
.loadFromSource(yaml)
.build();
fail("expected exception");
} catch (SettingsException e) {
assertEquals(e.getCause().getClass(), ElasticsearchParseException.class);
assertThat(
e.toString(),
containsString("duplicate settings key [foo] " +
"found at line number [2], " +
"column number [6], " +
"previous value [bar], " +
"current value [baz]"));
}
final String yaml = "foo: bar\nfoo: baz";
final SettingsException e = expectThrows(SettingsException.class, () -> settingsBuilder().loadFromSource(yaml).build());
assertEquals(e.getCause().getClass(), ElasticsearchParseException.class);
assertThat(
e.toString(),
containsString("duplicate settings key [foo] " +
"found at line number [2], " +
"column number [6], " +
"previous value [bar], " +
"current value [baz]"));
}
public void testNullValuedSettingThrowsException() {