From 0eff085536a60c7924834f0cc6ac3d1ef1b8c048 Mon Sep 17 00:00:00 2001 From: Alex Hemsath Date: Fri, 21 Jun 2024 11:10:13 -0700 Subject: [PATCH] PR feedback --- .../Elasticsearch/ElasticsearchElasticClient.cs | 6 +++--- .../Elasticsearch/ElasticsearchExerciser.cs | 4 ++-- .../Elasticsearch/ElasticsearchNestClient.cs | 4 ++-- .../Elasticsearch/ElasticsearchNetClient.cs | 4 ++-- .../Elasticsearch/ElasticsearchTestClient.cs | 4 ++-- .../Elasticsearch/ElasticsearchTests.cs | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchElasticClient.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchElasticClient.cs index cef3baaf0..24ea84ff1 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchElasticClient.cs +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchElasticClient.cs @@ -47,7 +47,7 @@ protected override string Password } [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - public override async Task Connect() + public override async Task ConnectAsync() { var settings = new ElasticsearchClientSettings(Address) .Authentication(new BasicAuthentication(Username, Password)). @@ -188,7 +188,7 @@ public override async Task MultiSearchAsync() } [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - public override async Task GenerateError() + public override async Task GenerateErrorAsync() { // This isn't the password, so connection should fail, but we won't get an error until the Ping var settings = new ElasticsearchClientSettings(Address) @@ -198,7 +198,7 @@ public override async Task GenerateError() var client = new ElasticsearchClient(settings); - var response = _ = await client.PingAsync(); + var response = await client.PingAsync(); if (response.IsSuccess()) { diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchExerciser.cs index c01a3749e..2f6753f4d 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchExerciser.cs +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchExerciser.cs @@ -44,7 +44,7 @@ public async Task SetClient(string clientType) _client = new ElasticsearchElasticClient(); break; } - await _client.Connect(); + await _client.ConnectAsync(); } else { @@ -94,6 +94,6 @@ public async Task SetClient(string clientType) [LibraryMethod] [Transaction] [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - public async Task GenerateError() => await _client.GenerateError(); + public async Task GenerateErrorAsync() => await _client.GenerateErrorAsync(); } } diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNestClient.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNestClient.cs index c4daea47f..fdc14fc72 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNestClient.cs +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNestClient.cs @@ -36,7 +36,7 @@ protected override string Password } [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - public override async Task Connect() + public override async Task ConnectAsync() { var settings = new ConnectionSettings(Address). BasicAuthentication(Username,Password). @@ -176,7 +176,7 @@ public override async Task MultiSearchAsync() } [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - public override async Task GenerateError() + public override async Task GenerateErrorAsync() { // This isn't the password, so connection should fail, but we won't get an error until the Ping var settings = new ConnectionSettings(Address). diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNetClient.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNetClient.cs index 3e0c5def4..b71df2304 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNetClient.cs +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNetClient.cs @@ -36,7 +36,7 @@ protected override string Password } [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - public override async Task Connect() + public override async Task ConnectAsync() { var settings = new ConnectionConfiguration(Address) .BasicAuthentication(Username, Password) @@ -211,7 +211,7 @@ public override async Task MultiSearchAsync() } [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - public override async Task GenerateError() + public override async Task GenerateErrorAsync() { // This isn't the password, so connection should fail, but we won't get an error until the Ping var settings = new ConnectionConfiguration(Address) diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchTestClient.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchTestClient.cs index 4f7a4ae93..69cc21bff 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchTestClient.cs +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchTestClient.cs @@ -28,7 +28,7 @@ protected abstract string Password public ElasticsearchTestClient() { } - public abstract Task Connect(); + public abstract Task ConnectAsync(); public abstract void Index(); @@ -46,7 +46,7 @@ public ElasticsearchTestClient() { } public abstract Task MultiSearchAsync(); - public abstract Task GenerateError(); + public abstract Task GenerateErrorAsync(); } public class FlightRecord diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs index bbe256020..73c88b856 100644 --- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs +++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs @@ -65,6 +65,7 @@ protected ElasticsearchTestsBase(TFixture fixture, ITestOutputHelper output, Cli _fixture.AddCommand($"ElasticsearchExerciser SearchAsync"); _fixture.AddCommand($"ElasticsearchExerciser IndexManyAsync"); _fixture.AddCommand($"ElasticsearchExerciser MultiSearchAsync"); + _fixture.AddCommand($"ElasticsearchExerciser GenerateErrorAsync"); // Sync operations if (_syncMethodsOk ) @@ -75,7 +76,6 @@ protected ElasticsearchTestsBase(TFixture fixture, ITestOutputHelper output, Cli _fixture.AddCommand($"ElasticsearchExerciser MultiSearch"); } - _fixture.AddCommand($"ElasticsearchExerciser GenerateError"); _fixture.AddActions ( @@ -153,9 +153,9 @@ public void MultiSearchAsync() } [Fact] - public void Error() + public void ErrorAsync() { - ValidateError("GenerateError"); + ValidateError("GenerateErrorAsync"); } private void ValidateError(string operationName)