SONAR-7487 Drop support of properties sonar.skippedModules and sonar.includedModules

3 files changed, 22 insertions, 190 deletions

diff --git a/it/it-tests/src/test/java/it/Category3Suite.java b/it/it-tests/src/test/java/it/Category3Suite.java
index 8576080b5cb..9a4d76d0ed3 100644
--- a/it/it-tests/src/test/java/it/Category3Suite.java
+++ b/it/it-tests/src/test/java/it/Category3Suite.java
@@ -20,7 +20,18 @@
 package it;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.analysis.*;
+import it.analysis.BatchTest;
+import it.analysis.ExtensionLifecycleTest;
+import it.analysis.IssueJsonReportTest;
+import it.analysis.IssuesModeTest;
+import it.analysis.LinksTest;
+import it.analysis.MavenTest;
+import it.analysis.MultiLanguageTest;
+import it.analysis.ProjectBuilderTest;
+import it.analysis.ProjectProvisioningTest;
+import it.analysis.ReportDumpTest;
+import it.analysis.SettingsEncryptionTest;
+import it.analysis.TempFolderTest;
 import it.measure.DecimalScaleMetricTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
@@ -36,7 +47,6 @@ import static util.ItUtils.xooPlugin;
   LinksTest.class,
   MavenTest.class,
   ProjectBuilderTest.class,
-  ProjectExclusionsTest.class,
   TempFolderTest.class,
   MultiLanguageTest.class,
   IssueJsonReportTest.class,
diff --git a/it/it-tests/src/test/java/it/analysis/BatchTest.java b/it/it-tests/src/test/java/it/analysis/BatchTest.java
index b69a4dd2abf..bf15ee6468f 100644
--- a/it/it-tests/src/test/java/it/analysis/BatchTest.java
+++ b/it/it-tests/src/test/java/it/analysis/BatchTest.java
@@ -20,13 +20,20 @@
 package it.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.BuildFailureException;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
 import it.Category3Suite;
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
 import org.apache.commons.io.FileUtils;
-import org.junit.*;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
@@ -36,10 +43,6 @@ import org.sonar.wsclient.services.PropertyUpdateQuery;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 import util.ItUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
 import util.QaOnly;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -89,34 +92,6 @@ public class BatchTest {
     assertThat(r.getMeasureIntValue("violations")).isEqualTo(61);
   }
 
