Skip to content

Commit 7a8ae19

Browse files
eerhardteerhardt
committed
Flip around where AsSpan is called with string comparisons in tests.
1 parent 540cf1a commit 7a8ae19

File tree

15 files changed

+136
-136
lines changed

15 files changed

+136
-136
lines changed

‎src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ public void Encrypt_KnownKey()
100100
// | 00 00 00 00 (postBuffer)
101101

102102
string retValAsString = Convert.ToBase64String(retVal);
103-
Assert.Equal("AAAAAAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaG0O2kY0NZtmh2UQtXY5B2jlgnOgAAAAA".AsSpan(), retValAsString);
103+
Assert.Equal("AAAAAAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaG0O2kY0NZtmh2UQtXY5B2jlgnOgAAAAA", retValAsString);
104104
}
105105
}

‎src/Http/Headers/test/CacheControlHeaderValueTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public void Properties_SetAndGetAllProperties_SetValueReturnedInGetter()
4747
Assert.Throws<FormatException>(() => cacheControl.NoCacheHeaders.Add("invalid PLACEHOLDER"));
4848
cacheControl.NoCacheHeaders.Add("PLACEHOLDER");
4949
Assert.Single(cacheControl.NoCacheHeaders);
50-
Assert.Equal("PLACEHOLDER".AsSpan(), cacheControl.NoCacheHeaders.First());
50+
Assert.Equal("PLACEHOLDER", cacheControl.NoCacheHeaders.First().AsSpan());
5151

5252
Assert.NotNull(cacheControl.PrivateHeaders);
5353
Assert.Throws<ArgumentException>(() => cacheControl.PrivateHeaders.Add(null));
5454
Assert.Throws<FormatException>(() => cacheControl.PrivateHeaders.Add("invalid PLACEHOLDER"));
5555
cacheControl.PrivateHeaders.Add("PLACEHOLDER");
5656
Assert.Single(cacheControl.PrivateHeaders);
57-
Assert.Equal("PLACEHOLDER".AsSpan(), cacheControl.PrivateHeaders.First());
57+
Assert.Equal("PLACEHOLDER", cacheControl.PrivateHeaders.First().AsSpan());
5858

5959
// NameValueHeaderValue collection property
6060
Assert.NotNull(cacheControl.Extensions);

‎src/Http/Headers/test/ContentDispositionHeaderValueTest.cs

Lines changed: 47 additions & 47 deletions
Large diffs are not rendered by default.

‎src/Http/Headers/test/ContentRangeHeaderValueTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void Ctor_LengthOnlyOverloadValidValues_ValuesCorrectlySet()
1818

1919
Assert.False(range.HasRange, "HasRange");
2020
Assert.True(range.HasLength, "HasLength");
21-
Assert.Equal("bytes".AsSpan(), range.Unit);
21+
Assert.Equal("bytes", range.Unit.AsSpan());
2222
Assert.Null(range.From);
2323
Assert.Null(range.To);
2424
Assert.Equal(5, range.Length);
@@ -39,7 +39,7 @@ public void Ctor_FromAndToOverloadValidValues_ValuesCorrectlySet()
3939

4040
Assert.True(range.HasRange, "HasRange");
4141
Assert.False(range.HasLength, "HasLength");
42-
Assert.Equal("bytes".AsSpan(), range.Unit);
42+
Assert.Equal("bytes", range.Unit.AsSpan());
4343
Assert.Equal(0, range.From);
4444
Assert.Equal(1, range.To);
4545
Assert.Null(range.Length);
@@ -63,7 +63,7 @@ public void Ctor_FromToAndLengthOverloadValidValues_ValuesCorrectlySet()
6363

