Merge pull request #4785 from Youssef1313/fix-win-only-tests

Fix Windows-only tests
dotnet · Feb 16, 2021 · ea2e171 · ea2e171
2 parents bf1bfab + 169ba3d
commit ea2e171
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/UnitTests/MetaAnalyzers/ReleaseTrackingAnalyzerTests.cs b/src/Microsoft.CodeAnalysis.Analyzers/UnitTests/MetaAnalyzers/ReleaseTrackingAnalyzerTests.cs
@@ -56,7 +56,7 @@ public override void Initialize(AnalysisContext context) {{ }}
             await VerifyCSharpAsync(source, shippedText, unshippedText);
         }
 
-        [WindowsOnlyFact]
+        [Fact]
         public async Task TestCodeFixToEnableAnalyzerReleaseTracking()
         {
             var source = @"

diff --git a/...lyzers/Core/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParameters.cs b/...lyzers/Core/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParameters.cs
@@ -335,8 +335,7 @@ private static string FormatLiteralValues(IEnumerable<string> literalValues)
             {
                 // sanitize the literal to ensure it's not multi-line
                 // replace any newline characters with a space
-                var sanitizedLiteral = literal.Replace(Environment.NewLine, " ");
-                sanitizedLiteral = sanitizedLiteral.Replace((char)13, ' ');
+                var sanitizedLiteral = literal.Replace((char)13, ' ');
                 sanitizedLiteral = sanitizedLiteral.Replace((char)10, ' ');
 
                 if (literals.Length > 0)

diff --git a/...tTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs b/...tTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs
@@ -183,7 +183,7 @@ End Class
 ");
         }
 
-        [WindowsOnlyFact]
+        [Fact]
         public async Task ParameterWithLocalizableAttribute_MultipleLineStringLiteralArgument_Method_Diagnostic()
         {
             await VerifyCS.VerifyAnalyzerAsync(@"
@@ -206,7 +206,7 @@ public void M1(C c)
 }
 ".NormalizeLineEndings(),
                 // Test0.cs(16,13): warning CA1303: Method 'void Test.M1(C c)' passes a literal string as parameter 'param' of a call to 'void C.M(string param)'. Retrieve the following string(s) from a resource table instead: "a a".
-                GetCSharpResultAt(16, 13, "void Test.M1(C c)", "param", "void C.M(string param)", "a a"));
+                GetCSharpResultAt(16, 13, "void Test.M1(C c)", "param", "void C.M(string param)", "a  a"));
 
             await VerifyVB.VerifyAnalyzerAsync(@"
 Imports Microsoft.VisualBasic
@@ -225,7 +225,7 @@ End Sub
 End Class
 ".NormalizeLineEndings(),
                 // Test0.vb(13,13): warning CA1303: Method 'Sub Test.M1(c As C)' passes a literal string as parameter 'param' of a call to 'Sub C.M(param As String)'. Retrieve the following string(s) from a resource table instead: "a a".
-                GetBasicResultAt(13, 13, "Sub Test.M1(c As C)", "param", "Sub C.M(param As String)", "a a"));
+                GetBasicResultAt(13, 13, "Sub Test.M1(c As C)", "param", "Sub C.M(param As String)", "a  a"));
         }
 
         [Fact]
@@ -1793,7 +1793,7 @@ public void M1()
             await csharpTest.RunAsync();
         }
 
-        [WindowsOnlyTheory]
+        [Theory]
         [InlineData(null)]
         [InlineData(PointsToAnalysisKind.None)]
         [InlineData(PointsToAnalysisKind.PartialWithoutTrackingFieldsAndProperties)]
@@ -1834,7 +1834,7 @@ public void M1(C c)
             {
                 csTest.ExpectedDiagnostics.Add(
                     // Test0.cs(17,13): warning CA1303: Method 'void Test.M1(C c)' passes a literal string as parameter 'param' of a call to 'void C.M(string param)'. Retrieve the following string(s) from a resource table instead: "a a".
-                    GetCSharpResultAt(17, 13, "void Test.M1(C c)", "param", "void C.M(string param)", "a a"));
+                    GetCSharpResultAt(17, 13, "void Test.M1(C c)", "param", "void C.M(string param)", "a  a"));
             }
 
             await csTest.RunAsync();
@@ -1866,7 +1866,7 @@ End Class
             {
                 vbTest.ExpectedDiagnostics.Add(
                     // Test0.vb(14,13): warning CA1303: Method 'Sub Test.M1(c As C)' passes a literal string as parameter 'param' of a call to 'Sub C.M(param As String)'. Retrieve the following string(s) from a resource table instead: "a a".
-                    GetBasicResultAt(14, 13, "Sub Test.M1(c As C)", "param", "Sub C.M(param As String)", "a a"));
+                    GetBasicResultAt(14, 13, "Sub Test.M1(c As C)", "param", "Sub C.M(param As String)", "a  a"));
             }
 
             await vbTest.RunAsync();