diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-06-26 11:47:59 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-06-26 12:25:45 +0200 |
| commit | 7b14a735f1e76c84649469df88e702da39af7cd2 (patch) | |
| tree | 15dddef5eb9239e4a453f1e4dc4c059b7c03194c | |
| parent | 998c7683299ddb6a264e4e8bc180de20144145a1 (diff) | |
| download | sonarqube-7b14a735f1e76c84649469df88e702da39af7cd2.tar.gz sonarqube-7b14a735f1e76c84649469df88e702da39af7cd2.zip | |
Do not override version of scanner in performance tests
The default version of scanner provided by Orchestrator
should be used.
4 files changed, 1 insertions, 6 deletions
diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/SSLTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/SSLTest.java index be2f8804ae5..1526009845f 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/SSLTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/SSLTest.java @@ -154,7 +154,6 @@ public class SSLTest { startSSLTransparentReverseProxy(true); SonarScanner sonarScanner = SonarScanner.create(ItUtils.projectDir("shared/xoo-sample")) - .setScannerVersion("2.7") .setProperty("sonar.host.url", "https://localhost:" + httpsPort); BuildResult buildResult = orchestrator.executeBuildQuietly(sonarScanner); @@ -179,7 +178,6 @@ public class SSLTest { startSSLTransparentReverseProxy(false); SonarScanner sonarScanner = SonarScanner.create(ItUtils.projectDir("shared/xoo-sample")) - .setScannerVersion("2.7") .setProperty("sonar.host.url", "https://localhost:" + httpsPort); BuildResult buildResult = orchestrator.executeBuildQuietly(sonarScanner); diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java index f995244763b..09acfe7070a 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java @@ -86,7 +86,6 @@ public class HighlightingTest extends AbstractPerfTest { } SonarScanner scanner = SonarScanner.create() - .setScannerVersion("2.4") .setProperties( "sonar.projectKey", "highlighting", "sonar.projectName", "highlighting", diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/IssuesModeTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/IssuesModeTest.java index 03f811529e1..56637bb5e0d 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/IssuesModeTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/IssuesModeTest.java @@ -61,8 +61,7 @@ public class IssuesModeTest extends AbstractPerfTest { "-Xmx512m -server", "sonar.analysis.mode", "issues", "sonar.userHome", userHome.getAbsolutePath(), - "sonar.showProfiling", "true") - .setScannerVersion("2.8"); + "sonar.showProfiling", "true"); long start = System.currentTimeMillis(); orchestrator.executeBuild(runner, false); long duration = System.currentTimeMillis() - start; diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java index 2b9b162d72e..877c3a32f09 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java @@ -79,7 +79,6 @@ public class MemoryTest extends AbstractPerfTest { FileUtils.write(new File(baseDir, "sonar-project.properties"), "sonar.myBigProp=" + Strings.repeat("A", 10000), true); SonarScanner scanner = SonarScanner.create() - .setScannerVersion("2.8") .setProperties( "sonar.projectKey", "big-module-tree", "sonar.projectName", "Big Module Tree", |