From 6bb914932a45a352d2d8ffb60f824ac289332a30 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 6 Jan 2017 14:24:33 +0100 Subject: [PATCH] Delete ignored and useless IT --- .../src/test/java/it/Category3Suite.java | 2 - .../it/analysis/ProjectProvisioningTest.java | 163 ------------------ 2 files changed, 165 deletions(-) delete mode 100644 it/it-tests/src/test/java/it/analysis/ProjectProvisioningTest.java diff --git a/it/it-tests/src/test/java/it/Category3Suite.java b/it/it-tests/src/test/java/it/Category3Suite.java index 798a7fe507d..b898d3dfb14 100644 --- a/it/it-tests/src/test/java/it/Category3Suite.java +++ b/it/it-tests/src/test/java/it/Category3Suite.java @@ -28,7 +28,6 @@ import it.analysis.IssuesModeTest; import it.analysis.LinksTest; import it.analysis.MultiLanguageTest; import it.analysis.ProjectBuilderTest; -import it.analysis.ProjectProvisioningTest; import it.analysis.ReportDumpTest; import it.analysis.SSLTest; import it.analysis.ScannerTest; @@ -55,7 +54,6 @@ import static util.ItUtils.xooPlugin; TempFolderTest.class, MultiLanguageTest.class, IssueJsonReportTest.class, - ProjectProvisioningTest.class, ScannerTest.class, IssuesModeTest.class, SettingsEncryptionTest.class, diff --git a/it/it-tests/src/test/java/it/analysis/ProjectProvisioningTest.java b/it/it-tests/src/test/java/it/analysis/ProjectProvisioningTest.java deleted file mode 100644 index 21fdf4e9a60..00000000000 --- a/it/it-tests/src/test/java/it/analysis/ProjectProvisioningTest.java +++ /dev/null @@ -1,163 +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.BuildResult; -import com.sonar.orchestrator.build.SonarScanner; -import it.Category3Suite; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Test; -import org.sonar.wsclient.SonarClient; -import org.sonar.wsclient.project.NewProject; -import org.sonar.wsclient.services.PropertyUpdateQuery; -import util.ItUtils; - -import static org.assertj.core.api.Assertions.assertThat; - -@Ignore -public class ProjectProvisioningTest { - - @ClassRule - public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR; - - @BeforeClass - public static void init() { - orchestrator.resetData(); - orchestrator.executeBuild( - SonarScanner.create(ItUtils.projectDir("shared/xoo-sample")) - ); - } - - @AfterClass - public static void resetAutoProjectCreation() { - setProperty("sonar.preventAutoProjectCreation", "false"); - } - - private SonarClient client; - - @Before - public void initClient() { - client = orchestrator.getServer().adminWsClient(); - } - - /** - * SONAR-3871 - * SONAR-4713 - */ - @Test - public void should_allow_existing_project_scan() { - setProperty("sonar.preventAutoProjectCreation", "true"); - - // xoo-sample already exists => pass - checkBuildSuccess("shared/xoo-sample"); - } - - /** - * SONAR-3871 - * SONAR-4713 - */ - @Test - @Ignore("This test should be moved to a Medium test of the Compute Engine") - public void should_prevent_project_creation() { - setProperty("sonar.preventAutoProjectCreation", "true"); - - // xoo-sample-with-tests does not exist => fail - checkBuildFailed("shared/xoo-sample-with-tests"); - - // provision xoo-sample-with-tests and retry - client.projectClient().create( - NewProject.create() - .key("sample-with-tests") - .name("Sample With Tests")); - checkBuildSuccess("shared/xoo-sample-with-tests"); - } - - /** - * SONAR-3871 - * SONAR-4713 - */ - @Test - public void should_allow_provisioned_project() { - setProperty("sonar.preventAutoProjectCreation", "true"); - - // provision xoo-multi-modules-sample before 1st scan and check build OK - client.projectClient().create( - NewProject.create() - .key("com.sonarsource.it.samples:multi-modules-sample") - .name("Xoo Multi Modules Sample")); - checkBuildSuccess("shared/xoo-multi-modules-sample"); - } - - /** - * SONAR-5547 - */ - @Test - public void should_allow_provisioned_project_with_branch() { - setProperty("sonar.preventAutoProjectCreation", "true"); - - // provision xoo-multi-modules-sample before 1st scan and check build OK - client.projectClient().create( - NewProject.create() - .key("com.sonarsource.it.samples:multi-modules-sample:branch") - .name("Xoo Multi Modules Sample - Branch")); - checkBuildSuccess("shared/xoo-multi-modules-sample", "sonar.branch", "branch"); - } - - /** - * SONAR-3871 - * SONAR-4713 - */ - @Test - public void should_allow_provisioned_project_even_when_provisioning_not_enforced() { - setProperty("sonar.preventAutoProjectCreation", "false"); - - client.projectClient().create( - NewProject.create() - .key("xo") - .name("xo")); - checkBuildSuccess("shared/xoo-two-letters-named"); - } - - private static BuildResult checkBuildSuccess(String projectPath, String... propertiesKeyValues) { - BuildResult result = scan(projectPath, propertiesKeyValues); - assertThat(result.getStatus()).isZero(); - return result; - } - - private static BuildResult checkBuildFailed(String projectPath) { - BuildResult result = scan(projectPath); - assertThat(result.getStatus()).isNotEqualTo(0); - return result; - } - - private static BuildResult scan(String projectPath, String... propertiesKeyValues) { - return orchestrator.executeBuildQuietly( - SonarScanner.create(ItUtils.projectDir(projectPath)).setProperties(propertiesKeyValues)); - } - - private static void setProperty(String key, String value) { - orchestrator.getServer().getAdminWsClient().update(new PropertyUpdateQuery(key, value)); - } -} -- 2.39.5