aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalConfigurationProviderTest.java
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2018-12-13 12:25:44 +0100
committersonartech <sonartech@sonarsource.com>2019-01-16 09:43:10 +0100
commitf4261e1605ab8f8d346c152ccc7e913ec4e48daf (patch)
treed24ff74509e8c424414937f236306fa0077c82d7 /sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalConfigurationProviderTest.java
parent0e834f9196d911f66a487f36fd5fde41164b8b21 (diff)
downloadsonarqube-f4261e1605ab8f8d346c152ccc7e913ec4e48daf.tar.gz
sonarqube-f4261e1605ab8f8d346c152ccc7e913ec4e48daf.zip
SONAR-11480 SONAR-11508 Consider server side settings when evaluating module level exclusions
Diffstat (limited to 'sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalConfigurationProviderTest.java')
-rw-r--r--sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalConfigurationProviderTest.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalConfigurationProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalConfigurationProviderTest.java
index 0799d8b049e..f81093cc676 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalConfigurationProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalConfigurationProviderTest.java
@@ -43,20 +43,18 @@ public class GlobalConfigurationProviderTest {
GlobalServerSettings globalServerSettings;
ScannerProperties scannerProps;
- private GlobalAnalysisMode mode;
@Before
public void prepare() {
globalServerSettings = mock(GlobalServerSettings.class);
scannerProps = new ScannerProperties(Collections.<String, String>emptyMap());
- mode = mock(GlobalAnalysisMode.class);
}
@Test
public void should_load_global_settings() {
when(globalServerSettings.properties()).thenReturn(ImmutableMap.of("sonar.cpd.cross", "true"));
- GlobalConfiguration globalConfig = new GlobalConfigurationProvider().provide(globalServerSettings, scannerProps, new PropertyDefinitions(), mode);
+ GlobalConfiguration globalConfig = new GlobalConfigurationProvider().provide(globalServerSettings, scannerProps, new PropertyDefinitions());
assertThat(globalConfig.get("sonar.cpd.cross")).hasValue("true");
}