From 63c21473805f77392d3f9e96309e916c8401774f Mon Sep 17 00:00:00 2001 From: Julien Couvreur Date: Thu, 30 Jun 2022 11:05:16 -0700 Subject: [PATCH] Test helpers shouldn't escape quotes by default --- src/Compilers/Test/Core/Assert/AssertEx.cs | 2 +- src/Compilers/Test/Core/Compilation/CompilationDifference.cs | 4 ++-- .../Test/Core/Compilation/CompilationTestDataExtensions.cs | 2 +- src/Compilers/Test/Core/CompilationVerifier.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Compilers/Test/Core/Assert/AssertEx.cs b/src/Compilers/Test/Core/Assert/AssertEx.cs index 7cdcdded82c88..66a4af48e0267 100644 --- a/src/Compilers/Test/Core/Assert/AssertEx.cs +++ b/src/Compilers/Test/Core/Assert/AssertEx.cs @@ -555,7 +555,7 @@ public static void AssertEqualToleratingWhitespaceDifferences( string expected, string actual, string message = null, - bool escapeQuotes = true, + bool escapeQuotes = false, [CallerFilePath] string expectedValueSourcePath = null, [CallerLineNumber] int expectedValueSourceLine = 0) { diff --git a/src/Compilers/Test/Core/Compilation/CompilationDifference.cs b/src/Compilers/Test/Core/Compilation/CompilationDifference.cs index 1c2ba92547a86..f47c3972f4c15 100644 --- a/src/Compilers/Test/Core/Compilation/CompilationDifference.cs +++ b/src/Compilers/Test/Core/Compilation/CompilationDifference.cs @@ -62,7 +62,7 @@ public void VerifyIL( [CallerFilePath] string callerPath = null) { string actualIL = ILDelta.GetMethodIL(); - AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedIL, actualIL, escapeQuotes: true, expectedValueSourcePath: callerPath, expectedValueSourceLine: callerLine); + AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedIL, actualIL, escapeQuotes: false, expectedValueSourcePath: callerPath, expectedValueSourceLine: callerLine); } public void VerifyLocalSignature( @@ -96,7 +96,7 @@ internal void VerifyIL( } string actualIL = ILBuilderVisualizer.ILBuilderToString(ilBuilder, mapLocal ?? ToLocalInfo, sequencePointMarkers); - AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedIL, actualIL, escapeQuotes: true, expectedValueSourcePath: callerPath, expectedValueSourceLine: callerLine); + AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedIL, actualIL, escapeQuotes: false, expectedValueSourcePath: callerPath, expectedValueSourceLine: callerLine); } internal string GetMethodIL(string qualifiedMethodName) diff --git a/src/Compilers/Test/Core/Compilation/CompilationTestDataExtensions.cs b/src/Compilers/Test/Core/Compilation/CompilationTestDataExtensions.cs index 0a7d4b5916ba8..f814fe58625cc 100644 --- a/src/Compilers/Test/Core/Compilation/CompilationTestDataExtensions.cs +++ b/src/Compilers/Test/Core/Compilation/CompilationTestDataExtensions.cs @@ -37,7 +37,7 @@ internal static void VerifyIL( expectedIL = expectedIL.Replace(moduleNamePlaceholder, moduleName); } - AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedIL, actualIL, escapeQuotes: true, expectedValueSourcePath: expectedValueSourcePath, expectedValueSourceLine: expectedValueSourceLine); + AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedIL, actualIL, escapeQuotes: false, expectedValueSourcePath: expectedValueSourcePath, expectedValueSourceLine: expectedValueSourceLine); } internal static ImmutableArray> GetExplicitlyDeclaredMethods(this CompilationTestData data) diff --git a/src/Compilers/Test/Core/CompilationVerifier.cs b/src/Compilers/Test/Core/CompilationVerifier.cs index d22002f2ab12d..82a5f9c2209b5 100644 --- a/src/Compilers/Test/Core/CompilationVerifier.cs +++ b/src/Compilers/Test/Core/CompilationVerifier.cs @@ -435,7 +435,7 @@ public CompilationVerifier VerifyIL( [CallerLineNumber] int callerLine = 0, string source = null) { - return VerifyILImpl(qualifiedMethodName, expectedIL, realIL, sequencePoints, callerPath, callerLine, escapeQuotes: true, source: source); + return VerifyILImpl(qualifiedMethodName, expectedIL, realIL, sequencePoints, callerPath, callerLine, escapeQuotes: false, source: source); } public void VerifyILMultiple(params string[] qualifiedMethodNamesAndExpectedIL)