6464
Assert.True(range.HasRange, "HasRange");
6565
Assert.True(range.HasLength, "HasLength");
66-
Assert.Equal("bytes".AsSpan(), range.Unit);
66+
Assert.Equal("bytes", range.Unit.AsSpan());
6767
Assert.Equal(0, range.From);
6868
Assert.Equal(1, range.To);
6969
Assert.Equal(2, range.Length);
@@ -74,7 +74,7 @@ public void Unit_GetAndSetValidAndInvalidValues_MatchExpectation()
7474
{
7575
var range = new ContentRangeHeaderValue(0);
7676
range.Unit = "myunit";
77-
Assert.Equal("myunit".AsSpan(), range.Unit);
77+
Assert.Equal("myunit", range.Unit.AsSpan());
7878

7979
Assert.Throws<ArgumentException>(() => range.Unit = null);
8080
Assert.Throws<ArgumentException>(() => range.Unit = "");
@@ -156,7 +156,7 @@ public void Parse_SetOfValidValueStrings_ParsedCorrectly()
156156
// Note that we don't have a public constructor for value 'bytes */*' since the RFC doesn't mention a
157157
// scenario for it. However, if a server returns this value, we're flexible and accept it.
158158
var result = ContentRangeHeaderValue.Parse("bytes */*");
159-
Assert.Equal("bytes".AsSpan(), result.Unit);
159+
Assert.Equal("bytes", result.Unit.AsSpan());
160160
Assert.Null(result.From);
161161
Assert.Null(result.To);
162162
Assert.Null(result.Length);
@@ -187,7 +187,7 @@ public void TryParse_SetOfValidValueStrings_ParsedCorrectly()
187187
// Note that we don't have a public constructor for value 'bytes */*' since the RFC doesn't mention a
188188
// scenario for it. However, if a server returns this value, we're flexible and accept it.
189189
Assert.True(ContentRangeHeaderValue.TryParse("bytes */*", out var result));
190-
Assert.Equal("bytes".AsSpan(), result.Unit);
190+
Assert.Equal("bytes", result.Unit.AsSpan());
191191
Assert.Null(result.From);
192192
Assert.Null(result.To);
193193
Assert.Null(result.Length);

‎src/Http/Headers/test/CookieHeaderValueTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ public void CookieHeaderValue_CtorThrowsOnInvalidValue(string value)
172172
public void CookieHeaderValue_Ctor1_InitializesCorrectly()
173173
{
174174
var header = new CookieHeaderValue("cookie");
175-
Assert.Equal("cookie".AsSpan(), header.Name);
176-
Assert.Equal(string.Empty.AsSpan(), header.Value);
175+
Assert.Equal("cookie", header.Name.AsSpan());
176+
Assert.Equal(string.Empty, header.Value.AsSpan());
177177
}
178178

179179
[Theory]
@@ -183,18 +183,18 @@ public void CookieHeaderValue_Ctor1_InitializesCorrectly()
183183
public void CookieHeaderValue_Ctor2InitializesCorrectly(string name, string value)
184184
{
185185
var header = new CookieHeaderValue(name, value);
186-
Assert.Equal(name.AsSpan(), header.Name);
187-
Assert.Equal(value.AsSpan(), header.Value);
186+
Assert.Equal(name, header.Name.AsSpan());
187+
Assert.Equal(value, header.Value.AsSpan());
188188
}
189189

190190
[Fact]
191191
public void CookieHeaderValue_Value()
192192
{
193193
var cookie = new CookieHeaderValue("name");
194-
Assert.Equal(string.Empty.AsSpan(), cookie.Value);
194+
Assert.Equal(string.Empty, cookie.Value.AsSpan());
195195

196196
cookie.Value = "value1";
197-
Assert.Equal("value1".AsSpan(), cookie.Value);
197+
Assert.Equal("value1", cookie.Value.AsSpan());
198198
}
199199

200200
[Theory]

‎src/Http/Headers/test/MediaTypeHeaderValueTest.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void MatchesAllSubTypesWithoutSuffix_ReturnsExpectedResult(string value,
102102
public void Ctor_MediaTypeValidFormat_SuccessfullyCreated()
103103
{
104104
var mediaType = new MediaTypeHeaderValue("text/plain");
105-
Assert.Equal("text/plain".AsSpan(), mediaType.MediaType);
105+
Assert.Equal("text/plain", mediaType.MediaType.AsSpan());
106106
Assert.Empty(mediaType.Parameters);
107107
Assert.Null(mediaType.Charset.Value);
108108
}
@@ -112,7 +112,7 @@ public void Ctor_AddNameAndQuality_QualityParameterAdded()
112112
{
113113
var mediaType = new MediaTypeHeaderValue("application/xml", 0.08);
114114
Assert.Equal(0.08, mediaType.Quality);
115-
Assert.Equal("application/xml".AsSpan(), mediaType.MediaType);
115+
Assert.Equal("application/xml", mediaType.MediaType.AsSpan());
116116
Assert.Single(mediaType.Parameters);
117117
}
118118

@@ -221,20 +221,20 @@ public void CopyFromReadOnly_WithParameters_CopiedAsNonReadOnly()
221221
public void MediaType_SetAndGetMediaType_MatchExpectations()
222222
{
223223
var mediaType = new MediaTypeHeaderValue("text/plain");
224-
Assert.Equal("text/plain".AsSpan(), mediaType.MediaType);
224+
Assert.Equal("text/plain", mediaType.MediaType.AsSpan());
225225

226226
mediaType.MediaType = "application/xml";
227-
Assert.Equal("application/xml".AsSpan(), mediaType.MediaType);
227+
Assert.Equal("application/xml", mediaType.MediaType.AsSpan());
228228
}
229229

230230
[Fact]
231231
public void Charset_SetCharsetAndValidateObject_ParametersEntryForCharsetAdded()
232232
{
233233
var mediaType = new MediaTypeHeaderValue("text/plain");
234234
mediaType.Charset = "mycharset";
235-
Assert.Equal("mycharset".AsSpan(), mediaType.Charset);
235+
Assert.Equal("mycharset", mediaType.Charset.AsSpan());
236236
Assert.Single(mediaType.Parameters);
237-
Assert.Equal("charset".AsSpan(), mediaType.Parameters.First().Name);
237+
Assert.Equal("charset", mediaType.Parameters.First().Name.AsSpan());
238238

239239
mediaType.Charset = null;
240240
Assert.Null(mediaType.Charset.Value);
@@ -251,12 +251,12 @@ public void Charset_AddCharsetParameterThenUseProperty_ParametersEntryIsOverwrit
251251
var charset = new NameValueHeaderValue("CHARSET", "old_charset");
252252
mediaType.Parameters.Add(charset);
253253
Assert.Single(mediaType.Parameters);
254-
Assert.Equal("CHARSET".AsSpan(), mediaType.Parameters.First().Name);
254+
Assert.Equal("CHARSET", mediaType.Parameters.First().Name.AsSpan());
255255

256256
mediaType.Charset = "new_charset";
257-
Assert.Equal("new_charset".AsSpan(), mediaType.Charset);
257+
Assert.Equal("new_charset", mediaType.Charset.AsSpan());
258258
Assert.Single(mediaType.Parameters);
259-
Assert.Equal("CHARSET".AsSpan(), mediaType.Parameters.First().Name);
259+
Assert.Equal("CHARSET", mediaType.Parameters.First().Name.AsSpan());
260260

261261
mediaType.Parameters.Remove(charset);
262262
Assert.Null(mediaType.Charset.Value);
@@ -269,8 +269,8 @@ public void Quality_SetCharsetAndValidateObject_ParametersEntryForCharsetAdded()
269269
mediaType.Quality = 0.563156454;
270270
Assert.Equal(0.563, mediaType.Quality);
271271
Assert.Single(mediaType.Parameters);
272-
Assert.Equal("q".AsSpan(), mediaType.Parameters.First().Name);
273-
Assert.Equal("0.563".AsSpan(), mediaType.Parameters.First().Value);
272+
Assert.Equal("q", mediaType.Parameters.First().Name.AsSpan());
273+
Assert.Equal("0.563", mediaType.Parameters.First().Value.AsSpan());
274274

275275
mediaType.Quality = null;
276276
Assert.Null(mediaType.Quality);
@@ -286,13 +286,13 @@ public void Quality_AddQualityParameterThenUseProperty_ParametersEntryIsOverwrit
286286
var quality = new NameValueHeaderValue("q", "0.132");
287287
mediaType.Parameters.Add(quality);
288288
Assert.Single(mediaType.Parameters);
289-
Assert.Equal("q".AsSpan(), mediaType.Parameters.First().Name);
289+
Assert.Equal("q", mediaType.Parameters.First().Name.AsSpan());
290290
Assert.Equal(0.132, mediaType.Quality);
291291

292292
mediaType.Quality = 0.9;
293293
Assert.Equal(0.9, mediaType.Quality);
294294
Assert.Single(mediaType.Parameters);
295-
Assert.Equal("q".AsSpan(), mediaType.Parameters.First().Name);
295+
Assert.Equal("q", mediaType.Parameters.First().Name.AsSpan());
296296

297297
mediaType.Parameters.Remove(quality);
298298
Assert.Null(mediaType.Quality);
@@ -306,7 +306,7 @@ public void Quality_AddQualityParameterUpperCase_CaseInsensitiveComparison()
306306
var quality = new NameValueHeaderValue("Q", "0.132");
307307
mediaType.Parameters.Add(quality);
308308
Assert.Single(mediaType.Parameters);
309-
Assert.Equal("Q".AsSpan(), mediaType.Parameters.First().Name);
309+
Assert.Equal("Q", mediaType.Parameters.First().Name.AsSpan());
310310
Assert.Equal(0.132, mediaType.Quality);
311311
}
312312

‎src/Http/Headers/test/NameValueHeaderValueTest.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Ctor_NameInvalidFormat_ThrowFormatException()
2929
public void Ctor_NameValidFormat_SuccessfullyCreated()
3030
{
3131
var nameValue = new NameValueHeaderValue("text", null);
32-
Assert.Equal("text".AsSpan(), nameValue.Name);
32+
Assert.Equal("text", nameValue.Name.AsSpan());
3333
}
3434

3535
[Fact]
@@ -66,7 +66,7 @@ public void Copy_NameOnly_SuccessfullyCopied()
6666

6767
// Change one value and verify the other is unchanged.
6868
pair0.Value = "othervalue";
69-
Assert.Equal("othervalue".AsSpan(), pair0.Value);
69+
Assert.Equal("othervalue", pair0.Value.AsSpan());
7070
Assert.Null(pair1.Value.Value);
7171
}
7272

@@ -84,7 +84,7 @@ public void CopyAsReadOnly_NameOnly_CopiedAndReadOnly()
8484

8585
// Change one value and verify the other is unchanged.
8686
pair0.Value = "othervalue";
87-
Assert.Equal("othervalue".AsSpan(), pair0.Value);
87+
Assert.Equal("othervalue", pair0.Value.AsSpan());
8888
Assert.Null(pair1.Value.Value);
8989
Assert.Throws<InvalidOperationException>(() => { pair1.Value = "othervalue"; });
9090
}
@@ -100,8 +100,8 @@ public void Copy_NameAndValue_SuccessfullyCopied()
100100

