|
1 | 1 | // Licensed to the .NET Foundation under one or more agreements. |
2 | 2 | // The .NET Foundation licenses this file to you under the MIT license. |
3 | 3 |
|
| 4 | +using System; |
4 | 5 | using System.Linq; |
5 | 6 | using System.Net.Http; |
6 | 7 | using System.Net.Http.Headers; |
@@ -50,47 +51,47 @@ public async Task RedactHeaderValueWithHeaderList_ValueIsRedactedBeforeLogging() |
50 | 51 | m.EventId == LoggingScopeHttpMessageHandler.Log.EventIds.RequestHeader && |
51 | 52 | m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler"; |
52 | 53 | })); |
53 | | - Assert.StartsWith( |
| 54 | + Assert.StartsWith(LineEndingsHelper.Normalize( |
54 | 55 | @"Request Headers: |
55 | 56 | Authorization: * |
56 | 57 | Cache-Control: no-cache |
57 | | -", message.Message); |
| 58 | +"), message.Message); |
58 | 59 |
|
59 | 60 | message = Assert.Single(messages.Where(m => |
60 | 61 | { |
61 | 62 | return |
62 | 63 | m.EventId == LoggingHttpMessageHandler.Log.EventIds.RequestHeader && |
63 | 64 | m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler"; |
64 | 65 | })); |
65 | | - Assert.StartsWith( |
| 66 | + Assert.StartsWith(LineEndingsHelper.Normalize( |
66 | 67 | @"Request Headers: |
67 | 68 | Authorization: * |
68 | 69 | Cache-Control: no-cache |
69 | | -", message.Message); |
| 70 | +"), message.Message); |
70 | 71 |
|
71 | 72 | message = Assert.Single(messages.Where(m => |
72 | 73 | { |
73 | 74 | return |
74 | 75 | m.EventId == LoggingHttpMessageHandler.Log.EventIds.ResponseHeader && |
75 | 76 | m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler"; |
76 | 77 | })); |
77 | | - Assert.StartsWith( |
| 78 | + Assert.StartsWith(LineEndingsHelper.Normalize( |
78 | 79 | @"Response Headers: |
79 | 80 | X-Sensitive: * |
80 | 81 | Y-Non-Sensitive: innocuous value |
81 | | -", message.Message); |
| 82 | +"), message.Message); |
82 | 83 |
|
83 | 84 | message = Assert.Single(messages.Where(m => |
84 | 85 | { |
85 | 86 | return |
86 | 87 | m.EventId == LoggingScopeHttpMessageHandler.Log.EventIds.ResponseHeader && |
87 | 88 | m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler"; |
88 | 89 | })); |
89 | | - Assert.StartsWith( |
| 90 | + Assert.StartsWith(LineEndingsHelper.Normalize( |
90 | 91 | @"Response Headers: |
91 | 92 | X-Sensitive: * |
92 | 93 | Y-Non-Sensitive: innocuous value |
93 | | -", message.Message); |
| 94 | +"), message.Message); |
94 | 95 | } |
95 | 96 |
|
96 | 97 | [Fact] |
@@ -131,47 +132,47 @@ public async Task RedactHeaderValueWithPredicate_ValueIsRedactedBeforeLogging() |
131 | 132 | m.EventId == LoggingScopeHttpMessageHandler.Log.EventIds.RequestHeader && |
132 | 133 | m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler"; |
133 | 134 | })); |
134 | | - Assert.StartsWith( |
| 135 | + Assert.StartsWith(LineEndingsHelper.Normalize( |
135 | 136 | @"Request Headers: |
136 | 137 | Authorization: * |
137 | 138 | Cache-Control: no-cache |
138 | | -", message.Message); |
| 139 | +"), message.Message); |
139 | 140 |
|
140 | 141 | message = Assert.Single(messages.Where(m => |
141 | 142 | { |
142 | 143 | return |
143 | 144 | m.EventId == LoggingHttpMessageHandler.Log.EventIds.RequestHeader && |
144 | 145 | m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler"; |
145 | 146 | })); |
146 | | - Assert.StartsWith( |
| 147 | + Assert.StartsWith(LineEndingsHelper.Normalize( |
147 | 148 | @"Request Headers: |
148 | 149 | Authorization: * |
149 | 150 | Cache-Control: no-cache |
150 | | -", message.Message); |
| 151 | +"), message.Message); |
151 | 152 |
|
152 | 153 | message = Assert.Single(messages.Where(m => |
153 | 154 | { |
154 | 155 | return |
155 | 156 | m.EventId == LoggingHttpMessageHandler.Log.EventIds.ResponseHeader && |
156 | 157 | m.LoggerName == "System.Net.Http.HttpClient.test.ClientHandler"; |
157 | 158 | })); |
158 | | - Assert.StartsWith( |
| 159 | + Assert.StartsWith(LineEndingsHelper.Normalize( |
159 | 160 | @"Response Headers: |
160 | 161 | X-Sensitive: * |
161 | 162 | Y-Non-Sensitive: innocuous value |
162 | | -", message.Message); |
| 163 | +"), message.Message); |
163 | 164 |
|
164 | 165 | message = Assert.Single(messages.Where(m => |
165 | 166 | { |
166 | 167 | return |
167 | 168 | m.EventId == LoggingScopeHttpMessageHandler.Log.EventIds.ResponseHeader && |
168 | 169 | m.LoggerName == "System.Net.Http.HttpClient.test.LogicalHandler"; |
169 | 170 | })); |
170 | | - Assert.StartsWith( |
| 171 | + Assert.StartsWith(LineEndingsHelper.Normalize( |
171 | 172 | @"Response Headers: |
172 | 173 | X-Sensitive: * |
173 | 174 | Y-Non-Sensitive: innocuous value |
174 | | -", message.Message); |
| 175 | +"), message.Message); |
175 | 176 | } |
176 | 177 |
|
177 | 178 | private class TestMessageHandler : HttpClientHandler |
|
0 commit comments