Skip to content

Commit 6a58dd9

Browse files
author
Samuel Anudeep
committed
Fixed test infra and ready for recording.
1 parent 535fb02 commit 6a58dd9

File tree

17 files changed

+206
-134
lines changed

17 files changed

+206
-134
lines changed

‎src/ResourceManager/CognitiveServices/CognitiveServices.sln

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.40629.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.25420.1
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}"
66
EndProject
@@ -46,6 +46,7 @@ Global
4646
{E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU
4747
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4848
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
49+
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
4950
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
5051
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU
5152
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
<SpecificVersion>False</SpecificVersion>
4141
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
4242
</Reference>
43+
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44+
<SpecificVersion>False</SpecificVersion>
45+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.3.0.1-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
46+
</Reference>
4347
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4448
<SpecificVersion>False</SpecificVersion>
4549
<HintPath>..\..\..\tempDll\Debug-Net45\net45\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
@@ -120,46 +124,30 @@
120124
<None Include="packages.config">
121125
<SubType>Designer</SubType>
122126
</None>
123-
<None Include="ScenarioTests\AzureSql\ContainerTests.ps1">
124-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
125-
</None>
126-
<None Include="ScenarioTests\AzureSql\PolicyTests.ps1">
127-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
128-
</None>
129-
<None Include="ScenarioTests\AzureSql\ItemTests.ps1">
130-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
131-
</None>
127+
<None Include="ScenarioTests\AzureSql\ContainerTests.ps1" />
128+
<None Include="ScenarioTests\AzureSql\ItemTests.ps1" />
129+
<None Include="ScenarioTests\AzureSql\PolicyTests.ps1" />
130+
<None Include="ScenarioTests\Dpm\ContainerTests.ps1" />
132131
<None Include="ScenarioTests\IaasVm\Common.ps1">
133132
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
134133
</None>
135-
<None Include="ScenarioTests\IaasVm\JobTests.ps1">
136-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
137-
</None>
138-
<None Include="ScenarioTests\IaasVm\ItemTests.ps1">
139-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
140-
</None>
141-
<None Include="ScenarioTests\IaasVm\PolicyTests.ps1">
142-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
143-
</None>
144134
<None Include="ScenarioTests\IaasVm\ContainerTests.ps1">
145135
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
146136
</None>
147-
<None Include="ScenarioTests\Mab\ContainerTests.ps1">
148-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
149-
</None>
150-
<None Include="ScenarioTests\Dpm\ContainerTests.ps1">
151-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
152-
</None>
153137
<Compile Include="ScenarioTests\AzureSql\ContainerTests.cs" />
154-
<Compile Include="ScenarioTests\AzureSql\PolicyTests.cs" />
155138
<Compile Include="ScenarioTests\AzureSql\ItemTests.cs" />
156-
<Compile Include="ScenarioTests\IaasVm\JobTests.cs" />
139+
<Compile Include="ScenarioTests\AzureSql\PolicyTests.cs" />
140+
<Compile Include="ScenarioTests\Dpm\ContainerTests.cs" />
141+
<Compile Include="ScenarioTests\IaasVm\ContainerTests.cs" />
157142
<Compile Include="ScenarioTests\IaasVm\ItemTests.cs" />
143+
<Compile Include="ScenarioTests\IaasVm\JobTests.cs" />
158144
<Compile Include="ScenarioTests\IaasVm\PolicyTests.cs" />
159-
<Compile Include="ScenarioTests\IaasVm\ContainerTests.cs" />
160145
<Compile Include="ScenarioTests\Mab\ContainerTests.cs" />
161-
<Compile Include="ScenarioTests\Dpm\ContainerTests.cs" />
162146
<Compile Include="ScenarioTests\TestsBase.cs" />
147+
<None Include="ScenarioTests\IaasVm\ItemTests.ps1" />
148+
<None Include="ScenarioTests\IaasVm\JobTests.ps1" />
149+
<None Include="ScenarioTests\IaasVm\PolicyTests.ps1" />
150+
<None Include="ScenarioTests\Mab\ContainerTests.ps1" />
163151
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.ContainerTests\TestGetAzureSqlContainer.json">
164152
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
165153
</None>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureSql/ContainerTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,24 @@
2020
using Xunit;
2121
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2222
using Microsoft.WindowsAzure.Commands.ScenarioTest;
23+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2324

2425
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2526
{
26-
public partial class ContainerTests : TestsBase
27+
public partial class ContainerTests : RMTestBase
2728
{
2829
[Fact]
2930
[Trait(Category.AcceptanceType, Category.CheckIn)]
3031
public void TestGetAzureSqlContainer()
3132
{
32-
this.RunPowerShellTest(
33-
PsBackupProviderTypes.AzureSql.ToString(), "Test-GetAzureSqlContainer");
33+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.AzureSql, "Test-GetAzureSqlContainer");
3434
}
3535

3636
[Fact]
3737
[Trait(Category.AcceptanceType, Category.CheckIn)]
3838
public void TestUnregisterAzureSqlContainer()
3939
{
40-
this.RunPowerShellTest(
41-
PsBackupProviderTypes.AzureSql.ToString(), "Test-UnregisterAzureSqlContainer");
40+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.AzureSql, "Test-UnregisterAzureSqlContainer");
4241
}
4342
}
4443
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureSql/ItemTests.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1616
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1819
using System;
1920
using System.Collections.Generic;
2021
using System.Linq;
@@ -25,33 +26,28 @@
2526

