Fix more errors

sebastienros · javiercn · commit 24835e4c9963 · 2024-11-11T15:16:41.000-08:00
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs
@@ -29,7 +29,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext.AsSpan(), decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
     }
 
     [ConditionalFact]
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs
@@ -26,7 +26,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext.AsSpan(), decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
     }
 
     [ConditionalFact]
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs
@@ -25,7 +25,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext.AsSpan(), decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
     }
 
     [Fact]
diff --git a/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs b/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs
@@ -44,7 +44,7 @@ public async Task HeaderInRequest_AddCorrectValue()
 
         // Assert
         Assert.Contains("in", CapturedHeaders.Keys);
-        Assert.Equal(new[] { "test" }, CapturedHeaders["in"]);
+        Assert.Equal(new[] { "test" }, CapturedHeaders["in"].ToArray());
     }
 
     [Fact]
@@ -87,9 +87,9 @@ public async Task MultipleHeadersInRequest_AddAllHeaders()
 
         // Assert
         Assert.Contains("in", CapturedHeaders.Keys);
-        Assert.Equal(new[] { "test" }, CapturedHeaders["in"]);
+        Assert.Equal(new[] { "test" }, CapturedHeaders["in"].ToArray());
         Assert.Contains("another", CapturedHeaders.Keys);
-        Assert.Equal(new[] { "test2" }, CapturedHeaders["another"]);
+        Assert.Equal(new[] { "test2" }, CapturedHeaders["another"].ToArray());
     }
 
     [Theory]
@@ -132,7 +132,7 @@ public async Task UsesValueFilter(string[] filterValues, string[] expectedValues
 
         // Assert
         Assert.Contains("in", CapturedHeaders.Keys);
-        Assert.Equal(expectedValues, CapturedHeaders["in"]);
+        Assert.Equal(expectedValues, CapturedHeaders["in"].ToArray());
         Assert.Equal("in", receivedName);
         Assert.Equal(new StringValues("value"), receivedValue);
         Assert.Same(Context, receivedContext);
diff --git a/src/Middleware/OutputCaching/test/OutputCachePoliciesTests.cs b/src/Middleware/OutputCaching/test/OutputCachePoliciesTests.cs
@@ -214,7 +214,7 @@ public async Task VaryByHeadersPolicy_AddsMultipleHeaders()
 
         await policy.CacheRequestAsync(context, default);
 
-        Assert.Equal(headers, context.CacheVaryByRules.HeaderNames);
+        Assert.Equal(headers, context.CacheVaryByRules.HeaderNames.ToArray());
     }
 
     [Fact]
@@ -252,7 +252,7 @@ public async Task VaryByQueryPolicy_AddsMultipleHeaders()
 
         await policy.CacheRequestAsync(context, default);
 
-        Assert.Equal(queries, context.CacheVaryByRules.QueryKeys);
+        Assert.Equal(queries, context.CacheVaryByRules.QueryKeys.ToArray());
     }
 
     [Fact]
@@ -265,7 +265,7 @@ public async Task VaryByQueryPolicy_AddsMultipleHeadersArray()
 
         await policy.CacheRequestAsync(context, default);
 
-        Assert.Equal(queries, context.CacheVaryByRules.QueryKeys);
+        Assert.Equal(queries, context.CacheVaryByRules.QueryKeys.ToArray());
     }
 
     [Fact]
diff --git a/src/Mvc/Mvc.Abstractions/test/ModelBinding/ValueProviderResultTest.cs b/src/Mvc/Mvc.Abstractions/test/ModelBinding/ValueProviderResultTest.cs
@@ -76,7 +76,7 @@ public void Construct_With_Array()
 
         // Assert
         Assert.Equal(2, result.Length);
-        Assert.Equal(new string[] { "Hi", "There" }, result.Values);
+        Assert.Equal(new string[] { "Hi", "There" }, result.Values.ToArray());
         Assert.Equal("Hi", result.FirstValue);
         Assert.NotEqual(ValueProviderResult.None, result);
         Assert.Equal("Hi,There", (string)result);
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs
@@ -179,7 +179,7 @@ public void GetValue_MultiValue()
         var result = valueProvider.GetValue("some");
 
         // Assert
-        Assert.Equal(new[] { "someValue1", "someValue2" }, result.Values);
+        Assert.Equal(new[] { "someValue1", "someValue2" }, result.Values.ToArray());
         Assert.Equal("someValue1,someValue2", (string)result);
         Assert.Equal(culture, result.Culture);
     }
@@ -215,7 +215,7 @@ public void GetValue_NullMultipleValue()
         var result = valueProvider.GetValue("key");
 
         // Assert
