Skip to content

Commit 92bdf2f

Browse files
vladimir-shcherbakovvladimir-shcherbakov
committed
Resources switched to the new test controller
1 parent 670af31 commit 92bdf2f

22 files changed

+355
-265
lines changed

‎src/ResourceManager/Resources/Commands.Resources.Test/App.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.Netcore.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<ProjectReference Include="..\..\..\Common\Commands.Common\Common.Netcore.csproj" />
3737
<ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Common.ResourceManager.Netcore.csproj" />
3838
<ProjectReference Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Common.ResourceManager.ScenarioTests.Netcore.csproj" />
39+
<ProjectReference Include="..\..\Common\Commands.TestFw\Commands.TestFw.Netcore.csproj" />
3940
</ItemGroup>
4041

4142
<ItemGroup>

‎src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
8383
</Reference>
8484
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.8.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
8687
<Private>True</Private>
8788
</Reference>
8889
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -93,12 +94,19 @@
9394
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
9495
<Private>True</Private>
9596
</Reference>
97+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.11\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
99+
<Private>True</Private>
100+
</Reference>
96101
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
102+
<SpecificVersion>False</SpecificVersion>
103+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.0\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
98104
<Private>True</Private>
99105
</Reference>
100-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
101-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
106+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107+
<SpecificVersion>False</SpecificVersion>
108+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.2\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
109+
<Private>True</Private>
102110
</Reference>
103111
<Reference Include="Microsoft.Threading.Tasks">
104112
<SpecificVersion>False</SpecificVersion>
@@ -122,8 +130,10 @@
122130
<SpecificVersion>False</SpecificVersion>
123131
<HintPath>..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
124132
</Reference>
125-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
126-
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
133+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
134+
<SpecificVersion>False</SpecificVersion>
135+
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
136+
<Private>True</Private>
127137
</Reference>
128138
<Reference Include="System" />
129139
<Reference Include="System.Core" />
@@ -167,6 +177,7 @@
167177
<Compile Include="ResourceGroups\SetAzureResourceGroupCommandTests.cs" />
168178
<Compile Include="RoleAssignment\RoleAssignmentUnitTests.cs" />
169179
<Compile Include="ScenarioTests\ActiveDirectoryTests.cs" />
180+
<Compile Include="ScenarioTests\TestManagerBuilder.cs" />
170181
<Content Include="ScenarioTests\ProviderFeatureTests.ps1">
171182
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
172183
</Content>
@@ -225,6 +236,10 @@
225236
<Project>{3436a126-edc9-4060-8952-9a1be34cdd95}</Project>
226237
<Name>Commands.ScenarioTests.ResourceManager.Common</Name>
227238
</ProjectReference>
239+
<ProjectReference Include="..\..\Common\Commands.TestFw\Commands.TestFw.csproj">
240+
<Project>{8c625de3-0067-454a-af2c-efd672eeb31a}</Project>
241+
<Name>Commands.TestFw</Name>
242+
</ProjectReference>
228243
<ProjectReference Include="..\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj">
229244
<Project>{8058d403-06e3-4bed-8924-d166ce303961}</Project>
230245
<Name>Commands.Resources.Rest</Name>
@@ -235,6 +250,7 @@
235250
</ProjectReference>
236251
</ItemGroup>
237252
<ItemGroup>
253+
<None Include="App.config" />
238254
<None Include="complexParameters.json">
239255
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
240256
</None>

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ActiveDirectoryTests.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1919
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
2020
using Microsoft.WindowsAzure.Commands.ScenarioTest;
21-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2221
using Xunit;
2322
using Xunit.Abstractions;
2423