2627
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2728
{
28-
public partial class ItemTests : TestsBase
29+
public partial class ItemTests : RMTestBase
2930
{
3031

3132
[Fact]
3233
[Trait(Category.AcceptanceType, Category.CheckIn)]
3334
public void TestGetAzureSqlItemScenario()
3435
{
35-
this.RunPowerShellTest(
36-
PsBackupProviderTypes.AzureSql.ToString(), "Test-GetAzureSqlItemScenario");
36+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.AzureSql, "Test-GetAzureSqlItemScenario");
3737
}
3838

3939
[Fact]
4040
[Trait(Category.AcceptanceType, Category.CheckIn)]
4141
public void TestDisableAzureSqlProtectionScenario()
4242
{
43-
this.RunPowerShellTest(
44-
PsBackupProviderTypes.AzureSql.ToString(),
45-
"Test-DisableAzureSqlProtectionScenario");
43+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.AzureSql, "Test-DisableAzureSqlProtectionScenario");
4644
}
4745

4846
[Fact]
4947
[Trait(Category.AcceptanceType, Category.CheckIn)]
5048
public void TestGetAzureSqlRecoveryPointsScenario()
5149
{
52-
this.RunPowerShellTest(
53-
PsBackupProviderTypes.AzureSql.ToString(),
54-
"Test-GetAzureSqlRecoveryPointsScenario");
50+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.AzureSql, "Test-GetAzureSqlRecoveryPointsScenario");
5551
}
5652
}
5753
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureSql/PolicyTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
using Xunit;
2121
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2222
using Microsoft.WindowsAzure.Commands.ScenarioTest;
23+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2324

2425
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2526
{
26-
public partial class PolicyTests : TestsBase
27+
public partial class PolicyTests : RMTestBase
2728
{
2829
[Fact]
2930
[Trait(Category.AcceptanceType, Category.CheckIn)]
3031
public void TestAzureSqlPolicyScenario()
3132
{
32-
this.RunPowerShellTest(
33-
PsBackupProviderTypes.AzureSql.ToString(), "Test-AzureSqlPolicyScenario");
33+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.AzureSql, "Test-AzureSqlPolicyScenario");
3434
}
3535
}
3636
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Dpm/ContainerTests.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1616
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1819
using System;
1920
using System.Collections.Generic;
2021
using System.Linq;
@@ -25,7 +26,7 @@
2526

