Skip to content

fix: cross-platform line ending normalization in CodeFix tests #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Arthurvdv merged 1 commit into from
Jun 16, 2026
Merged

fix: cross-platform line ending normalization in CodeFix tests #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions src/RoslynTestKit/Verify.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using System;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using Microsoft.Dynamics.Nav.CodeAnalysis.CodeActions;
using Microsoft.Dynamics.Nav.CodeAnalysis.Text;
using Microsoft.Dynamics.Nav.CodeAnalysis.Workspaces;
using RoslynTestKit.Utils;

Expand Down Expand Up @@ -35,10 +33,7 @@ public static void CodeAction(CodeAction codeAction, Document document, string e

var sourceText = newDocument.GetTextAsync(CancellationToken.None).GetAwaiter().GetResult();
var mergedDocumentBuilder = new StringBuilder();
var text = ConvertToLineEndingsAwareString(sourceText);

mergedDocumentBuilder.Append(text);

mergedDocumentBuilder.Append(sourceText.ToString());

foreach (var doc in newDocument.Project.Documents.OrderByDescending(x => x.Name))
{
Expand All @@ -47,12 +42,12 @@ public static void CodeAction(CodeAction codeAction, Document document, string e
mergedDocumentBuilder.AppendLine($"{Environment.NewLine}{BaseTestFixture.FileSeparator}");

var docSourceText = doc.GetTextAsync(CancellationToken.None).GetAwaiter().GetResult();
var docText = ConvertToLineEndingsAwareString(sourceText);

mergedDocumentBuilder.Append(docText);
mergedDocumentBuilder.Append(docSourceText.ToString());
}
}
var actualCode = mergedDocumentBuilder.ToString();

var actualCode = NormalizeLineEndings(mergedDocumentBuilder.ToString());
expectedCode = NormalizeLineEndings(expectedCode);

if (actualCode != expectedCode)
{
Expand All @@ -62,17 +57,9 @@ public static void CodeAction(CodeAction codeAction, Document document, string e
}
}

private static string ConvertToLineEndingsAwareString(SourceText sourceText)
private static string NormalizeLineEndings(string text)
{
string text = sourceText.ToString();

if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
text = text.Replace("\r\n", "\n");
}

return text;
return text.Replace("\r\n", "\n");
}
}
}
Loading