Skip to content

Commit bbf3ee9

Browse files
authored
R#: Move inline suppressions for AccessToDisposedClosure in tests to .editorconfig (#1682)
* Move inline suppressions for AccessToDisposedClosure in tests to .editorconfig * Run code cleanup
1 parent 4594c30 commit bbf3ee9

42 files changed

Lines changed: 7 additions & 63 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,7 @@ dotnet_diagnostic.JSON002.severity = silent
162162

163163
# CA1848: Use the LoggerMessage delegates (depends on https://github.com/SteeltoeOSS/Steeltoe/issues/969)
164164
dotnet_diagnostic.CA1848.severity = silent
165+
166+
[*Test.cs]
167+
resharper_access_to_disposed_closure_highlighting = none
168+
resharper_access_to_modified_closure_highlighting = none

src/Common/src/Common/Discovery/IDiscoveryClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public interface IDiscoveryClient
1717
/// <summary>
1818
/// Occurs when service instances have been fetched from the discovery server.
1919
/// </summary>
20-
public event EventHandler<DiscoveryInstancesFetchedEventArgs> InstancesFetched;
20+
event EventHandler<DiscoveryInstancesFetchedEventArgs> InstancesFetched;
2121

2222
/// <summary>
2323
/// Gets information used to register the local service instance (this app) to the discovery server.

src/Common/test/Hosting.Test/HostBuilderWrapperTest.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public async Task WebApplicationBuilder_Wraps()
2929
HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder);
3030
wrapper.ConfigureServices(services => services.AddSingleton<InjectableType>());
3131
wrapper.ConfigureAppConfiguration(configurationBuilder => configurationBuilder.AddInMemoryCollection(appSettings));
32-
// ReSharper disable once AccessToDisposedClosure
3332
wrapper.ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(capturingLoggerProvider));
3433
wrapper.ConfigureWebHost(hostBuilder => hostBuilder.UseUrls("http://*:8888"));
3534
wrapper.ConfigureServices((contextWrapper, _) => contextWrapper.HostEnvironment.ApplicationName = "TestApp");
@@ -65,7 +64,6 @@ public void HostApplicationBuilder_Wraps()
6564
HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder);
6665
wrapper.ConfigureServices(services => services.AddSingleton<InjectableType>());
6766
wrapper.ConfigureAppConfiguration(configurationBuilder => configurationBuilder.AddInMemoryCollection(appSettings));
68-
// ReSharper disable once AccessToDisposedClosure
6967
wrapper.ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(capturingLoggerProvider));
7068
wrapper.ConfigureServices((contextWrapper, _) => contextWrapper.HostEnvironment.ApplicationName = "TestApp");
7169

@@ -100,7 +98,6 @@ public void WebHostBuilder_Wraps()
10098
HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder);
10199
wrapper.ConfigureServices(services => services.AddSingleton<InjectableType>());
102100
wrapper.ConfigureAppConfiguration(configurationBuilder => configurationBuilder.AddInMemoryCollection(appSettings));
103-
// ReSharper disable once AccessToDisposedClosure
104101
wrapper.ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(capturingLoggerProvider));
105102
wrapper.ConfigureWebHost(hostBuilder => hostBuilder.UseUrls("http://*:8888"));
106103
wrapper.ConfigureServices((contextWrapper, _) => contextWrapper.HostEnvironment.ApplicationName = "TestApp");
@@ -138,7 +135,6 @@ public void GenericHostBuilder_Wraps()
138135
HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder);
139136
wrapper.ConfigureServices(services => services.AddSingleton<InjectableType>());
140137
wrapper.ConfigureAppConfiguration(configurationBuilder => configurationBuilder.AddInMemoryCollection(appSettings));
141-
// ReSharper disable once AccessToDisposedClosure
142138
wrapper.ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(capturingLoggerProvider));
143139
wrapper.ConfigureWebHost(hostBuilder => hostBuilder.UseUrls("http://*:8888"));
144140
wrapper.ConfigureServices((contextWrapper, _) => contextWrapper.HostEnvironment.ApplicationName = "TestApp");

src/Common/test/Logging.Test/BootstrapperLoggerFactoryTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public async Task Upgrades_existing_loggers()
2020
var bootstrapLoggerFactory = BootstrapLoggerFactory.CreateEmpty(loggingBuilder =>
2121
{
2222
loggingBuilder.SetMinimumLevel(LogLevel.Trace);
23-
// ReSharper disable once AccessToDisposedClosure
2423
loggingBuilder.AddProvider(capturingLoggerProvider);
2524
});
2625

src/Configuration/test/CloudFoundry.Test/CloudfoundryConfigurationProviderTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ public void Load_VCAP_APPLICATION_Allows_Reload_Without_Throwing_Exception()
216216

