test: Cleanup / refactor to remove database dependencies in unbounded tests project (#3061)

tippmar-nr · web-flow · commit 67374144a186 · 2025-03-28T09:26:40.000-07:00
diff --git a/.github/workflows/all_solutions.yml b/.github/workflows/all_solutions.yml
@@ -444,7 +444,7 @@ jobs:
 
     env:
       integration_tests_shared_project: ${{ github.workspace }}/tests/Agent/IntegrationTests/Shared
-      unbounded_tests_path: ${{ github.workspace }}/tests/Agent/IntegrationTests/UnboundedIntegrationTests/bin/Release/net481
+      unbounded_tests_path: ${{ github.workspace }}/tests/Agent/IntegrationTests/UnboundedIntegrationTests/bin/Release/net9.0
       NR_DOTNET_TEST_SAVE_WORKING_DIRECTORY: 1
       # Make this variable true to enable extra data-gathering and logging to help troubleshoot test failures, at the cost of additional time and resources
       enhanced_logging: false
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj
@@ -81,6 +81,9 @@
     <PackageReference Include="Microsoft.Web.Infrastructure">
       <Version>1.0.0.0</Version>
     </PackageReference>
+    <PackageReference Include="NewRelic.Agent.Api">
+      <Version>10.39.0</Version>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/Controllers/OracleController.cs b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/Controllers/OracleController.cs
@@ -9,6 +9,8 @@
 using System.Configuration;
 using System.Data;
 using System.Web.Mvc;
+using NewRelic.Api.Agent;
+using Oracle.ManagedDataAccess.Client;
 
 namespace BasicMvcApplication.Controllers
 {
@@ -18,6 +20,11 @@ public class OracleController : Controller
         private const string DeleteHotelOracleSql = "DELETE FROM {0} WHERE HOTEL_ID = 1";
         private const string CountHotelOracleSql = "SELECT COUNT(*) FROM {0}";
 
+        private const string CreateHotelTableOracleSql = "CREATE TABLE {0} (HOTEL_ID INT NOT NULL, BOOKING_DATE DATE NOT NULL, " +
+                                                         "ROOMS_TAKEN INT DEFAULT 0, PRIMARY KEY (HOTEL_ID, BOOKING_DATE))";
+        private const string DropHotelTableOracleSql = "DROP TABLE {0}";
+
+
         [HttpGet]
         public string EnterpriseLibraryOracle(string tableName)
         {
@@ -49,5 +56,51 @@ public string EnterpriseLibraryOracle(string tableName)
 
             return string.Join(",", teamMembers);
         }
+
+        [HttpGet]
+        public void CreateTable(string tableName)
+        {
+            NewRelic.Api.Agent.NewRelic.IgnoreTransaction(); // this is a setup method, don't need a transaction for it
+
+            CreateTableInternal(tableName);
+        }
+
+        [HttpGet]
+        public void DropTable(string tableName)
+        {
+            NewRelic.Api.Agent.NewRelic.IgnoreTransaction(); // this is a teardown method, don't need a transaction for it
+
+            DropTableInternal(tableName);
+        }
+
+        private void CreateTableInternal(string tableName)
+        {
+            var createTable = string.Format(CreateHotelTableOracleSql, tableName);
+            using (var connection = new OracleConnection(OracleConfiguration.OracleConnectionString))
+            {
+                connection.Open();
+
+                using (var command = new OracleCommand(createTable, connection))
+                {
+                    command.ExecuteNonQuery();
+                }
+            }
+        }
+
+        private void DropTableInternal(string tableName)
+        {
+            var dropTableSql = string.Format(DropHotelTableOracleSql, tableName);
+
+            using (var connection = new OracleConnection(OracleConfiguration.OracleConnectionString))
+            {
+                connection.Open();
+
+                using (var command = new OracleCommand(dropTableSql, connection))
+                {
+                    command.ExecuteNonQuery();
+                }
+            }
+        }
+
     }
 }
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/CosmosDB/CosmosDBTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/CosmosDB/CosmosDBTests.cs
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 
-using Azure;
-using Couchbase.Core;
 using NewRelic.Agent.IntegrationTestHelpers;
 using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
