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

Fix test to pass in a dummy cluster state when readying the ConfigManager. 

Original commit: elastic/x-pack-elasticsearch@e085844f9f
This commit is contained in:
Brian Murphy 2014-12-05 11:17:18 +00:00
parent 1f49c9199d
commit d4f8bf0d2c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/elasticsearch/alerts/ConfigTest.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.alerts; package org.elasticsearch.alerts;
import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -39,8 +40,8 @@ public class ConfigTest extends ElasticsearchIntegrationTest {
.build(); .build();
ConfigurationManager configurationManager = new ConfigurationManager(oldSettings, client()); ConfigurationManager configurationManager = new ConfigurationManager(oldSettings, client());
ClusterState clusterState = internalCluster().clusterService().state();
boolean isReady = configurationManager.isReady(clusterState); boolean isReady = configurationManager.isReady(ClusterState.builder(new ClusterName("foobar")).build());
assertTrue(isReady); //Should always be ready on a clean start assertTrue(isReady); //Should always be ready on a clean start
SettingsListener settingsListener = new SettingsListener(); SettingsListener settingsListener = new SettingsListener();
@ -57,7 +58,6 @@ public class ConfigTest extends ElasticsearchIntegrationTest {
assertThat(settingsListener.settings.getAsTime("foo", new TimeValue(0)).getMillis(), equalTo(tv2.getMillis())); assertThat(settingsListener.settings.getAsTime("foo", new TimeValue(0)).getMillis(), equalTo(tv2.getMillis()));
assertThat(settingsListener.settings.getAsInt("bar", 0), equalTo(100)); assertThat(settingsListener.settings.getAsInt("bar", 0), equalTo(100));
assertThat(settingsListener.settings.getAsBoolean("baz", true), equalTo(false)); assertThat(settingsListener.settings.getAsBoolean("baz", true), equalTo(false));
} }
public void testLoadingSettings() throws Exception { public void testLoadingSettings() throws Exception {
@ -85,7 +85,7 @@ public class ConfigTest extends ElasticsearchIntegrationTest {
.get(); .get();
assertTrue(indexResponse.isCreated()); assertTrue(indexResponse.isCreated());
ConfigurationManager configurationManager = new ConfigurationManager(oldSettings, client()); ConfigurationManager configurationManager = new ConfigurationManager(oldSettings, client());
assertTrue(configurationManager.isReady(internalCluster().clusterService().state())); assertTrue(configurationManager.isReady(ClusterState.builder(new ClusterName("foobar")).build()));
Settings loadedSettings = configurationManager.getGlobalConfig(); Settings loadedSettings = configurationManager.getGlobalConfig();
assertThat(loadedSettings.get("foo"), equalTo(newSettings.get("foo"))); assertThat(loadedSettings.get("foo"), equalTo(newSettings.get("foo")));
assertThat(loadedSettings.get("bar"), equalTo(newSettings.get("bar"))); assertThat(loadedSettings.get("bar"), equalTo(newSettings.get("bar")));