101101
// Change one value and verify the other is unchanged.
102102
pair0.Value = "othervalue";
103-
Assert.Equal("othervalue".AsSpan(), pair0.Value);
104-
Assert.Equal("value".AsSpan(), pair1.Value);
103+
Assert.Equal("othervalue", pair0.Value.AsSpan());
104+
Assert.Equal("value", pair1.Value.AsSpan());
105105
}
106106

107107
[Fact]
@@ -117,8 +117,8 @@ public void CopyAsReadOnly_NameAndValue_CopiedAndReadOnly()
117117

118118
// Change one value and verify the other is unchanged.
119119
pair0.Value = "othervalue";
120-
Assert.Equal("othervalue".AsSpan(), pair0.Value);
121-
Assert.Equal("value".AsSpan(), pair1.Value);
120+
Assert.Equal("othervalue", pair0.Value.AsSpan());
121+
Assert.Equal("value", pair1.Value.AsSpan());
122122
Assert.Throws<InvalidOperationException>(() => { pair1.Value = "othervalue"; });
123123
}
124124

@@ -134,8 +134,8 @@ public void CopyFromReadOnly_NameAndValue_CopiedAsNonReadOnly()
134134

135135
// Change one value and verify the other is unchanged.
136136
pair2.Value = "othervalue";
137-
Assert.Equal("othervalue".AsSpan(), pair2.Value);
138-
Assert.Equal("value".AsSpan(), pair1.Value);
137+
Assert.Equal("othervalue", pair2.Value.AsSpan());
138+
Assert.Equal("value", pair1.Value.AsSpan());
139139
}
140140

