diff options
| author | Guillaume Le Floch <glfloch@gmail.com> | 2017-06-20 15:17:52 +0200 |
|---|---|---|
| committer | Christoph Büscher <christoph@elastic.co> | 2017-06-20 15:17:52 +0200 |
| commit | 93e29d290f8e14b06966af92f1bcbedd4d15475c (patch) | |
| tree | 4d53c8f19bfbca1598d74392d4bca1347143a47b /core/src/test/java/org/elasticsearch/node/NodeTests.java | |
| parent | 62d19695956692a95d2777f87de01b191da30a56 (diff) | |
Tests: Refactor NodeTests settings (#25309)
This pull request aims to use the method baseSettings already present in the class.
Diffstat (limited to 'core/src/test/java/org/elasticsearch/node/NodeTests.java')
| -rw-r--r-- | core/src/test/java/org/elasticsearch/node/NodeTests.java | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/core/src/test/java/org/elasticsearch/node/NodeTests.java b/core/src/test/java/org/elasticsearch/node/NodeTests.java index e99c7b9063..26835370c6 100644 --- a/core/src/test/java/org/elasticsearch/node/NodeTests.java +++ b/core/src/test/java/org/elasticsearch/node/NodeTests.java @@ -57,14 +57,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; public class NodeTests extends ESTestCase { public void testNodeName() throws IOException { - final Path tempDir = createTempDir(); final String name = randomBoolean() ? randomAlphaOfLength(10) : null; - Settings.Builder settings = Settings.builder() - .put(ClusterName.CLUSTER_NAME_SETTING.getKey(), InternalTestCluster.clusterName("single-node-cluster", randomLong())) - .put(Environment.PATH_HOME_SETTING.getKey(), tempDir) - .put(NetworkModule.HTTP_ENABLED.getKey(), false) - .put("transport.type", "mock-socket-network") - .put(Node.NODE_DATA_SETTING.getKey(), true); + Settings.Builder settings = baseSettings(); if (name != null) { settings.put(Node.NODE_NAME_SETTING.getKey(), name); } @@ -97,14 +91,8 @@ public class NodeTests extends ESTestCase { } public void testLoadPluginBootstrapChecks() throws IOException { - final Path tempDir = createTempDir(); final String name = randomBoolean() ? randomAlphaOfLength(10) : null; - Settings.Builder settings = Settings.builder() - .put(ClusterName.CLUSTER_NAME_SETTING.getKey(), InternalTestCluster.clusterName("single-node-cluster", randomLong())) - .put(Environment.PATH_HOME_SETTING.getKey(), tempDir) - .put(NetworkModule.HTTP_ENABLED.getKey(), false) - .put("transport.type", "mock-socket-network") - .put(Node.NODE_DATA_SETTING.getKey(), true); + Settings.Builder settings = baseSettings(); if (name != null) { settings.put(Node.NODE_NAME_SETTING.getKey(), name); } @@ -247,7 +235,7 @@ public class NodeTests extends ESTestCase { .put(ClusterName.CLUSTER_NAME_SETTING.getKey(), InternalTestCluster.clusterName("single-node-cluster", randomLong())) .put(Environment.PATH_HOME_SETTING.getKey(), tempDir) .put(NetworkModule.HTTP_ENABLED.getKey(), false) - .put("transport.type", "mock-socket-network") + .put(NetworkModule.TRANSPORT_TYPE_KEY, "mock-socket-network") .put(Node.NODE_DATA_SETTING.getKey(), true); } |