Skip to content

Commit aa74bc2

Browse files
CaptainFanZzzCaptainFanZzz
authored
Add NetAppFilesTestRunner and replace TestController (Azure#18175)
1 parent dc5409f commit aa74bc2

15 files changed

+111
-247
lines changed

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/AccountTests.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,31 @@
1717

1818
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AccountTests
20+
public class AccountTests : NetAppFilesTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AccountTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AccountTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestAccountCrud()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AccountCrud");
30+
TestRunner.RunTestScript("Test-AccountCrud");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestAccountActiveDirectory()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AccountActiveDirectory");
37+
TestRunner.RunTestScript("Test-AccountActiveDirectory");
4238
}
4339

4440
[Fact]
4541
[Trait(Category.AcceptanceType, Category.CheckIn)]
4642
public void TestAccountPipelines()
4743
{
48-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AccountPipelines");
44+
TestRunner.RunTestScript("Test-AccountPipelines");
4945
}
5046
}
5147
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/ActiveDirectoryTests.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@
1717

1818
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class ActiveDirectoryTests
20+
public class ActiveDirectoryTests : NetAppFilesTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public ActiveDirectoryTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public ActiveDirectoryTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestActiveDirectoryCrud()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-ActiveDirectoryCrud");
30+
TestRunner.RunTestScript("Test-ActiveDirectoryCrud");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestActiveDirectoryPipelines()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-ActiveDirectoryPipelines");
37+
TestRunner.RunTestScript("Test-ActiveDirectoryPipelines");
4238
}
4339
}
4440
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupPolicyTests.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@
1717

1818
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class BackupPolicyTests
20+
public class BackupPolicyTests : NetAppFilesTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public BackupPolicyTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public BackupPolicyTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestBackupPolicyCrud()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupPolicyCrud");
30+
TestRunner.RunTestScript("Test-BackupPolicyCrud");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestBackupPolicyPipelines()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupPolicyPipelines");
37+
TestRunner.RunTestScript("Test-BackupPolicyPipelines");
4238
}
4339
}
4440
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupTests.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,31 @@
1717

1818
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class BackupTests
20+
public class BackupTests : NetAppFilesTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public BackupTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public BackupTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestBackupCrud()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupCrud");
30+
TestRunner.RunTestScript("Test-BackupCrud");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestBackupPipelines()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupPipelines");
37+
TestRunner.RunTestScript("Test-BackupPipelines");
4238
}
4339

4440
[Fact]
4541
[Trait(Category.AcceptanceType, Category.CheckIn)]
4642
public void TestVolumeBackupStatusCrud()
4743
{
48-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-VolumeBackupStatus");
44+
TestRunner.RunTestScript("Test-VolumeBackupStatus");
4945
}
5046

5147
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/ExportPolicyTests.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,17 @@
1717

1818
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class ExportPolicyTests
20+
public class ExportPolicyTests : NetAppFilesTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public ExportPolicyTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public ExportPolicyTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestExportPolicy()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-ExportPolicy");
30+
TestRunner.RunTestScript("Test-ExportPolicy");
3531
}
3632
}
3733
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/NetAppFilesTestRunner.cs‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System.Collections.Generic;
16+
using Microsoft.Azure.Commands.TestFx;
17+
using Xunit.Abstractions;
18+
19+
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests
20+
{
21+
public class NetAppFilesTestRunner
22+
{
23+
protected readonly ITestRunner TestRunner;
24+
25+
protected NetAppFilesTestRunner(ITestOutputHelper output)
26+
{
27+
TestRunner = TestManager.CreateInstance(output)
28+
.WithNewPsScriptFilename($"{GetType().Name}.ps1")
29+
.WithProjectSubfolderForTests("ScenarioTests")
30+
.WithCommonPsScripts(new[]
31+
{
32+
@"Common.ps1",
33+
@"../AzureRM.Resources.ps1"
34+
})
35+
.WithNewRmModules(helper => new[]
36+
{
37+
helper.RMProfileModule,
38+
helper.RMNetworkModule,
39+
helper.GetRMModulePath("Az.NetAppFiles.psd1")
40+
})
41+
.WithNewRecordMatcherArguments(
42+
userAgentsToIgnore: new Dictionary<string, string>
43+
{
44+
{"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
45+
},
46+
resourceProviders: new Dictionary<string, string>
47+
{
48+
{"Microsoft.Resources", null},
49+
{"Microsoft.Features", null},
50+
{"Microsoft.Authorization", null},
51+
{"Microsoft.Network", null},
52+
{"Microsoft.Compute", null}
53+
}
54+
)
55+
.Build();
56+
}
57+
}
58+
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/PoolTests.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@
1717

1818
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class PoolTests
20+
public class PoolTests : NetAppFilesTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public PoolTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public PoolTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestPoolCrud()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-PoolCrud");
30+
TestRunner.RunTestScript("Test-PoolCrud");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestPoolPipelines()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-PoolPipelines");
37+
TestRunner.RunTestScript("Test-PoolPipelines");
4238
}
4339
}
4440
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/QuotaLimitTests.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,17 @@
1616
using Xunit;
1717
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1818
{
19-
public class QuotaLimitTests
19+
public class QuotaLimitTests : NetAppFilesTestRunner
2020
{
21-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
22-
23-
public QuotaLimitTests(Xunit.Abstractions.ITestOutputHelper output)
21+
public QuotaLimitTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2422
{
25-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
26-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2723
}
2824

2925
[Fact]
3026
[Trait(Category.AcceptanceType, Category.CheckIn)]
3127
public void TestQuotaLimit()
3228
{
33-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-QuotaLimit");
29+
TestRunner.RunTestScript("Test-QuotaLimit");
3430
}
3531
}
3632
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/SnapshotPolicyTests.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@
1717

1818
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class SnapshotPolicyTests
20+
public class SnapshotPolicyTests : NetAppFilesTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public SnapshotPolicyTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public SnapshotPolicyTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestSnapshotPolicyCrud()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-SnapshotPolicyCrud");
30+
TestRunner.RunTestScript("Test-SnapshotPolicyCrud");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestSnapshotPolicyPipelines()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-SnapshotPolicyPipelines");
37+
TestRunner.RunTestScript("Test-SnapshotPolicyPipelines");
4238
}
4339
}
4440
}

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/SnapshotTests.cs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,43 +17,39 @@
1717

1818
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class SnapshotTests
20+
public class SnapshotTests : NetAppFilesTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public SnapshotTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public SnapshotTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestSnapshotCrud()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-SnapshotCrud");
30+
TestRunner.RunTestScript("Test-SnapshotCrud");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestSnapshotPipelines()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-SnapshotPipelines");
37+
TestRunner.RunTestScript("Test-SnapshotPipelines");
4238
}
4339

4440
[Fact]
4541
[Trait(Category.AcceptanceType, Category.CheckIn)]
4642
public void TestCreateVolumeFromSnapshot()
4743
{
48-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateVolumeFromSnapshot");
44+
TestRunner.RunTestScript("Test-CreateVolumeFromSnapshot");
4945
}
5046

5147

5248
[Fact]
5349
[Trait(Category.AcceptanceType, Category.CheckIn)]
5450
public void TestRestoreVolumeFromSnapshot()
5551
{
56-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-RestoreVolumeFromSnapshot");
52+
TestRunner.RunTestScript("Test-RestoreVolumeFromSnapshot");
5753
}
5854
}
5955
}

0 commit comments

Comments
 (0)