Skip to content

Tests on linux fail because of hardcoded line-endings #1562

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

Open
PatrickDahlin wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Tests on linux fail because of hardcoded line-endings #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
462ef05
Fix line-ending handling for tests on linux
PatrickDahlin Feb 22, 2026
1d0d47d
Removed erraneous using
PatrickDahlin Feb 22, 2026
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
6 changes: 3 additions & 3 deletions test/Microsoft.AspNetCore.OData.Tests/Commons/ExceptionAssert.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public static ArgumentOutOfRangeException ThrowsArgumentOutOfRange(Action testCo
exceptionMessage = exceptionMessage + " (Parameter '" + paramName + "')";
if (actualValue != null)
{
exceptionMessage += string.Format(CultureInfo.CurrentCulture, "\r\nActual value was {0}.", actualValue);
exceptionMessage += string.Format(CultureInfo.CurrentCulture, Environment.NewLine + "Actual value was {0}.", actualValue);
}
}

Expand Down Expand Up @@ -545,11 +545,11 @@ private static void VerifyExceptionMessage(Exception exception, string expectedM
{
if (!partialMatch)
{
Assert.Equal(expectedMessage, exception.Message);
Assert.Equal(expectedMessage.ReplaceLineEndings(), exception.Message.ReplaceLineEndings());
}
else
{
Assert.Contains(expectedMessage, exception.Message);
Assert.Contains(expectedMessage.ReplaceLineEndings(), exception.Message.ReplaceLineEndings());
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/Microsoft.AspNetCore.OData.Tests/Extensions/SerializableErrorExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void CreateODataError_Creates_ODataError_UsingModelStateDictionary()

// Assert
Assert.NotNull(error);
Assert.Equal("key1:\r\nTest Error 1\r\nTest Error 2\r\n\r\nkey3:\r\nTest Error 3", error.Message);
Assert.Equal("key1:\r\nTest Error 1\r\nTest Error 2\r\n\r\nkey3:\r\nTest Error 3", error.Message, ignoreLineEndingDifferences: true);
Assert.Null(error.Code);
Assert.Null(error.InnerError);
Assert.Equal(3, error.Details.Count);
Expand All @@ -63,11 +63,11 @@ public void CreateODataError_Creates_BasicODataError_WithoutModelStateDictionary

// Assert
Assert.NotNull(error);
Assert.Equal("key1:\r\nTest Error 1\r\n\r\nkey2:\r\nTest Error 2", error.Message);
Assert.Equal("key1:\r\nTest Error 1\r\n\r\nkey2:\r\nTest Error 2", error.Message, ignoreLineEndingDifferences: true);
Assert.Null(error.Code);
Assert.True(error.InnerError.Properties.TryGetValue(SerializableErrorKeys.MessageKey, out ODataValue odataValue));
var exceptionMessage = Assert.IsType<ODataPrimitiveValue>(odataValue).Value as string;
Assert.Equal("key3:\r\nTest Error 3", exceptionMessage);
Assert.Equal("key3:\r\nTest Error 3", exceptionMessage, ignoreLineEndingDifferences: true);
Assert.Equal(2, error.Details.Count);
}

Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.AspNetCore.OData.Tests/Results/PageResultOfTTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void CtorPageResultOfT_ThrowsArgumentOutOfRange_NegativeCount()

// Assert
ArgumentOutOfRangeException exception = ExceptionAssert.Throws<ArgumentOutOfRangeException>(test);
Assert.Contains("Value must be greater than or equal to 0. (Parameter 'value')\r\nActual value was -1.", exception.Message);
Assert.Contains("Value must be greater than or equal to 0. (Parameter 'value')\r\nActual value was -1.".ReplaceLineEndings(), exception.Message);
}

[Fact]
Expand Down