Improve SearchServerTest to prepare upgrade to ES 1.4

diff --git a/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java b/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java
index f2be9704667eb99cfe5cd5f2ecf6f4207637546d..8a9823eccc6ffb30b6701c152a6852442cdfeb63 100644 (file)
--- a/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java
+++ b/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java
@@ -40,6 +40,7 @@ import org.sonar.process.Props;
 import java.util.Properties;
 
 import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.Fail.fail;
 
 public class SearchServerTest {
 
@@ -84,9 +85,10 @@ public class SearchServerTest {
     searchServer.awaitStop();
     searchServer = null;
     try {
-      assertThat(client.admin().cluster().prepareClusterStats().get().getStatus()).isNotEqualTo(ClusterHealthStatus.GREEN);
+      client.admin().cluster().prepareClusterStats().get();
+      fail();
     } catch (NoNodeAvailableException exception) {
-      assertThat(exception.getMessage()).isEqualTo("No node available");
+      // ok
     }
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java b/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java
index 1af8a7b0f3767da8a57e5a48d326a7dc7b349469..2508fd64191f7a4a2b5706392a3fa7595d39a38c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java
@@ -48,8 +48,6 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.metrics.max.Max;
 import org.picocontainer.Startable;
 import org.sonar.core.profiling.Profiling;
-import org.sonar.server.search.ClusterHealth;
-import org.sonar.server.search.SearchClient;
 import org.sonar.server.es.request.ProxyBulkRequestBuilder;
 import org.sonar.server.es.request.ProxyClusterHealthRequestBuilder;
 import org.sonar.server.es.request.ProxyClusterStateRequestBuilder;
@@ -69,6 +67,8 @@ import org.sonar.server.es.request.ProxyPutMappingRequestBuilder;
 import org.sonar.server.es.request.ProxyRefreshRequestBuilder;
 import org.sonar.server.es.request.ProxySearchRequestBuilder;
 import org.sonar.server.es.request.ProxySearchScrollRequestBuilder;
+import org.sonar.server.search.ClusterHealth;
+import org.sonar.server.search.SearchClient;
 
 /**
  * Facade to connect to Elasticsearch node. Handles correctly errors (logging + exceptions