From 50bdcb2e4bc3fa9e096eb15fb89b6f5853208365 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Fri, 11 Jul 2014 09:40:02 +0200 Subject: [PATCH] SONAR-5410 - Added assertions to tests --- .../src/main/java/org/sonar/search/ElasticSearch.java | 5 ++++- .../test/java/org/sonar/search/ElasticSearchTest.java | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java index 4e00436ed35..d8ad63a6201 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java +++ b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java @@ -66,6 +66,9 @@ public class ElasticSearch extends org.sonar.process.Process { ESLoggerFactory.setDefaultFactory(new Slf4jESLoggerFactory()); ImmutableSettings.Builder esSettings = ImmutableSettings.settingsBuilder() + + .put("discovery.zen.ping.multicast.enable", "false") + .put("index.merge.policy.max_merge_at_once", "200") .put("index.merge.policy.segments_per_tier", "200") .put("index.number_of_shards", "1") @@ -86,10 +89,10 @@ public class ElasticSearch extends org.sonar.process.Process { // // .put("network.bind_host", "127.0.0.1") .put("http.enabled", false) +// .put("http.port", 9200) // .put("http.host", "127.0.0.1") .put("transport.tcp.port", port) -// .put("http.port", 9200); .put("path.home", home); diff --git a/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java b/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java index ece2083ae38..901c7f38671 100644 --- a/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java +++ b/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java @@ -35,6 +35,7 @@ import java.io.File; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; +import java.net.ServerSocket; import java.net.SocketException; import java.util.Properties; @@ -62,7 +63,11 @@ public class ElasticSearchTest { } @Test - public void missing_properties() { + public void missing_properties() throws IOException { + + ServerSocket socket = new ServerSocket(0); + Integer port = socket.getLocalPort(); + socket.close(); Properties properties = new Properties(); properties.setProperty(Process.NAME_PROPERTY, "ES"); @@ -80,6 +85,9 @@ public class ElasticSearchTest { } catch (Exception e) { assertThat(e.getMessage()).isEqualTo(ElasticSearch.MISSING_ES_PORT); } + + properties.setProperty(ElasticSearch.ES_PORT_PROPERTY, Integer.toString(port)); + assertThat(new ElasticSearch(Props.create(properties))).isNotNull(); } @Test -- 2.39.5