From a19f87349dc27938288ebfb8f50078704956581c Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 11 Jun 2018 13:35:30 +0200
Subject: [PATCH] Fix integration test PluginWithoutBuiltinQualityProfile

---
 tests/plugins/foo-plugin-without-qprofile/build.gradle      | 6 ------
 tests/src/test/java/org/sonarqube/tests/Category5Suite.java | 4 ++--
 ...ile.java => PluginWithoutBuiltinQualityProfileTest.java} | 6 ++----
 3 files changed, 4 insertions(+), 12 deletions(-)
 rename tests/src/test/java/org/sonarqube/tests/qualityProfile/{PluginWithoutBuiltinQualityProfile.java => PluginWithoutBuiltinQualityProfileTest.java} (91%)

diff --git a/tests/plugins/foo-plugin-without-qprofile/build.gradle b/tests/plugins/foo-plugin-without-qprofile/build.gradle
index a1eed2ef89e..789f3dd33d5 100644
--- a/tests/plugins/foo-plugin-without-qprofile/build.gradle
+++ b/tests/plugins/foo-plugin-without-qprofile/build.gradle
@@ -3,9 +3,6 @@ sonarqube {
 }
 
 dependencies {
-  compile 'com.google.guava:guava'
-  compile 'commons-io:commons-io'
-  compile 'commons-lang:commons-lang'
   compileOnly 'com.google.code.findbugs:jsr305'
   compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow')
 }
@@ -23,7 +20,4 @@ jar {
       'Plugin-License': 'GNU LGPL 3'
     )
   }
-  into('META-INF/lib') {
-    from configurations.compile
-  }
 }
diff --git a/tests/src/test/java/org/sonarqube/tests/Category5Suite.java b/tests/src/test/java/org/sonarqube/tests/Category5Suite.java
index bf1b19e2517..64cea9d35a3 100644
--- a/tests/src/test/java/org/sonarqube/tests/Category5Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category5Suite.java
@@ -28,7 +28,7 @@ import org.sonarqube.tests.issue.IssueCreationDatePluginChangedTest;
 import org.sonarqube.tests.marketplace.UpdateCenterTest;
 import org.sonarqube.tests.qualityProfile.ActiveRuleEsResilienceTest;
 import org.sonarqube.tests.qualityProfile.BuiltInQualityProfilesNotificationTest;
-import org.sonarqube.tests.qualityProfile.PluginWithoutBuiltinQualityProfile;
+import org.sonarqube.tests.qualityProfile.PluginWithoutBuiltinQualityProfileTest;
 import org.sonarqube.tests.rule.RuleEsResilienceTest;
 import org.sonarqube.tests.serverSystem.BlueGreenTest;
 import org.sonarqube.tests.serverSystem.RestartTest;
@@ -65,7 +65,7 @@ import org.sonarqube.tests.user.UserEsResilienceTest;
   HttpHeadersAuthenticationTest.class,
   OnboardingTest.class,
   BuiltInQualityProfilesNotificationTest.class,
-  PluginWithoutBuiltinQualityProfile.class,
+  PluginWithoutBuiltinQualityProfileTest.class,
   ActiveRuleEsResilienceTest.class,
   AnalysisEsResilienceTest.class,
   RuleEsResilienceTest.class,
diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfile.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfileTest.java
similarity index 91%
rename from tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfile.java
rename to tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfileTest.java
index 37fc1767534..f6ed25067fe 100644
--- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfile.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfileTest.java
@@ -31,14 +31,12 @@ import static org.junit.Assert.fail;
 import static util.ItUtils.newOrchestratorBuilder;
 import static util.ItUtils.pluginArtifact;
 
-public class PluginWithoutBuiltinQualityProfile {
+public class PluginWithoutBuiltinQualityProfileTest {
   private static Orchestrator orchestrator;
 
   @Test
   public void should_fail_if_plugin_defines_language_and_no_builtin_qprofile() throws IOException {
-    orchestrator = newOrchestratorBuilder()
-      .addPlugin(pluginArtifact("foo-plugin-without-qprofile"))
-      .build();
+    orchestrator = newOrchestratorBuilder(b -> b.addPlugin(pluginArtifact("foo-plugin-without-qprofile")));
 
     try {
       orchestrator.start();
-- 
2.39.5