2627
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2728
{
28-
public partial class ContainerTests : TestsBase
29+
public partial class ContainerTests : RMTestBase
2930
{
3031
public ContainerTests(ITestOutputHelper output)
3132
{
@@ -36,14 +37,14 @@ public ContainerTests(ITestOutputHelper output)
3637
[Trait(Category.AcceptanceType, Category.CheckIn)]
3738
public void TestGetBackupManagementServer()
3839
{
39-
this.RunPowerShellTest(PsBackupProviderTypes.Dpm.ToString(), "Test-GetContainerScenario");
40+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.Dpm, "Test-GetContainerScenario");
4041
}
4142

4243
[Fact]
4344
[Trait(Category.AcceptanceType, Category.CheckIn)]
4445
public void TestUnregisterDpmContainer()
4546
{
46-
this.RunPowerShellTest(PsBackupProviderTypes.Dpm.ToString(), "Test-UnregisterContainerScenario");
47+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.Dpm, "Test-UnregisterContainerScenario");
4748
}
4849
}
4950
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ContainerTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1616
using Microsoft.WindowsAzure.Commands.ScenarioTest;
17+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1718
using System;
1819
using System.Collections.Generic;
1920
using System.Linq;
@@ -23,13 +24,13 @@
2324

2425
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2526
{
26-
public partial class ContainerTests : TestsBase
27+
public partial class ContainerTests : RMTestBase
2728
{
2829
[Fact]
2930
[Trait(Category.AcceptanceType, Category.CheckIn)]
3031
public void TestGetContainerScenario()
3132
{
32-
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-GetContainerScenario");
33+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.IaasVm, "Test-GetContainerScenario");
3334
}
3435
}
3536
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ContainerTests.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15+
<#
16+
.SYNOPSIS
17+
Test Recovery Services Backup Vault
18+
#>
19+
1520
$resourceGroupName = "labRG1";
1621
$resourceName = "pstestrsvault";
1722
$defaultPolicyName = "DefaultPolicy";

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1616
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1819
using System;
1920
using System.Collections.Generic;
2021
using System.Linq;
@@ -25,7 +26,7 @@
2526

2627
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2728
{
28-
public partial class ItemTests : TestsBase
29+
public partial class ItemTests : RMTestBase
2930
{
3031
public ItemTests(ITestOutputHelper output)
3132
{
@@ -36,40 +37,40 @@ public ItemTests(ITestOutputHelper output)
3637
[Trait(Category.AcceptanceType, Category.CheckIn)]
3738
public void TestGetItemScenario()
3839
{
39-
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-GetItemScenario");
40+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.IaasVm, "Test-GetItemScenario");
4041
}
4142

4243
[Fact]
4344
[Trait(Category.AcceptanceType, Category.CheckIn)]
4445
public void TestEnableAzureVMProtectionScenario()
4546
{
46-
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-EnableAzureVMProtectionScenario");
47+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.IaasVm, "Test-EnableAzureVMProtectionScenario");
4748
}
4849

4950
[Fact]
5051
[Trait(Category.AcceptanceType, Category.CheckIn)]
5152
public void TestDisableAzureVMProtectionScenario()
5253
{
53-
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-DisableAzureVMProtectionScenario");
54+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.IaasVm, "Test-DisableAzureVMProtectionScenario");
5455
}
5556

5657
[Fact]
5758
[Trait(Category.AcceptanceType, Category.CheckIn)]
5859
public void TestBackupItemScenario()
5960
{
60-
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-BackupItemScenario");
61+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.IaasVm, "Test-BackupItemScenario");
6162
}
6263

6364
[Fact]
6465
[Trait(Category.AcceptanceType, Category.CheckIn)]
6566
public void TestGetAzureVMRecoveryPointsScenario()
6667
{
67-
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-GetAzureVMRecoveryPointsScenario");
68+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.IaasVm, "Test-GetAzureVMRecoveryPointsScenario");
6869
}
6970

7071
public void TestRestoreAzureVMItemScenario()
7172
{
72-
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-RestoreAzureVMRItemScenario");
73+
TestController.NewInstance.RunPsTest(PsBackupProviderTypes.IaasVm, "Test-RestoreAzureVMRItemScenario");
7374
}
7475
}
7576
}

0 commit comments

Comments
 (0)