Merge pull request #2018 from guwirth/SonarCFamily-support

SonarCFamily support
SonarOpenCommunity · Dec 31, 2020 · 2d2206c · 2d2206c
2 parents c3e65f8 + 050d2da
commit 2d2206c
Show file tree

Hide file tree

Showing 33 changed files with 35 additions and 33 deletions.
diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangsa/CxxClangSASensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangsa/CxxClangSASensor.java
@@ -75,7 +75,7 @@ private static NSObject require(@Nullable NSObject object, String errorMsg) {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Clang Static Analyzer report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx","cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidySensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidySensor.java
@@ -104,7 +104,7 @@ protected static String[] splitRuleId(String info, String defaultRuleId) {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Clang-Tidy report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx","cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/gcc/CxxCompilerGccSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/gcc/CxxCompilerGccSensor.java
@@ -85,7 +85,7 @@ public static List<PropertyDefinition> properties() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX GCC compiler report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepositories(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/vc/CxxCompilerVcSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/vc/CxxCompilerVcSensor.java
@@ -79,7 +79,7 @@ public static List<PropertyDefinition> properties() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Visual Studio compiler report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepositories(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/...sors/src/main/java/org/sonar/cxx/sensors/coverage/bullseye/CxxCoverageBullseyeSensor.java b/...sors/src/main/java/org/sonar/cxx/sensors/coverage/bullseye/CxxCoverageBullseyeSensor.java
@@ -56,7 +56,7 @@ public CxxCoverageBullseyeSensor() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Bullseye coverage report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .onlyWhenConfiguration(conf -> conf.hasKey(REPORT_PATH_KEY));
   }
 

diff --git a/...rs/src/main/java/org/sonar/cxx/sensors/coverage/cobertura/CxxCoverageCoberturaSensor.java b/...rs/src/main/java/org/sonar/cxx/sensors/coverage/cobertura/CxxCoverageCoberturaSensor.java
@@ -56,7 +56,7 @@ public CxxCoverageCoberturaSensor() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Cobertura XML coverage report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .onlyWhenConfiguration(conf -> conf.hasKey(REPORT_PATH_KEY));
   }
 

diff --git a/...ors/src/main/java/org/sonar/cxx/sensors/coverage/ctc/CxxCoverageTestwellCtcTxtSensor.java b/...ors/src/main/java/org/sonar/cxx/sensors/coverage/ctc/CxxCoverageTestwellCtcTxtSensor.java
@@ -56,7 +56,7 @@ public CxxCoverageTestwellCtcTxtSensor() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Testwell CTC++ TXT coverage report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .onlyWhenConfiguration(conf -> conf.hasKey(REPORT_PATH_KEY));
   }
 

diff --git a/...ensors/src/main/java/org/sonar/cxx/sensors/coverage/vs/CxxCoverageVisualStudioSensor.java b/...ensors/src/main/java/org/sonar/cxx/sensors/coverage/vs/CxxCoverageVisualStudioSensor.java
@@ -56,7 +56,7 @@ public CxxCoverageVisualStudioSensor() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Visual Studio XML coverage report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .onlyWhenConfiguration(conf -> conf.hasKey(REPORT_PATH_KEY));
   }
 

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckSensor.java
@@ -65,7 +65,7 @@ public static List<PropertyDefinition> properties() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Cppcheck report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/CxxDrMemorySensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/CxxDrMemorySensor.java
@@ -73,7 +73,7 @@ private static String getFrameText(Location frame, int frameNr) {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Dr. Memory report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/infer/CxxInferSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/infer/CxxInferSensor.java
@@ -57,7 +57,7 @@ public static List<PropertyDefinition> properties() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Infer report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/other/CxxOtherSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/other/CxxOtherSensor.java
@@ -79,7 +79,7 @@ public static List<PropertyDefinition> properties() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX external analyser report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/pclint/CxxPCLintSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/pclint/CxxPCLintSensor.java
@@ -84,7 +84,7 @@ public static List<PropertyDefinition> properties() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX PC-lint report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/rats/CxxRatsSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/rats/CxxRatsSensor.java
@@ -74,7 +74,7 @@ private static String getVulnerabilityType(@Nullable Element child) {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX RATS report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/...sors/src/main/java/org/sonar/cxx/sensors/tests/dotnet/CxxUnitTestResultsImportSensor.java b/...sors/src/main/java/org/sonar/cxx/sensors/tests/dotnet/CxxUnitTestResultsImportSensor.java
@@ -95,7 +95,7 @@ public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX VSTest/xUnit/NUnit Test report import")
       .onlyWhenConfiguration(conf -> new UnitTestConfiguration(conf).hasUnitTestResultsProperty())
-      .onlyOnLanguage("cxx");
+      .onlyOnLanguages("cxx", "cpp", "c");
   }
 
   @Override

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/tests/xunit/CxxXunitSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/tests/xunit/CxxXunitSensor.java
@@ -69,7 +69,7 @@ public static List<PropertyDefinition> properties() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX xUnit Test report import")
-      //.onlyOnLanguage(getLanguage().getKey())
+      //.onlyOnLanguages("cxx","cpp", "c")
       .onlyWhenConfiguration(conf -> conf.hasKey(REPORT_PATH_KEY));
   }
 

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/valgrind/CxxValgrindSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/valgrind/CxxValgrindSensor.java
@@ -72,7 +72,7 @@ private static String createErrorMsg(ValgrindError error, ValgrindStack stack, i
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Valgrind report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(REPORT_PATH_KEY));
   }

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/veraxx/CxxVeraxxSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/veraxx/CxxVeraxxSensor.java
@@ -63,7 +63,7 @@ public static List<PropertyDefinition> properties() {
   public void describe(SensorDescriptor descriptor) {
     descriptor
       .name("CXX Vera++ report import")
-      .onlyOnLanguage("cxx")
+      .onlyOnLanguages("cxx", "cpp", "c")
       .createIssuesForRuleRepository(getRuleRepositoryKey())
       .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathsKey()));
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/clangsa/CxxClangSASensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/clangsa/CxxClangSASensorTest.java
@@ -173,7 +173,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Clang Static Analyzer report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxClangSARuleRepository.KEY);
     softly.assertAll();
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidySensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidySensorTest.java
@@ -232,7 +232,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Clang-Tidy report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxClangTidyRuleRepository.KEY);
     softly.assertAll();
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/compiler/gcc/CxxCompilerGccSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/compiler/gcc/CxxCompilerGccSensorTest.java
@@ -49,7 +49,7 @@ public void sensorDescriptorGcc() {
     sensor.describe(descriptor);
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX GCC compiler report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories())
       .containsOnly(CxxCompilerGccRuleRepository.KEY);
     softly.assertAll();

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/compiler/vc/CxxCompilerVcSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/compiler/vc/CxxCompilerVcSensorTest.java
@@ -48,7 +48,7 @@ public void sensorDescriptorVc() {
     sensor.describe(descriptor);
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Visual Studio compiler report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories())
       .containsOnly(CxxCompilerVcRuleRepository.KEY);
     softly.assertAll();

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/coverage/CxxMSCoverageSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/coverage/CxxMSCoverageSensorTest.java
@@ -153,7 +153,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Visual Studio XML coverage report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertAll();
   }
 

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckSensorTest.java
@@ -123,7 +123,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Cppcheck report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxCppCheckRuleRepository.KEY);
     softly.assertAll();
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/drmemory/CxxDrMemorySensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/drmemory/CxxDrMemorySensorTest.java
@@ -64,7 +64,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Dr. Memory report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxDrMemoryRuleRepository.KEY);
     softly.assertAll();
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/infer/CxxInferSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/infer/CxxInferSensorTest.java
@@ -118,7 +118,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Infer report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxInferRuleRepository.KEY);
     softly.assertAll();
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/other/CxxOtherSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/other/CxxOtherSensorTest.java
@@ -152,7 +152,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX external analyser report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxOtherRepository.KEY);
     softly.assertAll();
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/pclint/CxxPCLintSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/pclint/CxxPCLintSensorTest.java
@@ -189,7 +189,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX PC-lint report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxPCLintRuleRepository.KEY);
     softly.assertAll();
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/rats/CxxRatsSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/rats/CxxRatsSensorTest.java
@@ -68,7 +68,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX RATS report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxRatsRuleRepository.KEY);
     softly.assertAll();
   }

