1 files changed, 12 insertions, 15 deletions
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalSettingsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalSettingsTest.java
index b4613a837b3..a3b68bacf73 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalSettingsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalSettingsTest.java
@@ -19,8 +19,8 @@
  */
 package org.sonar.scanner.bootstrap;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.Collections;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -28,13 +28,11 @@ import org.junit.rules.ExpectedException;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.scanner.bootstrap.GlobalMode;
-import org.sonar.scanner.bootstrap.GlobalProperties;
-import org.sonar.scanner.bootstrap.GlobalSettings;
-import org.sonar.scanner.protocol.input.GlobalRepositories;
+import org.sonar.scanner.repository.settings.SettingsLoader;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class GlobalSettingsTest {
 
@@ -44,39 +42,38 @@ public class GlobalSettingsTest {
   @Rule
   public LogTester logTester = new LogTester();
 
-  GlobalRepositories globalRef;
+  SettingsLoader settingsLoader;
   GlobalProperties bootstrapProps;
 
   private GlobalMode mode;
 
   @Before
   public void prepare() {
-    globalRef = new GlobalRepositories();
+    settingsLoader = mock(SettingsLoader.class);
     bootstrapProps = new GlobalProperties(Collections.<String, String>emptyMap());
     mode = mock(GlobalMode.class);
   }
 
   @Test
   public void should_load_global_settings() {
-    globalRef.globalSettings().put("sonar.cpd.cross", "true");
+    when(settingsLoader.load(null)).thenReturn(ImmutableMap.of("sonar.cpd.cross", "true"));
 
-    GlobalSettings batchSettings = new GlobalSettings(bootstrapProps, new PropertyDefinitions(), globalRef, mode);
+    GlobalSettings batchSettings = new GlobalSettings(bootstrapProps, new PropertyDefinitions(), settingsLoader, mode);
 
     assertThat(batchSettings.getBoolean("sonar.cpd.cross")).isTrue();
   }
 
   @Test
   public void should_log_warn_msg_for_each_jdbc_property_if_present() {
-    globalRef.globalSettings().put("sonar.jdbc.url", SOME_VALUE);
-    globalRef.globalSettings().put("sonar.jdbc.username", SOME_VALUE);
-    globalRef.globalSettings().put("sonar.jdbc.password", SOME_VALUE);
+    when(settingsLoader.load(null)).thenReturn(ImmutableMap.of("sonar.jdbc.url", SOME_VALUE,
+      "sonar.jdbc.username", SOME_VALUE,
+      "sonar.jdbc.password", SOME_VALUE));
 
-    new GlobalSettings(bootstrapProps, new PropertyDefinitions(), globalRef, mode);
+    new GlobalSettings(bootstrapProps, new PropertyDefinitions(), settingsLoader, mode);
 
     assertThat(logTester.logs(LoggerLevel.WARN)).containsOnly(
       "Property 'sonar.jdbc.url' is not supported any more. It will be ignored. There is no longer any DB connection to the SQ database.",
       "Property 'sonar.jdbc.username' is not supported any more. It will be ignored. There is no longer any DB connection to the SQ database.",
-      "Property 'sonar.jdbc.password' is not supported any more. It will be ignored. There is no longer any DB connection to the SQ database."
-      );
+      "Property 'sonar.jdbc.password' is not supported any more. It will be ignored. There is no longer any DB connection to the SQ database.");
   }
 }