From 8a1b7251dcd03fe50a75858bcd56bdeeb8909ca2 Mon Sep 17 00:00:00 2001 From: Miha Zupan Date: Tue, 22 Oct 2024 13:59:36 +0200 Subject: [PATCH] Use the correct Assert.Single overload --- .../ConfigProvider/ConfigurationConfigProviderTests.cs | 6 +++--- .../Management/ProxyConfigManagerTests.cs | 4 ++-- .../Transforms/RequestHeadersTransformExtensionsTests.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/ReverseProxy.Tests/Configuration/ConfigProvider/ConfigurationConfigProviderTests.cs b/test/ReverseProxy.Tests/Configuration/ConfigProvider/ConfigurationConfigProviderTests.cs index 4c00d7e5e..aa2fa2f8a 100644 --- a/test/ReverseProxy.Tests/Configuration/ConfigProvider/ConfigurationConfigProviderTests.cs +++ b/test/ReverseProxy.Tests/Configuration/ConfigProvider/ConfigurationConfigProviderTests.cs @@ -523,7 +523,7 @@ private void VerifyValidAbstractConfig(IProxyConfig validConfig, IProxyConfig ab Assert.Equal(2, abstractConfig.Clusters.Count); var cluster1 = validConfig.Clusters.First(c => c.ClusterId == "cluster1"); - Assert.Single(abstractConfig.Clusters.Where(c => c.ClusterId == "cluster1")); + Assert.Single(abstractConfig.Clusters, c => c.ClusterId == "cluster1"); var abstractCluster1 = abstractConfig.Clusters.Single(c => c.ClusterId == "cluster1"); Assert.Equal(cluster1.Destinations["destinationA"].Address, abstractCluster1.Destinations["destinationA"].Address); Assert.Equal(cluster1.Destinations["destinationA"].Health, abstractCluster1.Destinations["destinationA"].Health); @@ -569,7 +569,7 @@ private void VerifyValidAbstractConfig(IProxyConfig validConfig, IProxyConfig ab Assert.Equal(cluster1.Metadata, abstractCluster1.Metadata); var cluster2 = validConfig.Clusters.First(c => c.ClusterId == "cluster2"); - Assert.Single(abstractConfig.Clusters.Where(c => c.ClusterId == "cluster2")); + Assert.Single(abstractConfig.Clusters, c => c.ClusterId == "cluster2"); var abstractCluster2 = abstractConfig.Clusters.Single(c => c.ClusterId == "cluster2"); Assert.Equal(cluster2.Destinations["destinationC"].Address, abstractCluster2.Destinations["destinationC"].Address); Assert.Equal(cluster2.Destinations["destinationC"].Metadata, abstractCluster2.Destinations["destinationC"].Metadata); @@ -588,7 +588,7 @@ private void VerifyValidAbstractConfig(IProxyConfig validConfig, IProxyConfig ab private void VerifyRoute(IProxyConfig validConfig, IProxyConfig abstractConfig, string routeId) { var route = validConfig.Routes.Single(c => c.RouteId == routeId); - Assert.Single(abstractConfig.Routes.Where(c => c.RouteId == routeId)); + Assert.Single(abstractConfig.Routes, r => r.RouteId == routeId); var abstractRoute = abstractConfig.Routes.Single(c => c.RouteId == routeId); Assert.Equal(route.ClusterId, abstractRoute.ClusterId); Assert.Equal(route.Order, abstractRoute.Order); diff --git a/test/ReverseProxy.Tests/Management/ProxyConfigManagerTests.cs b/test/ReverseProxy.Tests/Management/ProxyConfigManagerTests.cs index afc893e19..c0514661f 100644 --- a/test/ReverseProxy.Tests/Management/ProxyConfigManagerTests.cs +++ b/test/ReverseProxy.Tests/Management/ProxyConfigManagerTests.cs @@ -1200,7 +1200,7 @@ public async Task LoadAsync_ConfigFilterConfiguresCluster_Works() Assert.NotNull(dataSource); Assert.Equal(2, dataSource.Endpoints.Count); - var endpoint1 = Assert.Single(dataSource.Endpoints.Where(x => x.DisplayName == "route1")); + var endpoint1 = Assert.Single(dataSource.Endpoints, e => e.DisplayName == "route1"); var routeConfig1 = endpoint1.Metadata.GetMetadata(); Assert.Equal(47, routeConfig1.Config.Order); var clusterState1 = routeConfig1.Cluster; @@ -1210,7 +1210,7 @@ public async Task LoadAsync_ConfigFilterConfiguresCluster_Works() var destination = Assert.Single(clusterState1.DestinationsState.AllDestinations); Assert.Equal("http://localhost", destination.Model.Config.Address); - var endpoint2 = Assert.Single(dataSource.Endpoints.Where(x => x.DisplayName == "route2")); + var endpoint2 = Assert.Single(dataSource.Endpoints, e => e.DisplayName == "route2"); var routeConfig2 = endpoint2.Metadata.GetMetadata(); Assert.Equal(12, routeConfig2.Config.Order); } diff --git a/test/ReverseProxy.Tests/Transforms/RequestHeadersTransformExtensionsTests.cs b/test/ReverseProxy.Tests/Transforms/RequestHeadersTransformExtensionsTests.cs index bb0942cf3..f02d0c7e2 100644 --- a/test/ReverseProxy.Tests/Transforms/RequestHeadersTransformExtensionsTests.cs +++ b/test/ReverseProxy.Tests/Transforms/RequestHeadersTransformExtensionsTests.cs @@ -135,7 +135,7 @@ public void AddRequestHeadersAllowed() private static void ValidateRequestHeader(bool append, TransformBuilderContext builderContext) { - var requestHeaderValueTransform = Assert.Single(builderContext.RequestTransforms.OfType().Where(x => x.HeaderName == "name")); + var requestHeaderValueTransform = Assert.Single(builderContext.RequestTransforms.OfType(), t => t.HeaderName == "name"); Assert.Equal("value", requestHeaderValueTransform.Value); Assert.Equal(append, requestHeaderValueTransform.Append); }