SQSCANNER-7 SQSCANNER-6 Deprecate sonar-runner and SONAR_RUNNER_OPTS

And replace by sonar-scanner and SONAR_SCANNER_OPTS

2 files changed, 8 insertions, 8 deletions

diff --git a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
index c792504..db9b6c5 100644
--- a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
@@ -52,7 +52,7 @@ public class ConfTest {
   @Test
   public void should_load_global_settings_by_home() throws Exception {
     Path home = Paths.get(getClass().getResource("ConfTest/shouldLoadRunnerSettingsByHome/").toURI());
-    args.setProperty("runner.home", home.toAbsolutePath().toString());
+    args.setProperty("scanner.home", home.toAbsolutePath().toString());
 
     Properties properties = conf.properties();
     assertThat(properties.get("sonar.prop")).isEqualTo("value");
@@ -81,7 +81,7 @@ public class ConfTest {
   @Test
   public void should_load_conf_by_direct_path() throws Exception {
     Path settings = Paths.get(getClass().getResource("ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties").toURI());
-    args.setProperty("runner.settings", settings.toAbsolutePath().toString());
+    args.setProperty("scanner.settings", settings.toAbsolutePath().toString());
 
     assertThat(conf.properties().get("sonar.prop")).isEqualTo("otherValue");
   }
@@ -90,7 +90,7 @@ public class ConfTest {
   public void shouldLoadCompleteConfiguration() throws Exception {
     Path runnerHome = Paths.get(getClass().getResource("ConfTest/shouldLoadCompleteConfiguration/runner").toURI());
     Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadCompleteConfiguration/project").toURI());
-    args.setProperty("runner.home", runnerHome.toAbsolutePath().toString());
+    args.setProperty("scanner.home", runnerHome.toAbsolutePath().toString());
     args.setProperty("project.home", projectHome.toAbsolutePath().toString());
 
     Properties properties = conf.properties();
@@ -143,7 +143,7 @@ public class ConfTest {
     assertThat(properties.getProperty("module3.sonar.projectName")).isEqualTo("Module 3");
     assertThat(properties.getProperty("sonar.projectBaseDir")).isEqualTo(projectHome.toString());
   }
-  
+
   @Test
   public void shouldCliOverrideSettingFiles() throws Exception {
     Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfigurationOverrideBasedir/project").toURI());
@@ -159,7 +159,7 @@ public class ConfTest {
     assertThat(properties.getProperty("module3.sonar.projectName")).isEqualTo("mod3");
     assertThat(properties.getProperty("sonar.projectBaseDir")).isEqualTo(projectHome.toString());
   }
-  
+
   @Test
   public void shouldUseCliToDiscoverModules() throws Exception {
     Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfigurationOverrideBasedir/project").toURI());
diff --git a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
index 0c1fa8f..0786c83 100644
--- a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
@@ -76,19 +76,19 @@ public class SystemInfoTest {
   public void should_print() {
     mockOs();
     mockJava();
-    when(mockSystem.getenv("SONAR_RUNNER_OPTS")).thenReturn("arg");
+    when(mockSystem.getenv("SONAR_SCANNER_OPTS")).thenReturn("arg");
 
     SystemInfo.print(logs);
 
     verify(mockSystem).getProperty("java.version");
     verify(mockSystem).getProperty("os.version");
-    verify(mockSystem).getenv("SONAR_RUNNER_OPTS");
+    verify(mockSystem).getenv("SONAR_SCANNER_OPTS");
 
     verify(logs, never()).info("SonarQube Scanner null");
     verify(logs).info("SonarQube Scanner " + ScannerVersion.version());
     verify(logs).info("Java 1.9 oracle (64-bit)");
     verify(logs).info("linux 2.5 x64");
-    verify(logs).info("SONAR_RUNNER_OPTS=arg");
+    verify(logs).info("SONAR_SCANNER_OPTS=arg");
     verifyNoMoreInteractions(logs);
   }
 }