141141
[Fact]

‎src/Http/Headers/test/RangeHeaderValueTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void Unit_GetAndSetValidAndInvalidValues_MatchExpectation()
1616
{
1717
var range = new RangeHeaderValue();
1818
range.Unit = "myunit";
19-
Assert.Equal("myunit".AsSpan(), range.Unit);
19+
Assert.Equal("myunit", range.Unit.AsSpan());
2020

2121
Assert.Throws<ArgumentException>(() => range.Unit = null);
2222
Assert.Throws<ArgumentException>(() => range.Unit = "");

‎src/Http/Headers/test/SetCookieHeaderValueTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public void SetCookieHeaderValue_CtorThrowsOnInvalidValue(string value)
318318
public void SetCookieHeaderValue_Ctor1_InitializesCorrectly()
319319
{
320320
var header = new SetCookieHeaderValue("cookie");
321-
Assert.Equal("cookie".AsSpan(), header.Name);
321+
Assert.Equal("cookie", header.Name.AsSpan());
322322
Assert.Equal(string.Empty.AsSpan(), header.Value);
323323
}
324324

@@ -340,7 +340,7 @@ public void SetCookieHeaderValue_Value()
340340
Assert.Equal(string.Empty.AsSpan(), cookie.Value);
341341

342342
cookie.Value = "value1";
343-
Assert.Equal("value1".AsSpan(), cookie.Value);
343+
Assert.Equal("value1", cookie.Value.AsSpan());
344344
}
345345

346346
[Theory]

‎src/Http/Headers/test/StringWithQualityHeaderValueTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class StringWithQualityHeaderValueTest
99
public void Ctor_StringOnlyOverload_MatchExpectation()
1010
{
1111
var value = new StringWithQualityHeaderValue("token");
12-
Assert.Equal("token".AsSpan(), value.Value);
12+
Assert.Equal("token", value.Value.AsSpan());
1313
Assert.Null(value.Quality);
1414

1515
Assert.Throws<ArgumentException>(() => new StringWithQualityHeaderValue(null));
@@ -21,7 +21,7 @@ public void Ctor_StringOnlyOverload_MatchExpectation()
2121
public void Ctor_StringWithQualityOverload_MatchExpectation()
2222
{
2323
var value = new StringWithQualityHeaderValue("token", 0.5);
24-
Assert.Equal("token".AsSpan(), value.Value);
24+
Assert.Equal("token", value.Value.AsSpan());
2525
Assert.Equal(0.5, value.Quality);
2626

2727
Assert.Throws<ArgumentException>(() => new StringWithQualityHeaderValue(null, 0.1));

0 commit comments

Comments
 (0)