From 6f3a31da9999d1fabb5de05527fa1310be4bf017 Mon Sep 17 00:00:00 2001
From: mary-georgiou-sonarsource <mary.georgiou@sonarsource.com>
Date: Mon, 13 Mar 2023 09:02:19 +0100
Subject: [PATCH] fix remaining failing UTs

---
 .../SonarAnalysisContextBase.cs                |  8 ++++----
 .../SonarAnalysisContextBaseTest.cs            |  4 ++--
 .../Helpers/SonarLintXmlReaderTest.cs          | 18 ++++++++----------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/analyzers/src/SonarAnalyzer.Common/AnalysisContext/SonarAnalysisContextBase.cs b/analyzers/src/SonarAnalyzer.Common/AnalysisContext/SonarAnalysisContextBase.cs
index f94068959a4..9b2779a1cea 100644
--- a/analyzers/src/SonarAnalyzer.Common/AnalysisContext/SonarAnalysisContextBase.cs
+++ b/analyzers/src/SonarAnalyzer.Common/AnalysisContext/SonarAnalysisContextBase.cs
@@ -27,10 +27,10 @@ namespace SonarAnalyzer.AnalysisContext;
 
 public class SonarAnalysisContextBase
 {
-    protected static readonly ConditionalWeakTable<Compilation, ConcurrentDictionary<string, bool>> FileInclusionCache = new();
-    protected static readonly ConditionalWeakTable<Compilation, ImmutableHashSet<string>> UnchangedFilesCache = new();
-    protected static readonly SourceTextValueProvider<ProjectConfigReader> ProjectConfigProvider = new(x => new ProjectConfigReader(x));
-    protected static readonly SourceTextValueProvider<SonarLintXmlReader> SonarLintXmlProvider = new(x => new SonarLintXmlReader(x));
+    private protected static readonly ConditionalWeakTable<Compilation, ConcurrentDictionary<string, bool>> FileInclusionCache = new();
+    private protected static readonly ConditionalWeakTable<Compilation, ImmutableHashSet<string>> UnchangedFilesCache = new();
+    private protected static readonly SourceTextValueProvider<ProjectConfigReader> ProjectConfigProvider = new(x => new ProjectConfigReader(x));
+    private protected static readonly SourceTextValueProvider<SonarLintXmlReader> SonarLintXmlProvider = new(x => new SonarLintXmlReader(x));
 
     protected SonarAnalysisContextBase() { }
 }
diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/AnalysisContext/SonarAnalysisContextBaseTest.cs b/analyzers/tests/SonarAnalyzer.UnitTest/AnalysisContext/SonarAnalysisContextBaseTest.cs
index 4af27bedb6c..0c042c18290 100644
--- a/analyzers/tests/SonarAnalyzer.UnitTest/AnalysisContext/SonarAnalysisContextBaseTest.cs
+++ b/analyzers/tests/SonarAnalyzer.UnitTest/AnalysisContext/SonarAnalysisContextBaseTest.cs
@@ -181,8 +181,8 @@ public void SonarLintFile_LoadsExpectedValues(string language)
         var options = AnalysisScaffolding.CreateOptions($"ResourceTests\\SonarLintXml\\All_properties_{language}\\SonarLint.xml");
         var sut = CreateSut(compilation, options).SonarLintFile();
 
-        sut.IgnoreHeaderComments(language).Should().BeTrue();
-        sut.AnalyzeGeneratedCode(language).Should().BeFalse();
+        sut.IgnoreHeaderComments(analyzerLanguage.ToString()).Should().BeTrue();
+        sut.AnalyzeGeneratedCode(analyzerLanguage.ToString()).Should().BeFalse();
         AssertArrayContent(sut.Exclusions, nameof(sut.Exclusions));
         AssertArrayContent(sut.Inclusions, nameof(sut.Inclusions));
         AssertArrayContent(sut.GlobalExclusions, nameof(sut.GlobalExclusions));
diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/Helpers/SonarLintXmlReaderTest.cs b/analyzers/tests/SonarAnalyzer.UnitTest/Helpers/SonarLintXmlReaderTest.cs
index ef2c140b023..f8dfe8f0560 100644
--- a/analyzers/tests/SonarAnalyzer.UnitTest/Helpers/SonarLintXmlReaderTest.cs
+++ b/analyzers/tests/SonarAnalyzer.UnitTest/Helpers/SonarLintXmlReaderTest.cs
@@ -27,11 +27,11 @@ namespace SonarAnalyzer.UnitTest.Helpers;
 public class SonarLintXmlReaderTest
 {
     [DataTestMethod]
-    [DataRow(LanguageNames.CSharp)]
-    [DataRow(LanguageNames.VisualBasic)]
-    public void SonarLintXmlReader_WhenAllValuesAreSet_ExpectedValues(string language)
+    [DataRow(LanguageNames.CSharp, "cs")]
+    [DataRow(LanguageNames.VisualBasic, "vbnet")]
+    public void SonarLintXmlReader_WhenAllValuesAreSet_ExpectedValues(string language, string xmlLanguageName)
     {
-        var sut = CreateSonarLintXmlReader($"ResourceTests\\SonarLintXml\\All_Properties_{language}\\SonarLint.xml");
+        var sut = CreateSonarLintXmlReader($"ResourceTests\\SonarLintXml\\All_Properties_{xmlLanguageName}\\SonarLint.xml");
         sut.IgnoreHeaderComments(language).Should().BeTrue();
         sut.AnalyzeGeneratedCode(language).Should().BeFalse();
         AssertArrayContent(sut.Exclusions, nameof(sut.Exclusions));
@@ -56,14 +56,12 @@ static void AssertArrayContent(string[] array, string folder)
         }
     }
 
-    [DataTestMethod]
-    [DataRow(LanguageNames.CSharp)]
-    [DataRow(LanguageNames.VisualBasic)]
-    public void SonarLintXmlReader_PartiallyMissingProperties_ExpectedAndDefaultValues(string language)
+    [TestMethod]
+    public void SonarLintXmlReader_PartiallyMissingProperties_ExpectedAndDefaultValues()
     {
         var sut = CreateSonarLintXmlReader("ResourceTests\\SonarLintXml\\Partially_missing_properties\\SonarLint.xml");
-        sut.IgnoreHeaderComments(language).Should().BeFalse();
-        sut.AnalyzeGeneratedCode(language).Should().BeTrue();
+        sut.IgnoreHeaderComments().Should().BeFalse();
+        sut.AnalyzeGeneratedCode().Should().BeTrue();
         AssertArrayContent(sut.Exclusions, nameof(sut.Exclusions));
         AssertArrayContent(sut.Inclusions, nameof(sut.Inclusions));
         sut.GlobalExclusions.Should().NotBeNull().And.HaveCount(0);