Skip to content

Commit 82b46c9

Browse files
authored
[tests] Fix CRLF issues in M.E.Http (#52707)
Fixes: #52008 When running `Microsoft.Extensions.Http` tests on windows and targeting `Browser`, the line ending differs between host and target systems. Use helper `LineEndingsHelper.Normalize` method to update expected strings. The `Browser` Environment.NewLine is `\n`, while windows use `\r\n`. https://github.com/dotnet/runtime/blob/5bd0edfe860e41bdfd690d3743e730594307292e/src/libraries/System.Private.CoreLib/src/System/Environment.UnixOrBrowser.cs#L51
1 parent 51b85b2 commit 82b46c9

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Logging/RedactedLogValueIntegrationTest.cs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
using System;
45
using System.Linq;
56
using System.Net.Http;
67
using System.Net.Http.Headers;
@@ -50,47 +51,47 @@ public async Task RedactHeaderValueWithHeaderList_ValueIsRedactedBeforeLogging()
5051
m.EventId == LoggingScopeHttpMessageHandler.Log.EventIds.RequestHeader &&
5152
m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler";
5253
}));
53-
Assert.StartsWith(
54+
Assert.StartsWith(LineEndingsHelper.Normalize(
5455
@"Request Headers:
5556
Authorization: *
5657
Cache-Control: no-cache
57-
", message.Message);
58+
"), message.Message);
5859

5960
message = Assert.Single(messages.Where(m =>
6061
{
6162
return
6263
m.EventId == LoggingHttpMessageHandler.Log.EventIds.RequestHeader &&
6364
m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler";
6465
}));
65-
Assert.StartsWith(
66+
Assert.StartsWith(LineEndingsHelper.Normalize(
6667
@"Request Headers:
6768
Authorization: *
6869
Cache-Control: no-cache
69-
", message.Message);
70+
"), message.Message);
7071

7172
message = Assert.Single(messages.Where(m =>
7273
{
7374
return
7475
m.EventId == LoggingHttpMessageHandler.Log.EventIds.ResponseHeader &&
7576
m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler";
7677
}));
77-
Assert.StartsWith(
78+
Assert.StartsWith(LineEndingsHelper.Normalize(
7879
@"Response Headers:
7980
X-Sensitive: *
8081
Y-Non-Sensitive: innocuous value
81-
", message.Message);
82+
"), message.Message);
8283

8384
message = Assert.Single(messages.Where(m =>
8485
{
8586
return
8687
m.EventId == LoggingScopeHttpMessageHandler.Log.EventIds.ResponseHeader &&
8788
m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler";
8889
}));
89-
Assert.StartsWith(
90+
Assert.StartsWith(LineEndingsHelper.Normalize(
9091
@"Response Headers:
9192
X-Sensitive: *
9293
Y-Non-Sensitive: innocuous value
93-
", message.Message);
94+
"), message.Message);
9495
}
9596

9697
[Fact]
@@ -131,47 +132,47 @@ public async Task RedactHeaderValueWithPredicate_ValueIsRedactedBeforeLogging()
131132
m.EventId == LoggingScopeHttpMessageHandler.Log.EventIds.RequestHeader &&
132133
m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler";
133134
}));
134-
Assert.StartsWith(
135+
Assert.StartsWith(LineEndingsHelper.Normalize(
135136
@"Request Headers:
136137
Authorization: *
137138
Cache-Control: no-cache
138-
", message.Message);
139+
"), message.Message);
139140

140141
message = Assert.Single(messages.Where(m =>
141142
{
142143
return
143144
m.EventId == LoggingHttpMessageHandler.Log.EventIds.RequestHeader &&
144145
m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler";
145146
}));
146-
Assert.StartsWith(
147+
Assert.StartsWith(LineEndingsHelper.Normalize(
147148
@"Request Headers:
148149
Authorization: *
149150
Cache-Control: no-cache
150-
", message.Message);
151+
"), message.Message);
151152

152153
message = Assert.Single(messages.Where(m =>
153154
{
154155
return
155156
m.EventId == LoggingHttpMessageHandler.Log.EventIds.ResponseHeader &&
156157
m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler";
157158
}));
158-
Assert.StartsWith(
159+
Assert.StartsWith(LineEndingsHelper.Normalize(
159160
@"Response Headers:
160161
X-Sensitive: *
161162
Y-Non-Sensitive: innocuous value
162-
", message.Message);
163+
"), message.Message);
163164

164165
message = Assert.Single(messages.Where(m =>
165166
{
166167
return
167168
m.EventId == LoggingScopeHttpMessageHandler.Log.EventIds.ResponseHeader &&
168169
m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler";
169170
}));
170-
Assert.StartsWith(
171+
Assert.StartsWith(LineEndingsHelper.Normalize(
171172
@"Response Headers:
172173
X-Sensitive: *
173174
Y-Non-Sensitive: innocuous value
174-
", message.Message);
175+
"), message.Message);
175176
}
176177

177178
private class TestMessageHandler : HttpClientHandler

src/libraries/tests.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@
315315

316316
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BrowserHost)' == 'windows' and '$(RunDisabledWasmTestsOnWindows)' != 'true'">
317317
<!-- Issue: https://github.com/dotnet/runtime/issues/52138 -->
318-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Http\tests\Microsoft.Extensions.Http.Tests\Microsoft.Extensions.Http.Tests.csproj" />
319318
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests/System.Text.Json.Tests.csproj" />
320319
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Compression\tests\System.IO.Compression.Tests.csproj" />
321320
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Compression.ZipFile\tests\System.IO.Compression.ZipFile.Tests.csproj" />

0 commit comments

Comments
 (0)