@@ -15,7 +13,6 @@
 using System.Net.NetworkInformation;
 using System.Net.PeerToPeer.Collaboration;
 using System.Reflection;
-using System.Windows.Forms;
 using NewRelic.Agent.Tests.TestSerializationHelpers.Models;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs
@@ -25,8 +25,6 @@ public abstract class MsSqlQueryParamTestsBase<TFixture> : NewRelicIntegrationTe
 
         public MsSqlQueryParamTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, bool paramsWithAtSign) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMsSql();
-
             _fixture = fixture;
             _fixture.TestLogger = output;
             _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlWithParameterizedQuery";
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureTests.cs
@@ -24,8 +24,6 @@ public abstract class MsSqlStoredProcedureTestsBase<TFixture> : NewRelicIntegrat
 
         public MsSqlStoredProcedureTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMsSql();
-
             _fixture = fixture;
             _fixture.TestLogger = output;
             _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlParameterizedStoredProcedure";
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureUsingOdbcDriverTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureUsingOdbcDriverTests.cs
@@ -25,8 +25,6 @@ public abstract class MsSqlStoredProcedureUsingOdbcDriverTestsBase<TFixture> : N
 
         public MsSqlStoredProcedureUsingOdbcDriverTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMsSql();
-
             _fixture = fixture;
             _fixture.TestLogger = output;
             _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/OdbcParameterizedStoredProcedure";
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureUsingOleDbDriverTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureUsingOleDbDriverTests.cs
@@ -25,8 +25,6 @@ public abstract class MsSqlStoredProcedureUsingOleDbDriverTestsBase<TFixture> :
 
         public MsSqlStoredProcedureUsingOleDbDriverTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMsSql();
-
             _fixture = fixture;
             _fixture.TestLogger = output;
             _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlParameterizedStoredProcedureUsingOleDbDriver";
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs
@@ -29,8 +29,6 @@ public abstract class MsSqlTestsBase<TFixture> : NewRelicIntegrationTest<TFixtur
 
         public MsSqlTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, string libraryName) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMsSql();
-
             _fixture = fixture;
             _fixture.TestLogger = output;
             _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSql";
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlWarmupHelper.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlWarmupHelper.cs
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlAsyncTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlAsyncTests.cs
@@ -22,8 +22,6 @@ public abstract class MySqlAsyncTestsBase<TFixture> : NewRelicIntegrationTest<TF
 
         public MySqlAsyncTestsBase(TFixture fixture, ITestOutputHelper output, bool asyncOpen) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMySql();
-
             _fixture = fixture;
             _fixture.TestLogger = output;
 
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlConnectorTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlConnectorTests.cs
@@ -39,7 +39,6 @@ public abstract class MySqlConnectorTestBase<TFixture> : NewRelicIntegrationTest
 
         protected MySqlConnectorTestBase(TFixture fixture, ITestOutputHelper output) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMySql();
 
             _fixture = fixture;
             _fixture.TestLogger = output;
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlStoredProcedureTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlStoredProcedureTests.cs
@@ -22,8 +22,6 @@ public abstract class MySqlStoredProcedureTestsBase<TFixture> : NewRelicIntegrat
 
         protected MySqlStoredProcedureTestsBase(TFixture fixture, ITestOutputHelper output) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMySql();