217217
_ = Task.Run(() =>
218218
{
219-
// ReSharper disable once AccessToDisposedClosure
220219
while (!tokenSource.IsCancellationRequested)
221220
{
222221
configurationRoot.Reload();

src/Configuration/test/ConfigServer.Discovery.Test/ConfigServerClientOptionsTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public void Config_Server_URI_is_resolved_from_discovery_and_survives_changes_in
9090

9191
var configurationBuilder = new ConfigurationBuilder();
9292
configurationBuilder.AddInMemoryAppSettingsJsonFile(fileProvider);
93-
// ReSharper disable once AccessToDisposedClosure
9493
configurationBuilder.AddConfigServer(new ConfigServerClientOptions(), configureOptions, () => handler, NullLoggerFactory.Instance);
9594
IConfigurationRoot configuration = configurationBuilder.Build();
9695

@@ -306,7 +305,6 @@ public void Updates_discovered_Config_Server_URI_on_provider_reload()
306305

307306
var configurationBuilder = new ConfigurationBuilder();
308307
configurationBuilder.AddInMemoryAppSettingsJsonFile(fileProvider);
309-
// ReSharper disable once AccessToDisposedClosure
310308
configurationBuilder.AddConfigServer(new ConfigServerClientOptions(), configureOptions, () => handler, NullLoggerFactory.Instance);
311309
IConfigurationRoot configuration = configurationBuilder.Build();
312310

src/Configuration/test/ConfigServer.Test/ConfigServerClientOptionsTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ public void Certificate_configuration_survives_options_reload()
265265

266266
var configurationBuilder = new ConfigurationBuilder();
267267
configurationBuilder.AddInMemoryAppSettingsJsonFile(fileProvider);
268-
// ReSharper disable once AccessToDisposedClosure
269268
configurationBuilder.AddConfigServer(new ConfigServerClientOptions(), null, () => handler, NullLoggerFactory.Instance);
270269
IConfigurationRoot configuration = configurationBuilder.Build();
271270

@@ -368,7 +367,6 @@ public void Changes_in_IConfiguration_update_provider_options_and_injected_optio
368367
var configurationBuilder = new ConfigurationBuilder();
369368
configurationBuilder.AddInMemoryAppSettingsJsonFile(fileProvider);
370369
configurationBuilder.AddPlaceholderResolver();
371-
// ReSharper disable once AccessToDisposedClosure
372370
configurationBuilder.AddConfigServer(defaultOptions, configureOptions, () => handler, NullLoggerFactory.Instance);
373371
IConfigurationRoot configuration = configurationBuilder.Build();
374372

src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.Settings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
using Microsoft.Extensions.Configuration;
88
using Microsoft.Extensions.Logging.Abstractions;
99

10+
// ReSharper disable AccessToDisposedClosure
11+
1012
namespace Steeltoe.Configuration.ConfigServer.Test;
1113

1214
public sealed partial class ConfigServerConfigurationProviderTest
@@ -65,9 +67,7 @@ public void GetConfigServerUri_NoBaseUri_Throws()
6567

6668
using var provider = new ConfigServerConfigurationProvider(options, null, null, null, NullLoggerFactory.Instance);
6769

68-
// ReSharper disable AccessToDisposedClosure
6970
Action action = () => provider.BuildConfigServerUri(provider.ClientOptions, null!, null);
70-
// ReSharper restore AccessToDisposedClosure
7171

7272
action.Should().ThrowExactly<ArgumentNullException>();
7373
}

src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ public async Task GetRequestMessage_AddsBearerToken_WhenAccessTokenUriIsSet()
264264
}
265265
""");
266266

267-
// ReSharper disable once AccessToDisposedClosure
268267
using var provider = new ConfigServerConfigurationProvider(options, null, null, () => handler, NullLoggerFactory.Instance);
269268

270269
Uri requestUri = provider.BuildConfigServerUri(provider.ClientOptions, new Uri(options.Uri), null);
@@ -294,7 +293,6 @@ public async Task RefreshVaultToken_Succeeds()
294293
handler.Mock.Expect(HttpMethod.Post, "http://localhost:8888/vault/v1/auth/token/renew-self").WithHeaders("X-Vault-Token", "MyVaultToken")
295294
.WithContent("{\"increment\":300}").Respond(HttpStatusCode.NoContent);
296295

297-
// ReSharper disable once AccessToDisposedClosure
298296
using var provider = new ConfigServerConfigurationProvider(options, null, null, () => handler, NullLoggerFactory.Instance);
299297
provider.Load();
300298

@@ -324,7 +322,6 @@ public async Task RefreshVaultToken_With_AccessTokenUri_Succeeds()
324322
handler.Mock.Expect(HttpMethod.Post, "http://localhost:8888/vault/v1/auth/token/renew-self").WithHeaders("X-Vault-Token", "MyVaultToken")
325323
.WithHeaders("Authorization", "Bearer secret").WithContent("{\"increment\":300}").Respond(HttpStatusCode.NoContent);
326324

327-
// ReSharper disable once AccessToDisposedClosure
328325
using var provider = new ConfigServerConfigurationProvider(options, null, null, () => handler, NullLoggerFactory.Instance);
329326

330327
await provider.RefreshVaultTokenAsync(provider.ClientOptions, TestContext.Current.CancellationToken);

src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ public async Task Canceled_Throws()
116116
using var source = new CancellationTokenSource();
117117
await source.CancelAsync();
118118

119-
// ReSharper disable AccessToDisposedClosure
120119
Func<Task> action = async () => await healthContributor.CheckHealthAsync(source.Token);
121-
// ReSharper restore AccessToDisposedClosure
122120

123121
await action.Should().ThrowExactlyAsync<TaskCanceledException>();
124122
}

0 commit comments

Comments
 (0)