From acc4bb2682be5e33eda59844d17063963f079759 Mon Sep 17 00:00:00 2001
From: duncanp-sonar <duncan.pocklington@sonarsource.com>
Date: Tue, 31 May 2022 19:51:06 +0100
Subject: [PATCH] Update CFamily analyzer to v6.4

Fixes #2958
---
 src/EmbeddedSonarAnalyzer.props                   |  2 +-
 .../CFamily/CFamilyEmbeddedSonarWayRulesTests.cs  | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/EmbeddedSonarAnalyzer.props b/src/EmbeddedSonarAnalyzer.props
index c2829f2d05..47c806a857 100644
--- a/src/EmbeddedSonarAnalyzer.props
+++ b/src/EmbeddedSonarAnalyzer.props
@@ -6,7 +6,7 @@
     <!-- Note: don't forget to upload the new packages to the package feed when changing 
          the SonarAnalyzer version -->
     <EmbeddedSonarAnalyzerVersion>8.38.0.46746</EmbeddedSonarAnalyzerVersion>
-    <EmbeddedSonarCFamilyAnalyzerVersion>6.31.0.44497</EmbeddedSonarCFamilyAnalyzerVersion>
+    <EmbeddedSonarCFamilyAnalyzerVersion>6.34.0.48468</EmbeddedSonarCFamilyAnalyzerVersion>
     <EmbeddedSonarJSAnalyzerVersion>8.6.0.16913</EmbeddedSonarJSAnalyzerVersion>
     <EmbeddedSonarSecretsAnalyzerVersion>1.0.2</EmbeddedSonarSecretsAnalyzerVersion>
   </PropertyGroup>
diff --git a/src/Integration.Vsix.UnitTests/CFamily/CFamilyEmbeddedSonarWayRulesTests.cs b/src/Integration.Vsix.UnitTests/CFamily/CFamilyEmbeddedSonarWayRulesTests.cs
index f3a7faac6b..268e6cd01d 100644
--- a/src/Integration.Vsix.UnitTests/CFamily/CFamilyEmbeddedSonarWayRulesTests.cs
+++ b/src/Integration.Vsix.UnitTests/CFamily/CFamilyEmbeddedSonarWayRulesTests.cs
@@ -36,17 +36,20 @@ public class CFamilyEmbeddedSonarWayRulesTests
         // Note: how to find the expected number of active/inactive rules in SonarWay by language:
         // 1. Start a local SQ instance with the correct plugin version installed
         // 2. Browse to "Rules" e.g. http://localhost:9000/
+        //    or:
+        //    SonarCloud: C: https://sonarcloud.io/organizations/sonarsource/quality_profiles/show?name=Sonar+way&language=c
+        //    SonarCloud: C++: https://sonarcloud.io/organizations/sonarsource/quality_profiles/show?name=Sonar+way&language=cpp
         // 3. Filter by Repository = SonarAnalyzer C
         // 4. Filter by Quality Profile = Sonar way C
         // The QP filter has "active/inactive" tabs. The number of rules is shown in the top-right of the screen.
         // 5. Repeat for C++.
 
-        // Rule data for C-Family plugin v6.31 (build 44497)
-        private const int Active_C_Rules = 205;
+        // Rule data for C-Family plugin v6.34 (build 48468)
+        private const int Active_C_Rules = 206;
         private const int Inactive_C_Rules = 104;
 
-        private const int Active_CPP_Rules = 405;
-        private const int Inactive_CPP_Rules = 169;
+        private const int Active_CPP_Rules = 407;
+        private const int Inactive_CPP_Rules = 168;
 
         private readonly CFamilySonarWayRulesConfigProvider rulesMetadataCache = new CFamilySonarWayRulesConfigProvider(CFamilyShared.CFamilyFilesDirectory);
 
@@ -73,7 +76,7 @@ public void Read_Active_Rules()
         [TestMethod]
         public void Read_Rules_Params()
         {
-            rulesMetadataCache.GetRulesConfiguration("cpp").RulesParameters.TryGetValue("ClassComplexity", out var parameters);
+            rulesMetadataCache.GetRulesConfiguration("cpp").RulesParameters.TryGetValue("S1311", out var parameters);
             parameters.Should()
                 .Contain(new System.Collections.Generic.KeyValuePair<string, string>("maximumClassComplexityThreshold", "80"));
         }
@@ -81,7 +84,7 @@ public void Read_Rules_Params()
         [TestMethod]
         public void Read_Rules_Metadata()
         {
-            rulesMetadataCache.GetRulesConfiguration("cpp").RulesMetadata.TryGetValue("ClassComplexity", out var metadata);
+            rulesMetadataCache.GetRulesConfiguration("cpp").RulesMetadata.TryGetValue("S1311", out var metadata);
             using (new AssertionScope())
             {
                 metadata.Type.Should().Be(IssueType.CodeSmell);