-
             _fixture = fixture;
             _fixture.TestLogger = output;
 
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlTests.cs
@@ -21,8 +21,6 @@ public abstract class MySqlTestsBase<TFixture> : NewRelicIntegrationTest<TFixtur
 
         public MySqlTestsBase(TFixture fixture, ITestOutputHelper output) : base(fixture)
         {
-            MsSqlWarmupHelper.WarmupMySql();
-
             _fixture = fixture;
             _fixture.TestLogger = output;
 
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlWarmupHelper.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlWarmupHelper.cs
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Oracle/EnterpriseLibraryOracleTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Oracle/EnterpriseLibraryOracleTests.cs
@@ -14,12 +14,12 @@
 
 namespace NewRelic.Agent.UnboundedIntegrationTests.Oracle
 {
-    [NetFrameworkTest]
+    [NetCoreTest]
     public class EnterpriseLibraryOracleTests : NewRelicIntegrationTest<RemoteServiceFixtures.OracleBasicMvcFixture>
     {
         private readonly RemoteServiceFixtures.OracleBasicMvcFixture _fixture;
 
-        public EnterpriseLibraryOracleTests(RemoteServiceFixtures.OracleBasicMvcFixture fixture, ITestOutputHelper output)  : base(fixture)
+        public EnterpriseLibraryOracleTests(RemoteServiceFixtures.OracleBasicMvcFixture fixture, ITestOutputHelper output) : base(fixture)
         {
             _fixture = fixture;
             _fixture.TestLogger = output;
@@ -43,15 +43,26 @@ public EnterpriseLibraryOracleTests(RemoteServiceFixtures.OracleBasicMvcFixture
                 },
                 exerciseApplication: () =>
                 {
-                    _fixture.GetEnterpriseLibraryOracle();
-                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.AgentConnectedLogLineRegex, TimeSpan.FromMinutes(1));
-                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.SqlTraceDataLogLineRegex, TimeSpan.FromMinutes(1));
+                    _fixture.CreateTable();
+
+                    try
+                    {
+                        _fixture.GetEnterpriseLibraryOracle();
+                        _fixture.AgentLog.WaitForLogLine(AgentLogBase.AgentConnectedLogLineRegex,
+                            TimeSpan.FromMinutes(1));
+                        _fixture.AgentLog.WaitForLogLine(AgentLogBase.SqlTraceDataLogLineRegex,
+                            TimeSpan.FromMinutes(1));
+                    }
+                    finally
+                    {
+                        _fixture.DropTable();
+                    }
                 }
             );
 
             _fixture.Initialize();
-        }
 
