Drop unsupported property sonar.dynamicAnalysis from tests

5 files changed, 15 insertions, 36 deletions

diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/ExtensionLifecycleTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ExtensionLifecycleTest.java
index e5fa14d9819..de8ffa8bb43 100644
--- a/tests/src/test/java/org/sonarqube/tests/analysis/ExtensionLifecycleTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/ExtensionLifecycleTest.java
@@ -41,8 +41,7 @@ public class ExtensionLifecycleTest {
   public void testInstantiationStrategyAndLifecycleOfBatchExtensions() {
     MavenBuild build = MavenBuild.create(ItUtils.projectPom("analysis/extension-lifecycle"))
       .setCleanSonarGoals()
-      .setProperty("extension.lifecycle", "true")
-      .setProperty("sonar.dynamicAnalysis", "false");
+      .setProperty("extension.lifecycle", "true");
 
     // Build fails if the extensions provided in the extension-lifecycle-plugin are not correctly
     // managed.
diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java
index a787f07322f..ef0241dc778 100644
--- a/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java
@@ -80,9 +80,7 @@ public class FileExclusionsTest {
    */
   @Test
   public void include_source_files() {
-    scan(
-      "sonar.dynamicAnalysis", "false",
-      "sonar.inclusions", "**/*One.xoo,**/*Two.xoo");
+    scan("sonar.inclusions", "**/*One.xoo,**/*Two.xoo");
 
     assertThat(getMeasuresAsDouble("files").get("files")).isEqualTo(2);
 
diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/ProjectBuilderTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ProjectBuilderTest.java
index d409a2231b8..cf5d9fc1e37 100644
--- a/tests/src/test/java/org/sonarqube/tests/analysis/ProjectBuilderTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/ProjectBuilderTest.java
@@ -48,8 +48,7 @@ public class ProjectBuilderTest {
   public void shouldDefineProjectFromPlugin() {
     MavenBuild build = MavenBuild.create(ItUtils.projectPom("analysis/project-builder"))
       .setCleanSonarGoals()
-      .setProperty("sonar.enableProjectBuilder", "true")
-      .setProperty("sonar.dynamicAnalysis", "false");
+      .setProperty("sonar.enableProjectBuilder", "true");
     orchestrator.executeBuild(build);
 
     checkProject();
diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssuePurgeTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssuePurgeTest.java
index eb006535ae1..0df918db002 100644
--- a/tests/src/test/java/org/sonarqube/tests/issue/IssuePurgeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssuePurgeTest.java
@@ -40,7 +40,7 @@ public class IssuePurgeTest extends AbstractIssueTest {
   private ProjectAnalysis xooMultiModuleAnalysis;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     String manyRulesProfile = projectAnalysisRule.registerProfile("/issue/IssuePurgeTest/with-many-rules.xml");
     String xooSampleProjectKey = projectAnalysisRule.registerProject("shared/xoo-sample");
     this.xooSampleAnalysis = projectAnalysisRule.newProjectAnalysis(xooSampleProjectKey)
@@ -54,13 +54,11 @@ public class IssuePurgeTest extends AbstractIssueTest {
    * SONAR-4308
    */
   @Test
-  public void purge_old_closed_issues() throws Exception {
+  public void purge_old_closed_issues() {
     projectAnalysisRule.setServerProperty("sonar.dbcleaner.daysBeforeDeletingClosedIssues", "5000");
 
     // Generate some issues
-    xooSampleAnalysis.withProperties(
-      "sonar.dynamicAnalysis", "false",
-      "sonar.projectDate", "2014-10-01")
+    xooSampleAnalysis.withProperties("sonar.projectDate", "2014-10-01")
       .run();
 
     // All the issues are open
@@ -73,9 +71,7 @@ public class IssuePurgeTest extends AbstractIssueTest {
     // -> Not deleted because less than 5000 days long
     xooSampleAnalysis
       .withXooEmptyProfile()
-      .withProperties(
-        "sonar.dynamicAnalysis", "false",
-        "sonar.projectDate", "2014-10-15")
+      .withProperties("sonar.projectDate", "2014-10-15")
       .run();
     issuesList = searchIssues();
     assertThat(issuesList).isNotEmpty();
@@ -88,9 +84,7 @@ public class IssuePurgeTest extends AbstractIssueTest {
     projectAnalysisRule.setServerProperty("sonar.dbcleaner.daysBeforeDeletingClosedIssues", "1");
 
     xooSampleAnalysis.withXooEmptyProfile()
-      .withProperties(
-        "sonar.dynamicAnalysis", "false",
-        "sonar.projectDate", "2014-10-20")
+      .withProperties("sonar.projectDate", "2014-10-20")
       .run();
     Issues issues = issueClient().find(IssueQuery.create());
     assertThat(issues.list()).isEmpty();
@@ -101,13 +95,11 @@ public class IssuePurgeTest extends AbstractIssueTest {
    * SONAR-7108
    */
   @Test
-  public void purge_old_closed_issues_when_zero_closed_issues_wanted() throws Exception {
+  public void purge_old_closed_issues_when_zero_closed_issues_wanted() {
     projectAnalysisRule.setServerProperty("sonar.dbcleaner.daysBeforeDeletingClosedIssues", "5000");
 
     // Generate some issues
-    xooSampleAnalysis.withProperties(
-      "sonar.dynamicAnalysis", "false",
-      "sonar.projectDate", "2014-10-01")
+    xooSampleAnalysis.withProperties("sonar.projectDate", "2014-10-01")
       .run();
 
     // All the issues are open
@@ -120,9 +112,7 @@ public class IssuePurgeTest extends AbstractIssueTest {
     // -> Not deleted because less than 5000 days long
     xooSampleAnalysis
       .withXooEmptyProfile()
-      .withProperties(
-        "sonar.dynamicAnalysis", "false",
-        "sonar.projectDate", "2014-10-15")
+      .withProperties("sonar.projectDate", "2014-10-15")
       .run();
     issueList = searchIssues();
     assertThat(issueList).isNotEmpty();
@@ -135,9 +125,7 @@ public class IssuePurgeTest extends AbstractIssueTest {
     projectAnalysisRule.setServerProperty("sonar.dbcleaner.daysBeforeDeletingClosedIssues", "0");
 
     xooSampleAnalysis.withXooEmptyProfile()
-      .withProperties(
-        "sonar.dynamicAnalysis", "false",
-        "sonar.projectDate", "2014-10-20")
+      .withProperties("sonar.projectDate", "2014-10-20")
       .run();
 
     Issues issues = issueClient().find(IssueQuery.create());
@@ -149,11 +137,9 @@ public class IssuePurgeTest extends AbstractIssueTest {
    * SONAR-5200
    */
   @Test
-  public void resolve_issues_when_removing_module() throws Exception {
+  public void resolve_issues_when_removing_module() {
     // Generate some issues
-    xooMultiModuleAnalysis
-      .withProperties("sonar.dynamicAnalysis", "false")
-      .run();
+    xooMultiModuleAnalysis.run();
 
     // All the issues are open
     List<Issue> issues = searchIssues();
@@ -167,9 +153,7 @@ public class IssuePurgeTest extends AbstractIssueTest {
 
     // Second scan without module B -> issues on module B are resolved as removed and closed
     xooMultiModuleAnalysis
-      .withProperties(
-        "sonar.dynamicAnalysis", "false",
-        "sonar.modules", "module_a")
+      .withProperties("sonar.modules", "module_a")
       .run();
 
     // Resolved should should all be mark as REMOVED and affect to module b
diff --git a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java
index 78876ec9ca3..0828b039b11 100644
--- a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java
@@ -195,7 +195,6 @@ public class UpgradeTest {
       // exclude pom.xml, otherwise it will be published in SQ 6.3+ and not in previous versions, resulting in a different number of
       // components
       .setProperty("sonar.exclusions", "**/pom.xml")
-      .setProperty("sonar.dynamicAnalysis", "false")
       .setProperty("sonar.scm.disabled", "true")
       .setProperty("sonar.cpd.cross_project", "true");
     orchestrator.executeBuild(build);