2524
namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
2625
{
27-
public class ActiveDirectoryTests : RMTestBase
26+
public class ActiveDirectoryTests: TestManagerBuilder
2827
{
2928
XunitTracingInterceptor interceptor { get; set; }
3029

31-
public ActiveDirectoryTests(ITestOutputHelper output)
30+
public ActiveDirectoryTests(ITestOutputHelper output) : base(output)
3231
{
3332
interceptor = new XunitTracingInterceptor(output);
3433
XunitTracingInterceptor.AddToContext(interceptor);
@@ -88,7 +87,8 @@ public void TestGetADGroupWithSearchString()
8887
[Trait(Category.AcceptanceType, Category.CheckIn)]
8988
public void TestGetADGroupWithBadSearchString()
9089
{
91-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADGroupWithBadSearchString");
90+
//ResourcesController.NewInstance.RunPsTest("Test-GetADGroupWithBadSearchString");
91+
TestManager.RunTestScript("Test-GetADGroupWithBadSearchString");
9292
}
9393

9494
[Fact]
@@ -145,7 +145,7 @@ public void TestGetADGroupSecurityEnabled()
145145
[Trait(Category.AcceptanceType, Category.CheckIn)]
146146
public void TestGetADGroupWithBadObjectId()
147147
{
148-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADGroupWithBadObjectId");
148+
TestManager.RunTestScript("Test-GetADGroupWithBadObjectId");
149149
}
150150

151151
[Fact]
@@ -214,7 +214,7 @@ public void TestGetADGroupMemberWithGroupObjectId()
214214
[Trait(Category.AcceptanceType, Category.CheckIn)]
215215
public void TestGetADGroupMemberWithBadGroupObjectId()
216216
{
217-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADGroupMemberWithBadGroupObjectId");
217+
TestManager.RunTestScript("Test-GetADGroupMemberWithBadGroupObjectId");
218218
}
219219

220220
[Fact]
@@ -299,7 +299,7 @@ public void TestGetADServicePrincipalWithObjectId()
299299
[Trait(Category.AcceptanceType, Category.CheckIn)]
300300
public void TestGetADServicePrincipalWithBadObjectId()
301301
{
302-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADServicePrincipalWithBadObjectId");
302+
TestManager.RunTestScript("Test-GetADServicePrincipalWithBadObjectId");
303303
}
304304

305305
[Fact]
@@ -359,7 +359,7 @@ public void TestGetADServicePrincipalWithSPN()
359359
[Trait(Category.AcceptanceType, Category.CheckIn)]
360360
public void TestGetADServicePrincipalWithBadSPN()
361361
{
362-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADServicePrincipalWithBadSPN");
362+
TestManager.RunTestScript("Test-GetADServicePrincipalWithBadSPN");
363363
}
364364

365365
[Fact]
@@ -394,7 +394,7 @@ public void TestGetADServicePrincipalWithSearchString()
394394
[Trait(Category.AcceptanceType, Category.CheckIn)]
395395
public void TestGetADServicePrincipalWithBadSearchString()
396396
{
397-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADServicePrincipalWithBadSearchString");
397+
TestManager.RunTestScript("Test-GetADServicePrincipalWithBadSearchString");
398398
}
399399

400400
[Fact]
@@ -476,7 +476,7 @@ public void TestGetADUserWithMail()
476476
[Trait(Category.AcceptanceType, Category.CheckIn)]
477477
public void TestGetADUserWithBadObjectId()
478478
{
479-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADUserWithBadObjectId");
479+
TestManager.RunTestScript("Test-GetADUserWithBadObjectId");
480480
}
481481

482482
[Fact]
@@ -533,14 +533,14 @@ public void TestGetADUserWithUPN()
533533
[Trait(Category.AcceptanceType, Category.CheckIn)]
534534
public void TestGetADUserWithFPOUPN()
535535
{
536-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADUserWithFPOUPN");
536+
TestManager.RunTestScript("Test-GetADUserWithFPOUPN");
537537
}
538538

539539
[Fact]
540540
[Trait(Category.AcceptanceType, Category.CheckIn)]
541541
public void TestGetADUserWithBadUPN()
542542
{
543-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADUserWithBadUPN");
543+
TestManager.RunTestScript("Test-GetADUserWithBadUPN");
544544
}
545545

546546
[Fact]
@@ -572,49 +572,49 @@ public void TestGetADUserWithSearchString()
572572
[Trait(Category.AcceptanceType, Category.CheckIn)]
573573
public void TestGetADUserWithBadSearchString()
574574
{
575-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-GetADUserWithBadSearchString");
575+
TestManager.RunTestScript("Test-GetADUserWithBadSearchString");
576576
}
577577

578578
[Fact]
579579
[Trait(Category.AcceptanceType, Category.CheckIn)]
580580
public void TestNewADApplication()
581581
{
582-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-NewADApplication");
582+
TestManager.RunTestScript("Test-NewADApplication");
583583
}
584584

585585
[Fact]
586586
[Trait(Category.AcceptanceType, Category.CheckIn)]
587587
public void TestNewADServicePrincipalWithoutApp()
588588
{
589-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-NewADServicePrincipalWithoutApp");
589+
TestManager.RunTestScript("Test-NewADServicePrincipalWithoutApp");
590590
}
591591

592592
[Fact]
593593
[Trait(Category.AcceptanceType, Category.CheckIn)]
594594
public void TestNewADServicePrincipalWithReaderRole()
595595
{
596-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-NewADServicePrincipalWithReaderRole");
596+
TestManager.RunTestScript("Test-NewADServicePrincipalWithReaderRole");
597597
}
598598

599599
[Fact]
600600
[Trait(Category.AcceptanceType, Category.CheckIn)]
601601
public void TestNewADServicePrincipalWithCustomScope()
602602
{
603-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-NewADServicePrincipalWithCustomScope");
603+
TestManager.RunTestScript("Test-NewADServicePrincipalWithCustomScope");
604604
}
605605

606606
[Fact(Skip = "Not working in playback.")]
607607
[Trait(Category.AcceptanceType, Category.CheckIn)]
608608
public void TestCreateDeleteAppPasswordCredentials()
609609
{
610-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-CreateDeleteAppPasswordCredentials");
610+
TestManager.RunTestScript("Test-CreateDeleteAppPasswordCredentials");
611611
}
612612

613613
[Fact(Skip = "Not working in playback.")]
614614
[Trait(Category.AcceptanceType, Category.CheckIn)]
615615
public void TestCreateDeleteSpPasswordCredentials()
616616
{
617-
ResourcesController.NewInstance.RunPsTest(interceptor, "Test-CreateDeleteSpPasswordCredentials");
617+
TestManager.RunTestScript("Test-CreateDeleteSpPasswordCredentials");
618618
}
619619

620620
[Fact]

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/DeploymentTests.cs

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,112 +12,107 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1615
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1716
using Xunit;
1817
using Xunit.Abstractions;
1918

2019
namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
2120
{
22-
public class DeploymentTests
21+
public class DeploymentTests : TestManagerBuilder
2322
{
24-
public XunitTracingInterceptor _logger;
25-
26-
public DeploymentTests(Xunit.Abstractions.ITestOutputHelper output)
23+
public DeploymentTests(ITestOutputHelper output) : base(output)
2724
{
28-
_logger = new XunitTracingInterceptor(output);
29-
XunitTracingInterceptor.AddToContext(_logger);
3025
}
3126

3227
[Fact(Skip = "Need to implement storage client mock.")]
3328
[Trait(Category.AcceptanceType, Category.CheckIn)]
3429
public void TestValidateDeployment()
3530
{
36-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-ValidateDeployment");
31+
TestManager.RunTestScript("Test-ValidateDeployment");
3732
}
3833

3934
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
4035
[Trait(Category.AcceptanceType, Category.CheckIn)]
4136
[Trait("Re-record", "ClientRuntime changes")]
4237
public void TestNewDeploymentFromTemplateFile()
4338
{
44-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NewDeploymentFromTemplateFile");
39+
TestManager.RunTestScript("Test-NewDeploymentFromTemplateFile");
4540
}
4641

4742
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
4843
[Trait("Re-record", "ClientRuntime changes")]
4944
[Trait(Category.AcceptanceType, Category.CheckIn)]
5045
public void TestNestedDeploymentFromTemplateFile()
5146
{
52-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NestedDeploymentFromTemplateFile");
47+
TestManager.RunTestScript("Test-NestedDeploymentFromTemplateFile");
5348
}
5449

5550
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
5651
[Trait(Category.AcceptanceType, Category.CheckIn)]
5752
[Trait("Re-record", "ClientRuntime changes")]
5853
public void TestCrossResourceGroupDeploymentFromTemplateFile()
5954
{
60-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-CrossResourceGroupDeploymentFromTemplateFile");
55+
TestManager.RunTestScript("Test-CrossResourceGroupDeploymentFromTemplateFile");
6156
}
6257

6358
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
6459
[Trait("Re-record", "ClientRuntime changes")]
6560
[Trait(Category.AcceptanceType, Category.CheckIn)]
6661
public void TestSaveDeploymentTemplateFile()
6762
{
68-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-SaveDeploymentTemplateFile");
63+
TestManager.RunTestScript("Test-SaveDeploymentTemplateFile");
6964
}
7065

7166
[Fact]
7267
[Trait(Category.AcceptanceType, Category.CheckIn)]
7368
public void TestNestedErrorsDisplayed()
7469
{
75-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NestedErrorsDisplayed");
70+
TestManager.RunTestScript("Test-NestedErrorsDisplayed");
7671
}
7772

7873
[Fact(Skip = "Fix acquisition of TenantId in KeyVault Test.")]
7974
[Trait(Category.AcceptanceType, Category.CheckIn)]
8075
public void TestNewDeploymentWithKeyVaultReference()
8176
{
82-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NewDeploymentWithKeyVaultReference");
77+
TestManager.RunTestScript("Test-NewDeploymentWithKeyVaultReference");
8378
}
8479

8580
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
8681
[Trait("Re-record", "ClientRuntime changes")]
8782
[Trait(Category.AcceptanceType, Category.CheckIn)]
8883
public void TestNewDeploymentWithComplexPramaters()
8984
{
90-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NewDeploymentWithComplexPramaters");
85+
TestManager.RunTestScript("Test-NewDeploymentWithComplexPramaters");
9186
}
9287

9388
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
9489
[Trait(Category.AcceptanceType, Category.CheckIn)]
9590
[Trait("Re-record", "ClientRuntime changes")]
9691
public void TestNewDeploymentWithParameterObject()
9792
{
98-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NewDeploymentWithParameterObject");
93+
TestManager.RunTestScript("Test-NewDeploymentWithParameterObject");
9994
}
10095

10196
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
10297
[Trait(Category.AcceptanceType, Category.CheckIn)]
10398
[Trait("Re-record", "ClientRuntime changes")]
10499
public void TestNewDeploymentWithDynamicParameters()
105100
{
106-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NewDeploymentWithDynamicParameters");
101+
TestManager.RunTestScript("Test-NewDeploymentWithDynamicParameters");
107102
}
108103

109104
[Fact]
110105
[Trait(Category.AcceptanceType, Category.CheckIn)]
111106
public void TestNewDeploymentWithInvalidParameters()
112107
{
113-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NewDeploymentWithInvalidParameters");
108+
TestManager.RunTestScript("Test-NewDeploymentWithInvalidParameters");
114109
}
115110

116111
[Fact]
117112
[Trait(Category.AcceptanceType, Category.CheckIn)]
118113
public void TestNewDeploymentWithKeyVaultReferenceInParameterObject()
119114
{
120-
ResourcesController.NewInstance.RunPsTest(_logger, "Test-NewDeploymentWithKeyVaultReferenceInParameterObject");
115+
TestManager.RunTestScript("Test-NewDeploymentWithKeyVaultReferenceInParameterObject");
121116
}
122117
}
123118
}

0 commit comments

Comments
 (0)