fix SearchServerTest

diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
index 7c59e0e5d373ed3899fa49987e608c75fbf8dcd3..960ce34b272876d74f19521b576218b253adf2c9 100644 (file)
--- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
@@ -46,10 +46,10 @@ public class SearchServer extends MonitoredProcess {
   public static final String ES_CLUSTER_PROPERTY = "sonar.cluster.name";
   public static final String ES_CLUSTER_INET = "sonar.cluster.master";
 
-  private static final String SONAR_PATH_HOME = "sonar.path.home";
-  private static final String SONAR_PATH_DATA = "sonar.path.data";
-  private static final String SONAR_PATH_TEMP = "sonar.path.temp";
-  private static final String SONAR_PATH_LOG = "sonar.path.log";
+  public static final String SONAR_PATH_HOME = "sonar.path.home";
+  public static final String SONAR_PATH_DATA = "sonar.path.data";
+  public static final String SONAR_PATH_TEMP = "sonar.path.temp";
+  public static final String SONAR_PATH_LOG = "sonar.path.log";
 
   private static final Integer MINIMUM_INDEX_REPLICATION = 1;
 

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 b0660b85e33b65d3fbde5e249bd9880372f55c47..e430aa4f97f54d671c67b0d6ea92bc7d4f73cbb8 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
@@ -111,9 +111,9 @@ public class SearchServerTest {
   public void can_connect() throws Exception {
     Properties properties = new Properties();
     properties.setProperty(MonitoredProcess.NAME_PROPERTY, "ES");
-    properties.setProperty("sonar.path.data", temp.newFolder().getAbsolutePath());
-    properties.setProperty("sonar.path.logs", temp.newFolder().getAbsolutePath());
-    properties.setProperty("sonar.path.temp", temp.newFolder().getAbsolutePath());
+    properties.setProperty(SearchServer.SONAR_PATH_DATA, temp.newFolder().getAbsolutePath());
+    properties.setProperty(SearchServer.SONAR_PATH_TEMP, temp.newFolder().getAbsolutePath());
+    properties.setProperty(SearchServer.SONAR_PATH_LOG, temp.newFolder().getAbsolutePath());
     properties.setProperty(SearchServer.ES_PORT_PROPERTY, Integer.toString(freeESPort));
     properties.setProperty(SearchServer.ES_CLUSTER_PROPERTY, "sonarqube");