From 909de8d632085bd9bfc4fa010f0cf97c1df484f8 Mon Sep 17 00:00:00 2001 From: Alex Hemsath Date: Tue, 4 Jun 2024 15:31:13 -0700 Subject: [PATCH 1/2] Update latest tested version of Microsoft.Data.SqlClient --- .../MultiFunctionApplicationHelpers.csproj | 2 +- .../UnboundedIntegrationTests/UnboundedIntegrationTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj index 8b2a2960ed..23fb43e4e9 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj @@ -62,7 +62,7 @@ - + diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj index d813fbdb52..fc24b8e8cf 100644 --- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj +++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj @@ -41,7 +41,7 @@ - + all From 955755b302305444f8d4058d43728a36c3a8c935 Mon Sep 17 00:00:00 2001 From: Alex Hemsath Date: Tue, 4 Jun 2024 16:07:35 -0700 Subject: [PATCH 2/2] Add back tests for core latest for MS.Data.SqlClient --- .../MultiFunctionApplicationHelpers.csproj | 2 +- .../MsSql/MicrosoftDataSqlClientExerciser.cs | 4 --- .../MsSql/MsSqlQueryParamTests.cs | 26 +++++++++++++++++++ .../MsSql/MsSqlStoredProcedureTests.cs | 12 +++++++++ .../MsSql/MsSqlTests.cs | 13 ++++++++++ 5 files changed, 52 insertions(+), 5 deletions(-) diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj index 23fb43e4e9..872f5f6e02 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj @@ -60,7 +60,7 @@ - + diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs index 1f04282625..1c7cf249c7 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs @@ -1,8 +1,6 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -#if !NET8_0_OR_GREATER - using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; @@ -278,5 +276,3 @@ private void EnsureProcedure(string procedureName, DbParameter[] dbParameters) } } } - -#endif diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs index c7929b551c..7f41193042 100644 --- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs +++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs @@ -292,6 +292,19 @@ public MsSqlQueryParamTests_MicrosoftDataSqlClient_NoAtSigns_FW462(ConsoleDynami } } + [NetCoreTest] + public class MsSqlQueryParamTests_MicrosoftDataSqlClient_CoreLatest : MsSqlQueryParamTestsBase + { + public MsSqlQueryParamTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output) + : base( + fixture: fixture, + output: output, + excerciserName: "MicrosoftDataSqlClientExerciser", + paramsWithAtSign: true) + { + } + } + [NetCoreTest] public class MsSqlQueryParamTests_MicrosoftDataSqlClient_CoreOldest : MsSqlQueryParamTestsBase { @@ -305,6 +318,19 @@ public MsSqlQueryParamTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMeth } } + [NetCoreTest] + public class MsSqlQueryParamTests_MicrosoftDataSqlClient_NoAtSigns_CoreLatest : MsSqlQueryParamTestsBase + { + public MsSqlQueryParamTests_MicrosoftDataSqlClient_NoAtSigns_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output) + : base( + fixture: fixture, + output: output, + excerciserName: "MicrosoftDataSqlClientExerciser", + paramsWithAtSign: false) + { + } + } + [NetCoreTest] public class MsSqlQueryParamTests_MicrosoftDataSqlClient_NoAtSigns_CoreOldest : MsSqlQueryParamTestsBase { diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureTests.cs index 6f3301402a..428dea913c 100644 --- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureTests.cs +++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureTests.cs @@ -194,6 +194,18 @@ public MsSqlStoredProcedureTests_MicrosoftDataSqlClient_FW462(ConsoleDynamicMeth } } + [NetCoreTest] + public class MsSqlStoredProcedureTests_MicrosoftDataSqlClient_CoreLatest : MsSqlStoredProcedureTestsBase + { + public MsSqlStoredProcedureTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output) + : base( + fixture: fixture, + output: output, + excerciserName: "MicrosoftDataSqlClientExerciser") + { + } + } + [NetCoreTest] public class MsSqlStoredProcedureTests_MicrosoftDataSqlClient_CoreOldest : MsSqlStoredProcedureTestsBase { diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs index dfe20cebee..927edf8721 100644 --- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs +++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs @@ -312,4 +312,17 @@ public MsSqlTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtureC { } } + + [NetCoreTest] + public class MsSqlTests_MicrosoftDataSqlClient_CoreLatest : MsSqlTestsBase + { + public MsSqlTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output) + : base( + fixture: fixture, + output: output, + excerciserName: "MicrosoftDataSqlClientExerciser", + libraryName: "Microsoft.Data.SqlClient") + { + } + } }