Consolidate async/sync query param tests

nr-ahemsath · nr-ahemsath · commit 6de37fd7c70b · 2023-11-22T14:40:09.000-08:00
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs
@@ -160,17 +160,17 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bool paramsWithAtSign)
+        public async Task<string> MsSqlAsync_WithParameterizedQuery(bool paramsWithAtSign)
         {
             var teamMembers = new List<string>();
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
                 await connection.OpenAsync();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
+                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE LastName = @LN", connection))
                 {
-                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
+                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@LN" : "LN", "Lee"));
                     using (var reader = await command.ExecuteReaderAsync())
                     {
                         while (await reader.ReadAsync())
@@ -183,25 +183,6 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
                         }
                     }
                 }
-
-                var insertSql = string.Format(InsertPersonMsSql, tableName);
-                var countSql = string.Format(CountPersonMsSql, tableName);
-                var deleteSql = string.Format(DeletePersonMsSql, tableName);
-
-                using (var command = new SqlCommand(insertSql, connection))
-                {
-                    var insertCount = await command.ExecuteNonQueryAsync();
-                }
-
-                using (var command = new SqlCommand(countSql, connection))
-                {
-                    var teamMemberCount = await command.ExecuteScalarAsync();
-                }
-
-                using (var command = new SqlCommand(deleteSql, connection))
-                {
-                    var deleteCount = await command.ExecuteNonQueryAsync();
-                }
             }
 
             return string.Join(",", teamMembers);
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataSqlClientExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataSqlClientExerciser.cs
@@ -163,17 +163,17 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bool paramsWithAtSign)
+        public async Task<string> MsSqlAsync_WithParameterizedQuery(bool paramsWithAtSign)
         {
             var teamMembers = new List<string>();
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
                 await connection.OpenAsync();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
+                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE LastName = @LN", connection))
                 {
-                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
+                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@LN" : "LN", "Lee"));
                     using (var reader = await command.ExecuteReaderAsync())
                     {
                         while (await reader.ReadAsync())
@@ -186,25 +186,6 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
                         }
                     }
                 }
-
-                var insertSql = string.Format(InsertPersonMsSql, tableName);
-                var countSql = string.Format(CountPersonMsSql, tableName);
-                var deleteSql = string.Format(DeletePersonMsSql, tableName);
-
-                using (var command = new SqlCommand(insertSql, connection))
-                {
-                    var insertCount = await command.ExecuteNonQueryAsync();
-                }
-
-                using (var command = new SqlCommand(countSql, connection))
-                {
-                    var teamMemberCount = await command.ExecuteScalarAsync();
-                }
-
-                using (var command = new SqlCommand(deleteSql, connection))
-                {
-                    var deleteCount = await command.ExecuteNonQueryAsync();
-                }
             }
 
             return string.Join(",", teamMembers);
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamAsyncTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamAsyncTests.cs

Original file line number	Diff line number	Diff line change
`@@ -160,17 +160,17 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)`
`160`	`160`	`[LibraryMethod]`
`161`	`161`	`[Transaction]`
`162`	`162`	`[MethodImpl(MethodImplOptions.NoOptimization \| MethodImplOptions.NoInlining)]`
`163`		`- public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bool paramsWithAtSign)`
	`163`	`+ public async Task<string> MsSqlAsync_WithParameterizedQuery(bool paramsWithAtSign)`
`164`	`164`	`{`
`165`	`165`	`var teamMembers = new List<string>();`
`166`	`166`
`167`	`167`	`using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))`
`168`	`168`	`{`
`169`	`169`	`await connection.OpenAsync();`
`170`	`170`
`171`		`- using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))`
	`171`	`+ using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE LastName = @LN", connection))`
`172`	`172`	`{`
`173`		`- command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));`
	`173`	`+ command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@LN" : "LN", "Lee"));`
`174`	`174`	`using (var reader = await command.ExecuteReaderAsync())`
`175`	`175`	`{`
`176`	`176`	`while (await reader.ReadAsync())`
`@@ -183,25 +183,6 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`	`}`
`186`		`-`
`187`		`- var insertSql = string.Format(InsertPersonMsSql, tableName);`
`188`		`- var countSql = string.Format(CountPersonMsSql, tableName);`
`189`		`- var deleteSql = string.Format(DeletePersonMsSql, tableName);`
`190`		`-`
`191`		`- using (var command = new SqlCommand(insertSql, connection))`
`192`		`- {`
`193`		`- var insertCount = await command.ExecuteNonQueryAsync();`
`194`		`- }`
`195`		`-`
`196`		`- using (var command = new SqlCommand(countSql, connection))`
`197`		`- {`
`198`		`- var teamMemberCount = await command.ExecuteScalarAsync();`
`199`		`- }`
`200`		`-`
`201`		`- using (var command = new SqlCommand(deleteSql, connection))`
`202`		`- {`
`203`		`- var deleteCount = await command.ExecuteNonQueryAsync();`
`204`		`- }`
`205`	`186`	`}`
`206`	`187`
`207`	`188`	`return string.Join(",", teamMembers);`
Original file line number	Diff line number	Diff line change
`@@ -163,17 +163,17 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)`
`163`	`163`	`[LibraryMethod]`
`164`	`164`	`[Transaction]`
`165`	`165`	`[MethodImpl(MethodImplOptions.NoOptimization \| MethodImplOptions.NoInlining)]`
`166`		`- public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bool paramsWithAtSign)`
	`166`	`+ public async Task<string> MsSqlAsync_WithParameterizedQuery(bool paramsWithAtSign)`
`167`	`167`	`{`
`168`	`168`	`var teamMembers = new List<string>();`
`169`	`169`
`170`	`170`	`using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))`
`171`	`171`	`{`
`172`	`172`	`await connection.OpenAsync();`
`173`	`173`
`174`		`- using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))`
	`174`	`+ using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE LastName = @LN", connection))`
`175`	`175`	`{`
`176`		`- command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));`
	`176`	`+ command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@LN" : "LN", "Lee"));`
`177`	`177`	`using (var reader = await command.ExecuteReaderAsync())`
`178`	`178`	`{`
`179`	`179`	`while (await reader.ReadAsync())`
`@@ -186,25 +186,6 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`	`}`
`189`		`-`
`190`		`- var insertSql = string.Format(InsertPersonMsSql, tableName);`
`191`		`- var countSql = string.Format(CountPersonMsSql, tableName);`
`192`		`- var deleteSql = string.Format(DeletePersonMsSql, tableName);`
`193`		`-`
`194`		`- using (var command = new SqlCommand(insertSql, connection))`
`195`		`- {`
`196`		`- var insertCount = await command.ExecuteNonQueryAsync();`
`197`		`- }`
`198`		`-`
`199`		`- using (var command = new SqlCommand(countSql, connection))`
`200`		`- {`
`201`		`- var teamMemberCount = await command.ExecuteScalarAsync();`
`202`		`- }`
`203`		`-`
`204`		`- using (var command = new SqlCommand(deleteSql, connection))`
`205`		`- {`
`206`		`- var deleteCount = await command.ExecuteNonQueryAsync();`
`207`		`- }`
`208`	`189`	`}`
`209`	`190`
`210`	`191`	`return string.Join(",", teamMembers);`