Merge pull request Azure#3841 from jaredmoo/sqltestlogging

Improved tracing for sql tests.

Author: cormacpayne

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AdvisorTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class AdvisorTests : SqlTestsBase
     {
-        public AdvisorTests(ITestOutputHelper output)
+        public AdvisorTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         #region Server Advisor Tests

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.cs

@@ -34,9 +34,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
             helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageClient, storageV2Client, resourcesClient, authorizationClient);
         }
 
-        public AuditingTests(ITestOutputHelper output)
+        public AuditingTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs

@@ -34,9 +34,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
             helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageClient, storageV2Client, resourcesClient, authorizationClient);
         }
 
-        public DataMaskingTests(ITestOutputHelper output)
+        public DataMaskingTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseActivationTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class DatabaseActivationTests : SqlTestsBase
     {
-        public DatabaseActivationTests(ITestOutputHelper output)
+        public DatabaseActivationTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupStretchTests.cs

@@ -43,9 +43,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
                 authorizationClient);
         }
 
-        public DatabaseBackupStretchTests(ITestOutputHelper output)
+        public DatabaseBackupStretchTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class DatabaseBackupTests : SqlTestsBase
     {
-        public DatabaseBackupTests(ITestOutputHelper output)
+        public DatabaseBackupTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseCrudStretchTests.cs

@@ -43,9 +43,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
                 authorizationClient);
         }
 
-        public DatabaseCrudStretchTests(ITestOutputHelper output)
+        public DatabaseCrudStretchTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseReplicationTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class DatabaseReplicationTests : SqlTestsBase
     {
-        public DatabaseReplicationTests(ITestOutputHelper output)
+        public DatabaseReplicationTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ElasticPoolCrudTests : SqlTestsBase
     {
-        public ElasticPoolCrudTests(ITestOutputHelper output)
+        public ElasticPoolCrudTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         // Currently the test runs too long to be marked as a check-in test.

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/FailoverGroupTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class FailoverGroupTests : SqlTestsBase
     {
-        public FailoverGroupTests(ITestOutputHelper output)
+        public FailoverGroupTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ImportExportTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ImportExportTests : SqlTestsBase
     {
-        public ImportExportTests(ITestOutputHelper output)
+        public ImportExportTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/IndexRecommendationTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class IndexRecommendationTests : SqlTestsBase
     {
-        public IndexRecommendationTests(ITestOutputHelper output)
+        public IndexRecommendationTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/LocationCapabilitiesTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class LocationCapabilitiesTests : SqlTestsBase
     {
-        public LocationCapabilitiesTests(ITestOutputHelper output)
+        public LocationCapabilitiesTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ReadScaleCrudTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ReadScaleCrudTests : SqlTestsBase
     {
-        public ReadScaleCrudTests(ITestOutputHelper output)
+        public ReadScaleCrudTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/RecommendedActionTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class RecommendedActionTests : SqlTestsBase
     {
-        public RecommendedActionTests(ITestOutputHelper output)
+        public RecommendedActionTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         #region Server Recommended Action Tests

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class RecommendedElasticPoolTests : SqlTestsBase
     {
-        public RecommendedElasticPoolTests(ITestOutputHelper output)
+        public RecommendedElasticPoolTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ServerActiveDirectoryAdministratorTest : SqlTestsBase
     {
-        public ServerActiveDirectoryAdministratorTest(ITestOutputHelper output)
+        public ServerActiveDirectoryAdministratorTest(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact(Skip = "SQL team hould re-record this test.")]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ServerCommunicationLinkCrudTests : SqlTestsBase
     {
-        public ServerCommunicationLinkCrudTests(ITestOutputHelper output)
+        public ServerCommunicationLinkCrudTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerCrudTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ServerCrudTests : SqlTestsBase
     {
-        public ServerCrudTests(ITestOutputHelper output)
+        public ServerCrudTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs

@@ -22,12 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ServerDisasterRecoveryConfigurationTests : SqlTestsBase
     {
-        public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output)
+        public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output) : base(output)
         {
-            var logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
-
-            helper.TracingInterceptor = logger;
         }
 
         [Fact(Skip = "TODO fix the test failure")]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerKeyVaultKeyTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ServerKeyVaultKeyTests : SqlTestsBase
     {
-        public ServerKeyVaultKeyTests(ITestOutputHelper output)
+        public ServerKeyVaultKeyTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerUpgradeTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ServerUpgradeTests : SqlTestsBase
     {
-        public ServerUpgradeTests(ITestOutputHelper output)
+        public ServerUpgradeTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServiceTierAdvisorTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class ServiceTierAdvisorTests : SqlTestsBase
     {
-        public ServiceTierAdvisorTests(ITestOutputHelper output)
+        public ServiceTierAdvisorTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs

@@ -43,11 +43,6 @@ public class SqlTestsBase : RMTestBase
 
         public string UserDomain { get; private set; }
 
-        protected SqlTestsBase()
-        {
-            helper = new SqlEvnSetupHelper();
-        }
-
         protected SqlTestsBase(ITestOutputHelper output)
         {
             helper = new SqlEvnSetupHelper();

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ThreatDetectionTests.cs

@@ -37,9 +37,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
                 authorizationClient);
         }
 
-        public ThreatDetectionTests(ITestOutputHelper output)
+        public ThreatDetectionTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/TransparentDataEncryptionCrudTests.cs

@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class TransparentDataEncryptionCrudTests : SqlTestsBase
     {
-        public TransparentDataEncryptionCrudTests(ITestOutputHelper output)
+        public TransparentDataEncryptionCrudTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
         [Fact]