From b48ef5a6aaa8f93f768efeac447bbbf365aa4428 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 5 Oct 2015 10:42:44 +0200 Subject: [PATCH] Move all batch ITs in the same suite --- it/it-plugins/crash-plugin/pom.xml | 38 ------------------- .../src/main/java/CrashPlugin.java | 12 ------ .../src/main/java/CrashSensor.java | 31 --------------- it/it-plugins/pom.xml | 1 - .../src/main/java/EncryptionVerifier.java | 12 +++--- .../java/batch/{ => suite}/BatchTest.java | 13 +------ .../test/java/batch/suite/BatchTestSuite.java | 15 +++++--- .../batch/{ => suite}/IssuesModeTest.java | 10 +---- .../{ => suite}/SettingsEncryptionTest.java | 15 +++----- 9 files changed, 25 insertions(+), 122 deletions(-) delete mode 100644 it/it-plugins/crash-plugin/pom.xml delete mode 100644 it/it-plugins/crash-plugin/src/main/java/CrashPlugin.java delete mode 100644 it/it-plugins/crash-plugin/src/main/java/CrashSensor.java rename it/it-tests/src/test/java/batch/{ => suite}/BatchTest.java (98%) rename it/it-tests/src/test/java/batch/{ => suite}/IssuesModeTest.java (98%) rename it/it-tests/src/test/java/batch/{ => suite}/SettingsEncryptionTest.java (91%) diff --git a/it/it-plugins/crash-plugin/pom.xml b/it/it-plugins/crash-plugin/pom.xml deleted file mode 100644 index 330344c5fa0..00000000000 --- a/it/it-plugins/crash-plugin/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - - org.sonarsource.it - it-plugins - 5.2-SNAPSHOT - - - crash-plugin - sonar-plugin - Plugins :: Crash - 1.0-SNAPSHOT - Crash on demand - - - - org.codehaus.sonar - sonar-plugin-api - ${apiVersion} - provided - - - - - - - org.codehaus.sonar - sonar-packaging-maven-plugin - 1.12.1 - true - - CrashPlugin - - - - - diff --git a/it/it-plugins/crash-plugin/src/main/java/CrashPlugin.java b/it/it-plugins/crash-plugin/src/main/java/CrashPlugin.java deleted file mode 100644 index dba4fbd4e0a..00000000000 --- a/it/it-plugins/crash-plugin/src/main/java/CrashPlugin.java +++ /dev/null @@ -1,12 +0,0 @@ -import org.sonar.api.SonarPlugin; - -import java.util.Arrays; -import java.util.List; - -public class CrashPlugin extends SonarPlugin { - - public List getExtensions() { - return Arrays.asList(CrashSensor.class); - } - -} diff --git a/it/it-plugins/crash-plugin/src/main/java/CrashSensor.java b/it/it-plugins/crash-plugin/src/main/java/CrashSensor.java deleted file mode 100644 index 7fdd2576120..00000000000 --- a/it/it-plugins/crash-plugin/src/main/java/CrashSensor.java +++ /dev/null @@ -1,31 +0,0 @@ -import org.sonar.api.Properties; -import org.sonar.api.Property; -import org.sonar.api.batch.Sensor; -import org.sonar.api.batch.SensorContext; -import org.sonar.api.config.Settings; -import org.sonar.api.resources.Project; - -@Properties({ - @Property( - key = "crash", - name = "Property to decide if it crash or not", - defaultValue = "false") -}) -public class CrashSensor implements Sensor { - - private Settings settings; - - public CrashSensor(Settings settings) { - this.settings = settings; - } - - public boolean shouldExecuteOnProject(Project project) { - return true; - } - - public void analyse(Project project, SensorContext sensorContext) { - if ("true".equals(settings.getString("crash"))) { - throw new RuntimeException("Crash!"); - } - } -} diff --git a/it/it-plugins/pom.xml b/it/it-plugins/pom.xml index aa8d2238af2..db917ba0e3c 100644 --- a/it/it-plugins/pom.xml +++ b/it/it-plugins/pom.xml @@ -33,7 +33,6 @@ access-secured-props-plugin batch-plugin - crash-plugin extension-lifecycle-plugin global-property-change-plugin l10n-fr-pack diff --git a/it/it-plugins/settings-encryption-plugin/src/main/java/EncryptionVerifier.java b/it/it-plugins/settings-encryption-plugin/src/main/java/EncryptionVerifier.java index c3ea7361c64..a4bafa7b6ae 100644 --- a/it/it-plugins/settings-encryption-plugin/src/main/java/EncryptionVerifier.java +++ b/it/it-plugins/settings-encryption-plugin/src/main/java/EncryptionVerifier.java @@ -11,11 +11,13 @@ public class EncryptionVerifier implements BatchExtension { } public void start() { - System.out.println("Start EncryptionVerifier"); - - String decryptedValue = settings.getString("encryptedProperty"); - if (!"this is a secret".equals(decryptedValue)) { - throw new IllegalStateException("The property 'encryptedProperty' can not be decrypted"); + if (settings.hasKey("encryptedProperty")) { + System.out.println("Start EncryptionVerifier"); + + String decryptedValue = settings.getString("encryptedProperty"); + if (!"this is a secret".equals(decryptedValue)) { + throw new IllegalStateException("The property 'encryptedProperty' can not be decrypted"); + } } } } diff --git a/it/it-tests/src/test/java/batch/BatchTest.java b/it/it-tests/src/test/java/batch/suite/BatchTest.java similarity index 98% rename from it/it-tests/src/test/java/batch/BatchTest.java rename to it/it-tests/src/test/java/batch/suite/BatchTest.java index f64b9dd8b49..beb8733967b 100644 --- a/it/it-tests/src/test/java/batch/BatchTest.java +++ b/it/it-tests/src/test/java/batch/suite/BatchTest.java @@ -3,7 +3,7 @@ * All rights reserved * mailto:contact AT sonarsource DOT com */ -package batch; +package batch.suite; import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.build.BuildFailureException; @@ -34,16 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class BatchTest { @ClassRule - public static Orchestrator orchestrator = Orchestrator.builderEnv() - .setSonarVersion("DEV") - .addPlugin(ItUtils.xooPlugin()) - .setContext("/") - - .addPlugin(ItUtils.pluginArtifact("batch-plugin")) - // Java is only used in convert_library_into_module test - .setOrchestratorProperty("javaVersion", "LATEST_RELEASE").addPlugin("java") - - .build(); + public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR; @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java b/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java index 0431a2dbd02..7a5aa4028a0 100644 --- a/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java +++ b/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java @@ -5,17 +5,17 @@ */ package batch.suite; -import util.ItUtils; - import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; @RunWith(Suite.class) @Suite.SuiteClasses({ ExtensionLifecycleTest.class, LinksTest.class, MavenTest.class, ProjectBuilderTest.class, ProjectExclusionsTest.class, - TempFolderTest.class, MultiLanguageTest.class, IssueJsonReportTest.class, ProjectProvisioningTest.class + TempFolderTest.class, MultiLanguageTest.class, IssueJsonReportTest.class, ProjectProvisioningTest.class, BatchTest.class, + IssuesModeTest.class, SettingsEncryptionTest.class }) public class BatchTestSuite { @@ -26,6 +26,12 @@ public class BatchTestSuite { .setOrchestratorProperty("javaVersion", "LATEST_RELEASE").addPlugin("java") .setContext("/") + // Used by SettingsEncryptionTest + .addPlugin(ItUtils.pluginArtifact("settings-encryption-plugin")) + + // Used by IssuesModeTest + .addPlugin(ItUtils.pluginArtifact("access-secured-props-plugin")) + // used by TempFolderTest .addPlugin(ItUtils.pluginArtifact("batch-plugin")) @@ -35,8 +41,5 @@ public class BatchTestSuite { // used by ProjectBuilderTest .addPlugin(ItUtils.pluginArtifact("project-builder-plugin")) - // used by SemaphoreTest - .addPlugin(ItUtils.pluginArtifact("crash-plugin")) - .build(); } diff --git a/it/it-tests/src/test/java/batch/IssuesModeTest.java b/it/it-tests/src/test/java/batch/suite/IssuesModeTest.java similarity index 98% rename from it/it-tests/src/test/java/batch/IssuesModeTest.java rename to it/it-tests/src/test/java/batch/suite/IssuesModeTest.java index 7ff66112e3c..6b448214c7b 100644 --- a/it/it-tests/src/test/java/batch/IssuesModeTest.java +++ b/it/it-tests/src/test/java/batch/suite/IssuesModeTest.java @@ -3,7 +3,7 @@ * All rights reserved * mailto:contact AT sonarsource DOT com */ -package batch; +package batch.suite; import com.google.common.collect.Maps; import com.sonar.orchestrator.Orchestrator; @@ -47,13 +47,7 @@ import static org.junit.Assert.fail; public class IssuesModeTest { @ClassRule - public static Orchestrator orchestrator = Orchestrator.builderEnv() - .setSonarVersion("DEV") - .addPlugin(ItUtils.xooPlugin()) - .setContext("/") - - .addPlugin(ItUtils.pluginArtifact("access-secured-props-plugin")) - .build(); + public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR; @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/it/it-tests/src/test/java/batch/SettingsEncryptionTest.java b/it/it-tests/src/test/java/batch/suite/SettingsEncryptionTest.java similarity index 91% rename from it/it-tests/src/test/java/batch/SettingsEncryptionTest.java rename to it/it-tests/src/test/java/batch/suite/SettingsEncryptionTest.java index cc375155a6a..9a900fee3eb 100644 --- a/it/it-tests/src/test/java/batch/SettingsEncryptionTest.java +++ b/it/it-tests/src/test/java/batch/suite/SettingsEncryptionTest.java @@ -3,28 +3,23 @@ * All rights reserved * mailto:contact AT sonarsource DOT com */ -package batch; +package batch.suite; -import util.ItUtils; import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.build.BuildFailureException; import com.sonar.orchestrator.build.BuildResult; import com.sonar.orchestrator.build.SonarRunner; -import org.junit.ClassRule; -import org.junit.Test; - import java.io.File; import java.net.URL; +import org.junit.ClassRule; +import org.junit.Test; +import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; public class SettingsEncryptionTest { @ClassRule - public static Orchestrator orchestrator = Orchestrator.builderEnv() - .setSonarVersion("DEV") - .addPlugin(ItUtils.pluginArtifact("settings-encryption-plugin")) - .addPlugin(ItUtils.xooPlugin()) - .build(); + public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR; /** * SONAR-2084 -- 2.39.5