-        Assert.Equal(new[] { null, null, "value" }, result.Values);
+        Assert.Equal(new[] { null, null, "value" }, result.Values.ToArray());
     }
 
     [Fact]
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPasswordTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPasswordTest.cs
@@ -44,8 +44,8 @@ public static TheoryData<ViewDataDictionary<PasswordModel>, object> PasswordWith
             var data = new TheoryData<ViewDataDictionary<PasswordModel>, object>();
             foreach (var items in HtmlAttributeData)
             {
-                data.Add(viewData, items[0]);
-                data.Add(nullModelViewData, items[0]);
+                data.Add(viewData, items.ToArray());
+                data.Add(nullModelViewData, items.ToArray());
             }
 
             return data;
diff --git a/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
@@ -245,9 +245,8 @@ public static TheoryData<HtmlEncoder> HtmlEncoderDataLessNull
         get
         {
             var data = new TheoryData<HtmlEncoder>();
-            foreach (var row in HtmlEncoderData)
+            foreach (var encoder in HtmlEncoderData)
             {
-                var encoder = (HtmlEncoder)(row[0]);
                 if (encoder != null)
                 {
                     data.Add(encoder);
diff --git a/src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs
@@ -164,9 +164,8 @@ public static TheoryData<bool, HtmlEncoder> UseCachedResultAndHtmlEncoderData
             var data = new TheoryData<bool, HtmlEncoder>();
             foreach (var useCachedResult in new[] { false, true })
             {
-                foreach (var encoderEntry in HtmlEncoderData)
+                foreach (var encoder in HtmlEncoderData)
                 {
-                    var encoder = (HtmlEncoder)(encoderEntry[0]);
                     data.Add(useCachedResult, encoder);
                 }
             }
diff --git a/src/Security/CookiePolicy/test/CookieChunkingTests.cs b/src/Security/CookiePolicy/test/CookieChunkingTests.cs
@@ -223,7 +223,7 @@ public void DeleteChunkedCookieWithOptions_AllDeleted()
             "TestCookieC5=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
             "TestCookieC6=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
             "TestCookieC7=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
-        }, cookies);
+        }, cookies.ToArray());
     }
 
     [Fact]
@@ -240,7 +240,7 @@ public void DeleteChunkedCookieWithMissingRequestCookies_OnlyPresentCookiesDelet
             "TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
             "TestCookieC1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
             "TestCookieC2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
-        }, cookies);
+        }, cookies.ToArray());
     }
 
     [Fact]
@@ -258,7 +258,7 @@ public void DeleteChunkedCookieWithMissingRequestCookies_StopsAtMissingChunk()
             "TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
             "TestCookieC1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
             "TestCookieC2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
-        }, cookies);
+        }, cookies.ToArray());
     }
 
     [Fact]
@@ -311,6 +311,6 @@ public void DeleteChunkedCookieWithOptionsAndResponseCookies_AllDeleted()
                 "TestCookieC5=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
                 "TestCookieC6=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
                 "TestCookieC7=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension"
-            }, httpContext.Response.Headers[HeaderNames.SetCookie]);
+            }, httpContext.Response.Headers[HeaderNames.SetCookie].ToArray());
     }
 }
diff --git a/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs b/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs
@@ -379,13 +379,13 @@ public void CopyToMovesDataIntoArray()
         Assert.Equal(new StringValues(), entries[0].Value);
 
         Assert.Equal("Host", entries[1].Key);
-        Assert.Equal(new[] { "localhost" }, entries[1].Value);
+        Assert.Equal(new[] { "localhost" }, entries[1].Value.ToArray());
 
         Assert.Equal("Content-Length", entries[2].Key);
-        Assert.Equal(new[] { "0" }, entries[2].Value);
+        Assert.Equal(new[] { "0" }, entries[2].Value.ToArray());
 
         Assert.Equal("custom", entries[3].Key);
-        Assert.Equal(new[] { "value" }, entries[3].Value);
+        Assert.Equal(new[] { "value" }, entries[3].Value.ToArray());
 
         Assert.Null(entries[4].Key);
         Assert.Equal(new StringValues(), entries[4].Value);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void Encrypt_Decrypt_RoundTrips()`
`29`	`29`	`byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);`
`30`	`30`
`31`	`31`	`// Assert`
`32`		`- Assert.Equal(plaintext.AsSpan(), decipheredtext);`
	`32`	`+ Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[ConditionalFact]`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void Encrypt_Decrypt_RoundTrips()`
`26`	`26`	`byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);`
`27`	`27`
`28`	`28`	`// Assert`
`29`		`- Assert.Equal(plaintext.AsSpan(), decipheredtext);`
	`29`	`+ Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[ConditionalFact]`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void Encrypt_Decrypt_RoundTrips()`
`25`	`25`	`byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);`
`26`	`26`
`27`	`27`	`// Assert`
`28`		`- Assert.Equal(plaintext.AsSpan(), decipheredtext);`
	`28`	`+ Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public async Task VaryByHeadersPolicy_AddsMultipleHeaders()`