diff --git a/.../src/test/java/org/sonar/cxx/sensors/tests/dotnet/CxxUnitTestResultsImportSensorTest.java b/.../src/test/java/org/sonar/cxx/sensors/tests/dotnet/CxxUnitTestResultsImportSensorTest.java
@@ -51,7 +51,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX VSTest/xUnit/NUnit Test report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertAll();
   }
 

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/utils/CxxReportSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/utils/CxxReportSensorTest.java
@@ -117,7 +117,9 @@ public void executeImpl() {
 
     @Override
     public void describe(SensorDescriptor descriptor) {
-      descriptor.onlyOnLanguage("cxx").name("CxxReportSensorTest");
+      descriptor
+        .name("CxxReportSensorTest")
+        .onlyOnLanguages("cxx", "cpp", "c");
     }
   }
 

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/valgrind/CxxValgrindSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/valgrind/CxxValgrindSensorTest.java
@@ -87,7 +87,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Valgrind report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxValgrindRuleRepository.KEY);
     softly.assertAll();
   }

diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/veraxx/CxxVeraxxSensorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/veraxx/CxxVeraxxSensorTest.java
@@ -75,7 +75,7 @@ public void sensorDescriptor() {
 
     var softly = new SoftAssertions();
     softly.assertThat(descriptor.name()).isEqualTo("CXX Vera++ report import");
-    softly.assertThat(descriptor.languages()).containsOnly("cxx");
+    softly.assertThat(descriptor.languages()).containsOnly("cxx", "cpp", "c");
     softly.assertThat(descriptor.ruleRepositories()).containsOnly(CxxVeraxxRuleRepository.KEY);
     softly.assertAll();
   }