Skip to content

Commit eca1e64

Browse files
akoeplingerakoeplinger
committed
Fix xUnit2031: Do not use Where clause with Assert.Single
1 parent 70ac261 commit eca1e64

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Logging/FailedHttpRequestLoggingTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ await Assert.ThrowsAsync<HttpRequestException>(async () =>
5050

5151
var messages = sink.Writes.ToArray();
5252

53-
var requestFailedMessage = Assert.Single(messages.Where(m =>
53+
var requestFailedMessage = Assert.Single(messages, m =>
5454
{
5555
return
5656
m.EventId == EventIds.RequestFailed &&
5757
m.LoggerName == InnerLoggerName;
58-
}));
59-
var pipelineFailedMessage = Assert.Single(messages.Where(m =>
58+
});
59+
var pipelineFailedMessage = Assert.Single(messages, m =>
6060
{
6161
return
6262
m.EventId == EventIds.PipelineFailed &&
6363
m.LoggerName == OuterLoggerName;
64-
}));
64+
});
6565
}
6666

6767
private const string ExceptionMessage = "Dummy error message";

‎src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Logging/LoggingUriOutputTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ await RemoteExecutor.Invoke(static async (syncApiStr, scopeHandlerStr) =>
122122

123123
if (scopeHandler)
124124
{
125-
var pipelineStartMessage = Assert.Single(sink.Writes.Where(m => m.EventId == EventIds.PipelineStart));
125+
var pipelineStartMessage = Assert.Single(sink.Writes, m => m.EventId == EventIds.PipelineStart);
126126
Assert.Equal($"HTTP GET {baseUri}?*", pipelineStartMessage.Scope.ToString());
127127
Assert.Equal($"Start processing HTTP request GET {baseUri}?*", pipelineStartMessage.Message);
128128
}
129129
else
130130
{
131-
var requestStartMessage = Assert.Single(sink.Writes.Where(m => m.EventId == EventIds.RequestStart));
131+
var requestStartMessage = Assert.Single(sink.Writes, m => m.EventId == EventIds.RequestStart);
132132
Assert.Equal($"Sending HTTP request GET {baseUri}?*", requestStartMessage.Message);
133133
}
134134
}, syncApi.ToString(), scopeHandler.ToString()).DisposeAsync();
@@ -181,13 +181,13 @@ await RemoteExecutor.Invoke(static async (syncApiStr, disableUriQueryRedactionSt
181181
_ = await client.SendAsync(request);
182182
}
183183

184-
var pipelineStartMessage = Assert.Single(sink.Writes.Where(m =>
184+
var pipelineStartMessage = Assert.Single(sink.Writes, m =>
185185
m.EventId == EventIds.PipelineStart &&
186-
m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler"));
186+
m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler");
187187

188-
var requestStartMessage = Assert.Single(sink.Writes.Where(m =>
188+
var requestStartMessage = Assert.Single(sink.Writes, m =>
189189
m.EventId == EventIds.RequestStart &&
190-
m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler"));
190+
m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler");
191191

192192
string expectedUri = disableUriQueryRedaction ? destinationUri : $"{baseUri}?*";
193193

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ public async Task RedactLoggedHeadersNotCalled_AllValuesAreRedactedBeforeLogging
5656

5757
var messages = sink.Writes.ToArray();
5858

59-
var message = Assert.Single(messages.Where(m =>
59+
var message = Assert.Single(messages, m =>
6060
{
6161
return
6262
m.EventId == EventIds.RequestPipelineRequestHeader &&
6363
m.LoggerName == OuterLoggerName;
64-
}));
64+
});
6565
Assert.StartsWith(LineEndingsHelper.Normalize(
6666
"""
6767
Request Headers:
@@ -70,12 +70,12 @@ public async Task RedactLoggedHeadersNotCalled_AllValuesAreRedactedBeforeLogging
7070
"""),
7171
message.Message);
7272

73-
message = Assert.Single(messages.Where(m =>
73+
message = Assert.Single(messages, m =>
7474
{
7575
return
7676
m.EventId == EventIds.RequestHeader &&
7777
m.LoggerName == InnerLoggerName;
78-
}));
78+
});
7979
Assert.StartsWith(LineEndingsHelper.Normalize(
8080
"""
8181
Request Headers:
@@ -84,12 +84,12 @@ public async Task RedactLoggedHeadersNotCalled_AllValuesAreRedactedBeforeLogging
8484
"""),
8585
message.Message);
8686

87-
message = Assert.Single(messages.Where(m =>
87+
message = Assert.Single(messages, m =>
8888
{
8989
return
9090
m.EventId == EventIds.ResponseHeader &&
9191
m.LoggerName == InnerLoggerName;
92-
}));
92+
});
9393
Assert.StartsWith(LineEndingsHelper.Normalize(
9494
"""
9595
Response Headers:
@@ -98,12 +98,12 @@ public async Task RedactLoggedHeadersNotCalled_AllValuesAreRedactedBeforeLogging
9898
"""),
9999
message.Message);
100100

101-
message = Assert.Single(messages.Where(m =>
101+
message = Assert.Single(messages, m =>
102102
{
103103
return
104104
m.EventId == EventIds.RequestPipelineResponseHeader &&
105105
m.LoggerName == OuterLoggerName;
106-
}));
106+
});
107107
Assert.StartsWith(LineEndingsHelper.Normalize(
108108
"""
109109
Response Headers:
@@ -142,48 +142,48 @@ public async Task RedactHeaderValueWithHeaderList_ValueIsRedactedBeforeLogging()
142142

143143
var messages = sink.Writes.ToArray();
144144

145-
var message = Assert.Single(messages.Where(m =>
145+
var message = Assert.Single(messages, m =>
146146
{
147147
return
148148
m.EventId == EventIds.RequestPipelineRequestHeader &&
149149
m.LoggerName == OuterLoggerName;
150-
}));
150+
});
151151
Assert.StartsWith(LineEndingsHelper.Normalize(
152152
@"Request Headers:
153153
Authorization: *
154154
Cache-Control: no-cache
155155
"), message.Message);
156156

157-
message = Assert.Single(messages.Where(m =>
157+
message = Assert.Single(messages, m =>
158158
{
159159
return
160160
m.EventId == EventIds.RequestHeader &&
161161
m.LoggerName == InnerLoggerName;
162-
}));
162+
});
163163
Assert.StartsWith(LineEndingsHelper.Normalize(
164164
@"Request Headers:
165165
Authorization: *
166166
Cache-Control: no-cache
167167
"), message.Message);
168168

169-
message = Assert.Single(messages.Where(m =>
169+
message = Assert.Single(messages, m =>
170170
{
171171
return
172172
m.EventId == EventIds.ResponseHeader &&
173173
m.LoggerName == InnerLoggerName;
174-
}));
174+
});
175175
Assert.StartsWith(LineEndingsHelper.Normalize(
176176
@"Response Headers:
177177
X-Sensitive: *
178178
Y-Non-Sensitive: innocuous value
179179
"), message.Message);
180180

181-
message = Assert.Single(messages.Where(m =>
181+
message = Assert.Single(messages, m =>
182182
{
183183
return
184184
m.EventId == EventIds.RequestPipelineResponseHeader &&
185185
m.LoggerName == OuterLoggerName;
186-
}));
186+
});
187187
Assert.StartsWith(LineEndingsHelper.Normalize(
188188
@"Response Headers:
189189
X-Sensitive: *
@@ -223,48 +223,48 @@ public async Task RedactHeaderValueWithPredicate_ValueIsRedactedBeforeLogging()
223223

224224
var messages = sink.Writes.ToArray();
225225

226-
var message = Assert.Single(messages.Where(m =>
226+
var message = Assert.Single(messages, m =>
227227
{
228228
return
229229
m.EventId == EventIds.RequestPipelineRequestHeader &&
230230
m.LoggerName == OuterLoggerName;
231-
}));
231+
});
232232
Assert.StartsWith(LineEndingsHelper.Normalize(
233233
@"Request Headers:
234234
Authorization: *
235235
Cache-Control: no-cache
236236
"), message.Message);
237237

238-
message = Assert.Single(messages.Where(m =>
238+
message = Assert.Single(messages, m =>
239239
{
240240
return
241241
m.EventId == EventIds.RequestHeader &&
242242
m.LoggerName == InnerLoggerName;
243-
}));
243+
});
244244
Assert.StartsWith(LineEndingsHelper.Normalize(
245245
@"Request Headers:
246246
Authorization: *
247247
Cache-Control: no-cache
248248
"), message.Message);
249249

250-
message = Assert.Single(messages.Where(m =>
250+
message = Assert.Single(messages, m =>
251251
{
252252
return
253253
m.EventId == EventIds.ResponseHeader &&
254254
m.LoggerName == InnerLoggerName;
255-
}));
255+
});
256256
Assert.StartsWith(LineEndingsHelper.Normalize(
257257
@"Response Headers:
258258
X-Sensitive: *
259259
Y-Non-Sensitive: innocuous value
260260
"), message.Message);
261261

262-
message = Assert.Single(messages.Where(m =>
262+
message = Assert.Single(messages, m =>
263263
{
264264
return
265265
m.EventId == EventIds.RequestPipelineResponseHeader &&
266266
m.LoggerName == OuterLoggerName;
267-
}));
267+
});
268268
Assert.StartsWith(LineEndingsHelper.Normalize(
269269
@"Response Headers:
270270
X-Sensitive: *

0 commit comments

Comments
 (0)