From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 30 Aug 2016 07:49:35 +0000 (+0200)
Subject: Fix IT plugins
X-Git-Tag: 6.1-RC1~270
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=258dff83603602313f58113d4165e2a4583c9279;p=sonarqube.git

Fix IT plugins

  * ABAP not compatible with SQ 6.1.
  * enable C/C++/VB that are now fixed
---

diff --git a/it/it-tests/src/test/java/it/plugins/PluginsTest.java b/it/it-tests/src/test/java/it/plugins/PluginsTest.java
index 53743d2fc15..19474acfc59 100644
--- a/it/it-tests/src/test/java/it/plugins/PluginsTest.java
+++ b/it/it-tests/src/test/java/it/plugins/PluginsTest.java
@@ -25,9 +25,10 @@ import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.OrchestratorBuilder;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.plugins.checks.AbapCheck;
+import it.plugins.checks.CCheck;
 import it.plugins.checks.Check;
 import it.plugins.checks.CobolCheck;
+import it.plugins.checks.CppCheck;
 import it.plugins.checks.CssCheck;
 import it.plugins.checks.FlexCheck;
 import it.plugins.checks.GroovyCheck;
@@ -38,6 +39,7 @@ import it.plugins.checks.PythonCheck;
 import it.plugins.checks.RpgCheck;
 import it.plugins.checks.SwiftCheck;
 import it.plugins.checks.Validation;
+import it.plugins.checks.VbCheck;
 import it.plugins.checks.WebCheck;
 import java.util.Arrays;
 import java.util.List;
@@ -70,9 +72,11 @@ public class PluginsTest {
     // https://jira.sonarsource.com/browse/MAIF-213
     "maifcobolplugin",
 
+    // waiting for release of ABAP 3.3
+    "abap",
+
     // SONAR-7770 Realm plugins cannot be installed as no external configuration is used
-    "crowd","ldap","pam"
-  );
+    "crowd", "ldap", "pam");
 
   static final Set<String> LICENSED_PLUGINS = Sets.newHashSet(
     "abap", "cobol", "cpp", "devcockpit", "governance", "objc", "pli", "plsql", "report", "rpg",
@@ -86,13 +90,13 @@ public class PluginsTest {
     "scmstats");
 
   // TODO new PliCheck() is temporarily disabled as PLI plugin does not support multi-language feature. See sonar-project.properties
-  // TODO CCheck, CppCheck, VbCheck temporarily disabled as not compatible with 6.0
-  static final List<Check> CHECKS = Arrays.asList((Check) new AbapCheck(),
-    // new CCheck(), new CppCheck(),
+  static final List<Check> CHECKS = Arrays.<Check>asList(
+    // new AbapCheck(),
+    new CCheck(), new CppCheck(),
     new CobolCheck(), new CssCheck(),
     new FlexCheck(), new GroovyCheck(), new JavaCheck(), new JavascriptCheck(), new PhpCheck(), new RpgCheck(),
     new PythonCheck(), new SwiftCheck(),
-    // new VbCheck(),
+    new VbCheck(),
     new WebCheck());
 
   static Orchestrator orchestrator;