-  /**
-   * SONAR-2907
-   */
-  @Test
-  public void branch_should_load_own_settings_from_database() {
-    orchestrator.getServer().provisionProject("com.sonarsource.it.samples:multi-modules-sample", "Sonar :: Integration Tests :: Multi-modules Sample");
-    orchestrator.getServer().associateProjectToQualityProfile("com.sonarsource.it.samples:multi-modules-sample", "xoo", "one-issue-per-line");
-    scan("shared/xoo-multi-modules-sample");
-    assertThat(getResource("com.sonarsource.it.samples:multi-modules-sample:module_b")).isNotNull();
-
-    Sonar sonar = orchestrator.getServer().getAdminWsClient();
-    // The parameter skippedModule considers key after first colon
-    sonar.update(new PropertyUpdateQuery("sonar.skippedModules", "multi-modules-sample:module_b",
-      "com.sonarsource.it.samples:multi-modules-sample"));
-
-    try {
-      scan("shared/xoo-multi-modules-sample");
-      assertThat(getResource("com.sonarsource.it.samples:multi-modules-sample:module_b")).isNull();
-
-      scan("shared/xoo-multi-modules-sample",
-        "sonar.branch", "mybranch");
-
-      assertThat(getResource("com.sonarsource.it.samples:multi-modules-sample:module_b:mybranch")).isNotNull();
-    } finally {
-      sonar.delete(new PropertyDeleteQuery("sonar.skippedModules", "com.sonarsource.it.samples:multi-modules-sample"));
-    }
-  }
-
   // SONAR-4680
   @Test
   public void module_should_load_own_settings_from_database() {
@@ -173,20 +148,6 @@ public class BatchTest {
   }
 
   /**
-   * SONAR-3116
-   */
-  @Test
-  @Category(QaOnly.class)
-  public void should_not_exclude_root_module() {
-    orchestrator.getServer().provisionProject("com.sonarsource.it.samples:multi-modules-sample", "Sonar :: Integration Tests :: Multi-modules Sample");
-    orchestrator.getServer().associateProjectToQualityProfile("com.sonarsource.it.samples:multi-modules-sample", "xoo", "one-issue-per-line");
-
-    thrown.expect(BuildFailureException.class);
-    scan("shared/xoo-multi-modules-sample",
-      "sonar.skippedModules", "multi-modules-sample");
-  }
-
-  /**
    * SONAR-3024
    */
   @Test
@@ -329,7 +290,7 @@ public class BatchTest {
 
     File cache = new File(userHome, "cache");
     assertThat(cache).exists().isDirectory();
-    int cachedFiles = FileUtils.listFiles(cache, new String[]{"jar"}, true).size();
+    int cachedFiles = FileUtils.listFiles(cache, new String[] {"jar"}, true).size();
     assertThat(cachedFiles).isGreaterThan(5);
     assertThat(result.getLogs()).contains("User cache: " + cache.getAbsolutePath());
     assertThat(result.getLogs()).contains("Download sonar-xoo-plugin-");
diff --git a/it/it-tests/src/test/java/it/analysis/ProjectExclusionsTest.java b/it/it-tests/src/test/java/it/analysis/ProjectExclusionsTest.java
deleted file mode 100644
index 81c5d1a5b85..00000000000
--- a/it/it-tests/src/test/java/it/analysis/ProjectExclusionsTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package it.analysis;
-
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.MavenBuild;
-import it.Category3Suite;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.sonar.wsclient.services.Resource;
-import org.sonar.wsclient.services.ResourceQuery;
-import util.ItUtils;
-import util.QaOnly;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-@Category(QaOnly.class)
-public class ProjectExclusionsTest {
-  @ClassRule
-  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
-
-  @Before
-  public void deleteProjectData() {
-    orchestrator.resetData();
-  }
-
-  /**
-   * This use-case was a bug in 2.8-RC2. It failed when both the properties sonar.branch and sonar.skippedModules
-   * were set on the same multi-modules project.
-   */
-  @Test
-  public void shouldSupportMixOfBranchAndSkippedModules() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("shared/multi-modules-sample"))
-      .setGoals("clean verify", "sonar:sonar")
-      .setProperty("sonar.dynamicAnalysis", "false")
-      .setProperty("sonar.branch", "mybranch")
-      .setProperty("sonar.skippedModules", "module_b");
-
-    orchestrator.executeBuild(build);
-
-    assertNotNull(getResource("com.sonarsource.it.samples:multi-modules-sample:mybranch"));
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a:mybranch").getId());
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a1:mybranch").getId());
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a2:mybranch").getId());
-
-    assertNull(getResource("com.sonarsource.it.samples:module_b:mybranch"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b1:mybranch"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b2:mybranch"));
-  }
-
-  /**
-   * Black list
-   */
-  @Test
-  public void shouldExcludeModuleAndItsChildren() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("shared/multi-modules-sample"))
-      .setGoals("clean verify", "sonar:sonar")
-      .setProperty("sonar.dynamicAnalysis", "false")
-      .setProperty("sonar.skippedModules", "module_b");
-
-    orchestrator.executeBuild(build);
-
-    assertNotNull(getResource("com.sonarsource.it.samples:multi-modules-sample"));
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a"));
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a1"));
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a2"));
-
-    // excluded project and its children
-    assertNull(getResource("com.sonarsource.it.samples:module_b"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b1"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b2"));
-  }
-
-  /**
-   * Exhaustive white list
-   */
-  @Test
-  public void shouldIncludeModules() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("shared/multi-modules-sample"))
-      .setGoals("clean verify", "sonar:sonar")
-      .setProperty("sonar.dynamicAnalysis", "false")
-      .setProperty("sonar.includedModules", "multi-modules-sample,module_a,module_a1");
-
-    orchestrator.executeBuild(build);
-
-    assertNotNull(getResource("com.sonarsource.it.samples:multi-modules-sample"));
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a"));
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a1"));
-
-    assertNull(getResource("com.sonarsource.it.samples:module_a2"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b1"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b2"));
-  }
-
-  @Test
-  public void rootModuleShouldBeOptionalInListOfIncludedModules() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("shared/multi-modules-sample"))
-      .setCleanSonarGoals()
-      .setProperty("sonar.dynamicAnalysis", "false")
-      // the root module 'multi-modules-sample' is not declared
-      .setProperty("sonar.includedModules", "module_a,module_a1");
-
-    orchestrator.executeBuild(build);
-
-    assertNotNull(getResource("com.sonarsource.it.samples:multi-modules-sample"));
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a"));
-    assertNotNull(getResource("com.sonarsource.it.samples:module_a1"));
-
-    assertNull(getResource("com.sonarsource.it.samples:module_a2"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b1"));
-    assertNull(getResource("com.sonarsource.it.samples:module_b2"));
-  }
-
-  private Resource getResource(String key) {
-    return orchestrator.getServer().getWsClient().find(ResourceQuery.create(key));
-  }
-}