+        }
         [Fact]
         public void Test()
         {
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/RemoteServiceFixtures/OracleBasicMvcFixture.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/RemoteServiceFixtures/OracleBasicMvcFixture.cs
@@ -6,97 +6,44 @@
 using System.Net;
 using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Agent.IntegrationTests.Shared;
-using Oracle.ManagedDataAccess.Client;
 using Xunit;
 
 namespace NewRelic.Agent.UnboundedIntegrationTests.RemoteServiceFixtures
 {
     public class OracleBasicMvcFixture : RemoteApplicationFixture
     {
-        private const string CreateHotelTableOracleSql = "CREATE TABLE {0} (HOTEL_ID INT NOT NULL, BOOKING_DATE DATE NOT NULL, " +
-                                                         "ROOMS_TAKEN INT DEFAULT 0, PRIMARY KEY (HOTEL_ID, BOOKING_DATE))";
-        private const string DropHotelTableOracleSql = "DROP TABLE {0}";
-
-        private readonly string _tableName;
-        public string TableName
-        {
-            get { return _tableName; }
-        }
+        public string TableName { get; }
 
         public OracleBasicMvcFixture() : base(new RemoteWebApplication("BasicMvcApplication", ApplicationType.Unbounded))
         {
-            _tableName = GenerateTableName();
-            CreateTable();
+            TableName = GenerateTableName();
         }
 
-        public void GetOracle()
+        public void CreateTable()
         {
-            var address = $"http://{DestinationServerName}:{Port}/Oracle/Oracle?tableName={TableName}";
+            var address = $"http://{DestinationServerName}:{Port}/Oracle/CreateTable?tableName={TableName}";
 
-            GetStringAndAssertIsNotNull(address);
+            GetAndAssertStatusCode(address, HttpStatusCode.OK);
         }
 
-        public void GetOracleAsync()
+        public void DropTable()
         {
-            var address = $"http://{DestinationServerName}:{Port}/Oracle/OracleAsync?tableName={TableName}";
+            var address = $"http://{DestinationServerName}:{Port}/Oracle/DropTable?tableName={TableName}";
 
-            GetStringAndAssertIsNotNull(address);
+            GetAndAssertStatusCode(address, HttpStatusCode.OK);
         }
-
         public void GetEnterpriseLibraryOracle()
         {
             var address = $"http://{DestinationServerName}:{Port}/Oracle/EnterpriseLibraryOracle?tableName={TableName}";
 
             GetStringAndAssertIsNotNull(address);
         }
 
-        public void OracleParameterizedStoredProcedure(string procedureName)
-        {
-            var address = $"http://{DestinationServerName}:{Port}/Oracle/OracleParameterizedStoredProcedure?procedureName={procedureName}";
-
-            GetStringAndAssertIsNotNull(address);
-        }
-
         private static string GenerateTableName()
         {
             //Oracle tables must start w/ character and be <= 30 length. Table name = H{tableId}
             var tableId = Guid.NewGuid().ToString("N").Substring(2, 29).ToLower();
             return $"h{tableId}";
         }
-
-        private void CreateTable()
-        {
-            var createTable = string.Format(CreateHotelTableOracleSql, TableName);
-            using (var connection = new OracleConnection(OracleConfiguration.OracleConnectionString))
-            {
-                connection.Open();
-
-                using (var command = new OracleCommand(createTable, connection))
-                {
-                    command.ExecuteNonQuery();
-                }
-            }
-        }
-
-        private void DropTable()
-        {
-            var dropTableSql = string.Format(DropHotelTableOracleSql, TableName);
-
-            using (var connection = new OracleConnection(OracleConfiguration.OracleConnectionString))
-            {
-                connection.Open();
-
-                using (var command = new OracleCommand(dropTableSql, connection))
-                {
-                    command.ExecuteNonQuery();
-                }
-            }
-        }
-
-        public override void Dispose()
-        {
-            base.Dispose();
-            DropTable();
-        }
     }
 }
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ public abstract class MsSqlQueryParamTestsBase<TFixture> : NewRelicIntegrationTe`
`25`	`25`
`26`	`26`	`public MsSqlQueryParamTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, bool paramsWithAtSign) : base(fixture)`
`27`	`27`	`{`
`28`		`- MsSqlWarmupHelper.WarmupMsSql();`
`29`		`-`
`30`	`28`	`_fixture = fixture;`
`31`	`29`	`_fixture.TestLogger = output;`
`32`	`30`	`_expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlWithParameterizedQuery";`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ public abstract class MsSqlStoredProcedureTestsBase<TFixture> : NewRelicIntegrat`
`24`	`24`
`25`	`25`	`public MsSqlStoredProcedureTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName) : base(fixture)`
`26`	`26`	`{`
`27`		`- MsSqlWarmupHelper.WarmupMsSql();`
`28`		`-`
`29`	`27`	`_fixture = fixture;`
`30`	`28`	`_fixture.TestLogger = output;`
`31`	`29`	`_expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlParameterizedStoredProcedure";`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ public abstract class MsSqlTestsBase<TFixture> : NewRelicIntegrationTest<TFixtur`
`29`	`29`
`30`	`30`	`public MsSqlTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, string libraryName) : base(fixture)`
`31`	`31`	`{`
`32`		`- MsSqlWarmupHelper.WarmupMsSql();`
`33`		`-`
`34`	`32`	`_fixture = fixture;`
`35`	`33`	`_fixture.TestLogger = output;`
`36`	`34`	`_expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSql";`