Skip to content

Commit a235107

Browse files
author
Ziyue Zheng
authored
Add DataboxEdgeTestRunner to replace TestBase (Azure#18091)
1 parent 12c25f9 commit a235107

12 files changed

Lines changed: 115 additions & 246 deletions

‎src/DataBoxEdge/DataBoxEdge.Test/ScenarioTests/DataBoxEdgeBandwidthScheduleTests.cs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,49 +18,45 @@
1818

1919
namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Test.ScenarioTests
2020
{
21-
public class DataBoxEdgeBandwidthScheduleTests : DataBoxEdgeScenarioTestBase
21+
public class DataBoxEdgeBandwidthScheduleTests : DataBoxEdgeTestRunner
2222
{
23-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
24-
25-
public DataBoxEdgeBandwidthScheduleTests(Xunit.Abstractions.ITestOutputHelper output)
23+
public DataBoxEdgeBandwidthScheduleTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2624
{
27-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
28-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2925
}
3026

3127
[Fact]
3228
[Trait(Category.AcceptanceType, Category.CheckIn)]
3329
public void TestGetNonExistingBandwidthSchedule()
3430
{
35-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-GetNonExistingBandwidthSchedule");
31+
TestRunner.RunTestScript("Test-GetNonExistingBandwidthSchedule");
3632
}
3733

3834
[Fact]
3935
[Trait(Category.AcceptanceType, Category.CheckIn)]
4036
public void TestCreateBandwidthSchedule()
4137
{
42-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-CreateBandwidthSchedule");
38+
TestRunner.RunTestScript("Test-CreateBandwidthSchedule");
4339
}
4440

4541
[Fact]
4642
[Trait(Category.AcceptanceType, Category.CheckIn)]
4743
public void TestUpdateBandwidthSchedule()
4844
{
49-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-UpdateBandwidthSchedule");
45+
TestRunner.RunTestScript("Test-UpdateBandwidthSchedule");
5046
}
5147

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

5955
[Fact]
6056
[Trait(Category.AcceptanceType, Category.CheckIn)]
6157
public void TestRemoveBandwidthSchedule()
6258
{
63-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-RemoveBandwidthSchedule");
59+
TestRunner.RunTestScript("Test-RemoveBandwidthSchedule");
6460
}
6561
}
6662
}

‎src/DataBoxEdge/DataBoxEdge.Test/ScenarioTests/DataBoxEdgeDeviceTests.cs‎

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

1818
namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Test.ScenarioTests
1919
{
20-
public class DataBoxEdgeDeviceTests : DataBoxEdgeScenarioTestBase
20+
public class DataBoxEdgeDeviceTests : DataBoxEdgeTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public DataBoxEdgeDeviceTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public DataBoxEdgeDeviceTests(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 TestGetNonExistingDevice()
3329
{
34-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-GetDeviceNonExistent");
30+
TestRunner.RunTestScript("Test-GetDeviceNonExistent");
3531
}
3632

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

4440

4541
[Fact]
4642
[Trait(Category.AcceptanceType, Category.CheckIn)]
4743
public void TestRemoveDevice()
4844
{
49-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-RemoveDevice");
45+
TestRunner.RunTestScript("Test-RemoveDevice");
5046
}
5147
}
5248
}

‎src/DataBoxEdge/DataBoxEdge.Test/ScenarioTests/DataBoxEdgeOrderTests.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,32 @@
1818

1919
namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Test.ScenarioTests
2020
{
21-
public class DataBoxEdgeOrderTests : DataBoxEdgeScenarioTestBase
21+
public class DataBoxEdgeOrderTests : DataBoxEdgeTestRunner
2222
{
23-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
24-
25-
public DataBoxEdgeOrderTests(Xunit.Abstractions.ITestOutputHelper output)
23+
public DataBoxEdgeOrderTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2624
{
27-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
28-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2925
}
3026

3127
[Fact]
3228
[Trait(Category.AcceptanceType, Category.CheckIn)]
3329
public void TestGetNonExistingOrder()
3430
{
35-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-GetOrderNonExistent");
31+
TestRunner.RunTestScript("Test-GetOrderNonExistent");
3632
}
3733

3834

3935
[Fact]
4036
[Trait(Category.AcceptanceType, Category.CheckIn)]
4137
public void TestCreateOrder()
4238
{
43-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-CreateNewOrder");
39+
TestRunner.RunTestScript("Test-CreateNewOrder");
4440
}
4541

4642
[Fact]
4743
[Trait(Category.AcceptanceType, Category.CheckIn)]
4844
public void TestRemoveOrder()
4945
{
50-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-RemoveOrder");
46+
TestRunner.RunTestScript("Test-RemoveOrder");
5147
}
5248
}
5349
}

‎src/DataBoxEdge/DataBoxEdge.Test/ScenarioTests/DataBoxEdgeRoleTests.cs‎

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

1818
namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Test.ScenarioTests
1919
{
20-
public class DataBoxEdgeRoleTests : DataBoxEdgeScenarioTestBase
20+
public class DataBoxEdgeRoleTests : DataBoxEdgeTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public DataBoxEdgeRoleTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public DataBoxEdgeRoleTests(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 TestGetNonExistingRole()
3329
{
34-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger,
35-
"Test-GetRoleNonExistent");
30+
TestRunner.RunTestScript("Test-GetRoleNonExistent");
3631
}
3732

3833
[Fact]
3934
[Trait(Category.AcceptanceType, Category.LiveOnly)]
4035
public void TestCreateRole()
4136
{
42-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-CreateRole");
37+
TestRunner.RunTestScript("Test-CreateRole");
4338
}
4439

4540
[Fact]
4641
[Trait(Category.AcceptanceType, Category.LiveOnly)]
4742
public void TestRemoveRole()
4843
{
49-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-RemoveRole");
44+
TestRunner.RunTestScript("Test-RemoveRole");
5045
}
5146
}
5247
}

‎src/DataBoxEdge/DataBoxEdge.Test/ScenarioTests/DataBoxEdgeScenarioTestBase.cs‎

Lines changed: 0 additions & 152 deletions
This file was deleted.

‎src/DataBoxEdge/DataBoxEdge.Test/ScenarioTests/DataBoxEdgeShareTests.cs‎

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

1818
namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Test.ScenarioTests
1919
{
20-
public class DataBoxEdgeShareTests : DataBoxEdgeScenarioTestBase
20+
public class DataBoxEdgeShareTests : DataBoxEdgeTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public DataBoxEdgeShareTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public DataBoxEdgeShareTests(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 TestGetNonExistingShare()
3329
{
34-
DataBoxEdgeScenarioTestBase.NewInstance.RunPowerShellTest(_logger, "Test-GetShareNonExistent");
30+
TestRunner.RunTestScript("Test-GetShareNonExistent");
3531
}
3632

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

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

5147

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

0 commit comments

Comments
 (0)
⚡