`214`	`214`
`215`	`215`	`await policy.CacheRequestAsync(context, default);`
`216`	`216`
`217`		`- Assert.Equal(headers, context.CacheVaryByRules.HeaderNames);`
	`217`	`+ Assert.Equal(headers, context.CacheVaryByRules.HeaderNames.ToArray());`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`[Fact]`
`@@ -252,7 +252,7 @@ public async Task VaryByQueryPolicy_AddsMultipleHeaders()`
`252`	`252`
`253`	`253`	`await policy.CacheRequestAsync(context, default);`
`254`	`254`
`255`		`- Assert.Equal(queries, context.CacheVaryByRules.QueryKeys);`
	`255`	`+ Assert.Equal(queries, context.CacheVaryByRules.QueryKeys.ToArray());`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`[Fact]`
`@@ -265,7 +265,7 @@ public async Task VaryByQueryPolicy_AddsMultipleHeadersArray()`
`265`	`265`
`266`	`266`	`await policy.CacheRequestAsync(context, default);`
`267`	`267`
`268`		`- Assert.Equal(queries, context.CacheVaryByRules.QueryKeys);`
	`268`	`+ Assert.Equal(queries, context.CacheVaryByRules.QueryKeys.ToArray());`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public void GetValue_MultiValue()`
`179`	`179`	`var result = valueProvider.GetValue("some");`
`180`	`180`
`181`	`181`	`// Assert`
`182`		`- Assert.Equal(new[] { "someValue1", "someValue2" }, result.Values);`
	`182`	`+ Assert.Equal(new[] { "someValue1", "someValue2" }, result.Values.ToArray());`
`183`	`183`	`Assert.Equal("someValue1,someValue2", (string)result);`
`184`	`184`	`Assert.Equal(culture, result.Culture);`
`185`	`185`	`}`
`@@ -215,7 +215,7 @@ public void GetValue_NullMultipleValue()`
`215`	`215`	`var result = valueProvider.GetValue("key");`
`216`	`216`
`217`	`217`	`// Assert`
`218`		`- Assert.Equal(new[] { null, null, "value" }, result.Values);`
	`218`	`+ Assert.Equal(new[] { null, null, "value" }, result.Values.ToArray());`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ public static TheoryData<ViewDataDictionary<PasswordModel>, object> PasswordWith`
`44`	`44`	`var data = new TheoryData<ViewDataDictionary<PasswordModel>, object>();`
`45`	`45`	`foreach (var items in HtmlAttributeData)`
`46`	`46`	`{`
`47`		`- data.Add(viewData, items[0]);`
`48`		`- data.Add(nullModelViewData, items[0]);`
	`47`	`+ data.Add(viewData, items.ToArray());`
	`48`	`+ data.Add(nullModelViewData, items.ToArray());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`return data;`
Original file line number	Diff line number	Diff line change
`@@ -245,9 +245,8 @@ public static TheoryData<HtmlEncoder> HtmlEncoderDataLessNull`
`245`	`245`	`get`
`246`	`246`	`{`
`247`	`247`	`var data = new TheoryData<HtmlEncoder>();`
`248`		`- foreach (var row in HtmlEncoderData)`
	`248`	`+ foreach (var encoder in HtmlEncoderData)`
`249`	`249`	`{`
`250`		`- var encoder = (HtmlEncoder)(row[0]);`
`251`	`250`	`if (encoder != null)`
`252`	`251`	`{`
`253`	`252`	`data.Add(encoder);`
Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,8 @@ public static TheoryData<bool, HtmlEncoder> UseCachedResultAndHtmlEncoderData`
`164`	`164`	`var data = new TheoryData<bool, HtmlEncoder>();`
`165`	`165`	`foreach (var useCachedResult in new[] { false, true })`
`166`	`166`	`{`
`167`		`- foreach (var encoderEntry in HtmlEncoderData)`
	`167`	`+ foreach (var encoder in HtmlEncoderData)`
`168`	`168`	`{`
`169`		`- var encoder = (HtmlEncoder)(encoderEntry[0]);`
`170`	`169`	`data.Add(useCachedResult, encoder);`
`171`	`170`	`}`
`172`	`171`	`}`