Skip to content

Commit 39e64ea

Browse files
committed
Improved tracing for sql tests.
Most sql scenario tests aren't setting up tracing correctly. This changes all sql scenario tests to call the base constructor that does fully set up tracing.
1 parent 82ffc08 commit 39e64ea

26 files changed

+25
-58
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class AdvisorTests : SqlTestsBase
2424
{
25-
public AdvisorTests(ITestOutputHelper output)
25+
public AdvisorTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
#region Server Advisor Tests

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
3434
helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageClient, storageV2Client, resourcesClient, authorizationClient);
3535
}
3636

37-
public AuditingTests(ITestOutputHelper output)
37+
public AuditingTests(ITestOutputHelper output) : base(output)
3838
{
39-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
4039
}
4140

4241
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
3434
helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageClient, storageV2Client, resourcesClient, authorizationClient);
3535
}
3636

37-
public DataMaskingTests(ITestOutputHelper output)
37+
public DataMaskingTests(ITestOutputHelper output) : base(output)
3838
{
39-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
4039
}
4140

4241
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class DatabaseActivationTests : SqlTestsBase
2424
{
25-
public DatabaseActivationTests(ITestOutputHelper output)
25+
public DatabaseActivationTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
4343
authorizationClient);
4444
}
4545

46-
public DatabaseBackupStretchTests(ITestOutputHelper output)
46+
public DatabaseBackupStretchTests(ITestOutputHelper output) : base(output)
4747
{
48-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
4948
}
5049

5150
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class DatabaseBackupTests : SqlTestsBase
2424
{
25-
public DatabaseBackupTests(ITestOutputHelper output)
25+
public DatabaseBackupTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
4343
authorizationClient);
4444
}
4545

46-
public DatabaseCrudStretchTests(ITestOutputHelper output)
46+
public DatabaseCrudStretchTests(ITestOutputHelper output) : base(output)
4747
{
48-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
4948
}
5049

5150
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class DatabaseReplicationTests : SqlTestsBase
2424
{
25-
public DatabaseReplicationTests(ITestOutputHelper output)
25+
public DatabaseReplicationTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ElasticPoolCrudTests : SqlTestsBase
2424
{
25-
public ElasticPoolCrudTests(ITestOutputHelper output)
25+
public ElasticPoolCrudTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
// Currently the test runs too long to be marked as a check-in test.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class FailoverGroupTests : SqlTestsBase
2424
{
25-
public FailoverGroupTests(ITestOutputHelper output)
25+
public FailoverGroupTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
// Currently the test runs too long to be marked as a check-in test.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ImportExportTests : SqlTestsBase
2424
{
25-
public ImportExportTests(ITestOutputHelper output)
25+
public ImportExportTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class IndexRecommendationTests : SqlTestsBase
2424
{
25-
public IndexRecommendationTests(ITestOutputHelper output)
25+
public IndexRecommendationTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class LocationCapabilitiesTests : SqlTestsBase
2424
{
25-
public LocationCapabilitiesTests(ITestOutputHelper output)
25+
public LocationCapabilitiesTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ReadScaleCrudTests : SqlTestsBase
2424
{
25-
public ReadScaleCrudTests(ITestOutputHelper output)
25+
public ReadScaleCrudTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class RecommendedActionTests : SqlTestsBase
2424
{
25-
public RecommendedActionTests(ITestOutputHelper output)
25+
public RecommendedActionTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
#region Server Recommended Action Tests

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class RecommendedElasticPoolTests : SqlTestsBase
2424
{
25-
public RecommendedElasticPoolTests(ITestOutputHelper output)
25+
public RecommendedElasticPoolTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ServerActiveDirectoryAdministratorTest : SqlTestsBase
2424
{
25-
public ServerActiveDirectoryAdministratorTest(ITestOutputHelper output)
25+
public ServerActiveDirectoryAdministratorTest(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact(Skip = "SQL team hould re-record this test.")]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ServerCommunicationLinkCrudTests : SqlTestsBase
2424
{
25-
public ServerCommunicationLinkCrudTests(ITestOutputHelper output)
25+
public ServerCommunicationLinkCrudTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ServerCrudTests : SqlTestsBase
2424
{
25-
public ServerCrudTests(ITestOutputHelper output)
25+
public ServerCrudTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ServerDisasterRecoveryConfigurationTests : SqlTestsBase
2424
{
25-
public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output)
25+
public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output) : base(output)
2626
{
27-
var logger = new XunitTracingInterceptor(output);
28-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
29-
30-
helper.TracingInterceptor = logger;
3127
}
3228

3329
[Fact(Skip = "TODO fix the test failure")]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ServerKeyVaultKeyTests : SqlTestsBase
2424
{
25-
public ServerKeyVaultKeyTests(ITestOutputHelper output)
25+
public ServerKeyVaultKeyTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ServerUpgradeTests : SqlTestsBase
2424
{
25-
public ServerUpgradeTests(ITestOutputHelper output)
25+
public ServerUpgradeTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class ServiceTierAdvisorTests : SqlTestsBase
2424
{
25-
public ServiceTierAdvisorTests(ITestOutputHelper output)
25+
public ServiceTierAdvisorTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ public class SqlTestsBase : RMTestBase
4343

4444
public string UserDomain { get; private set; }
4545

46-
protected SqlTestsBase()
47-
{
48-
helper = new SqlEvnSetupHelper();
49-
}
50-
5146
protected SqlTestsBase(ITestOutputHelper output)
5247
{
5348
helper = new SqlEvnSetupHelper();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
3737
authorizationClient);
3838
}
3939

40-
public ThreatDetectionTests(ITestOutputHelper output)
40+
public ThreatDetectionTests(ITestOutputHelper output) : base(output)
4141
{
42-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
4342
}
4443

4544
[Fact]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
2323
public class TransparentDataEncryptionCrudTests : SqlTestsBase
2424
{
25-
public TransparentDataEncryptionCrudTests(ITestOutputHelper output)
25+
public TransparentDataEncryptionCrudTests(ITestOutputHelper output) : base(output)
2626
{
27-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2827
}
2928

3029
[Fact]

0 commit comments

Comments
 (0)