Skip to content

NetStandard Tests v1 #7383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 3, 2018
Merged

NetStandard Tests v1 #7383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0702b31
Minor fixes for TestPrerequisites projects.
MiYanni Sep 19, 2018
9343b8b
Added Cdn tests to Az.
MiYanni Sep 21, 2018
54eadff
CognitiveServices tests now running for Az.
MiYanni Sep 21, 2018
544e98d
Dns tests now running in Az.
MiYanni Sep 21, 2018
8acb948
MachineLearning tests added to NetStandard.
MiYanni Sep 24, 2018
0f128df
MachineLearningCompute tests running in Az.
MiYanni Sep 25, 2018
06bce38
ServiceBus tests running in Az.
MiYanni Sep 25, 2018
e50daee
ServiceFabric tests running in Az.
MiYanni Sep 25, 2018
a4fb790
TrafficManager tests running in Az.
MiYanni Sep 25, 2018
d84a351
Merge branch 'preview' into netstandard-tests-v1
MiYanni Sep 25, 2018
f8f80b3
Fixed path for Linux for Test-NewAzureRmServiceFabricCluster.
MiYanni Sep 26, 2018
c2de7e2
Casing on the Resources folder name was wrong.
MiYanni Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,4 @@ launchSettings.json
/SolutionMappings.json
/TestMappings.json
/tools/Modules/tmp
/tools/Az/Az.psm1
112 changes: 112 additions & 0 deletions src/Azure.PowerShell.Netcore.Test.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.PolicyInsights.Tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Resources.Test.Netcore", "ResourceManager\Resources\Commands.Resources.Test\Commands.Resources.Test.Netcore.csproj", "{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Cdn.Test.Netcore", "ResourceManager\Cdn\Commands.Cdn.Test\Commands.Cdn.Test.Netcore.csproj", "{014C108A-C306-4CC3-BED4-82C052211507}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Management.CognitiveServices.Test.Netcore", "ResourceManager\CognitiveServices\CognitiveServices.Test\Commands.Management.CognitiveServices.Test.Netcore.csproj", "{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Dns.Test.Netcore", "ResourceManager\Dns\Commands.Dns.Test\Commands.Dns.Test.Netcore.csproj", "{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.MachineLearning.Test.Netcore", "ResourceManager\MachineLearning\Commands.MachineLearning.Test\Commands.MachineLearning.Test.Netcore.csproj", "{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.MachineLearningCompute.Test.Netcore", "ResourceManager\MachineLearningCompute\Commands.MachineLearningCompute.Test\Commands.MachineLearningCompute.Test.Netcore.csproj", "{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ServiceBus.Test.Netcore", "ResourceManager\ServiceBus\Commands.ServiceBus.Test\Commands.ServiceBus.Test.Netcore.csproj", "{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ServiceFabric.Test.Netcore", "ResourceManager\ServiceFabric\Commands.ServiceFabric.Test\Commands.ServiceFabric.Test.Netcore.csproj", "{7D025377-637F-4F3D-9657-5079045AEBFB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.TrafficManager.Test.Netcore", "ResourceManager\TrafficManager\Commands.TrafficManager2.Test\Commands.TrafficManager.Test.Netcore.csproj", "{9AB72517-E580-430C-9284-8EB271093CEA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -237,6 +253,102 @@ Global
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|x64.Build.0 = Release|Any CPU
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|x86.ActiveCfg = Release|Any CPU
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|x86.Build.0 = Release|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Debug|Any CPU.Build.0 = Debug|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Debug|x64.ActiveCfg = Debug|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Debug|x64.Build.0 = Debug|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Debug|x86.ActiveCfg = Debug|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Debug|x86.Build.0 = Debug|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Release|Any CPU.ActiveCfg = Release|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Release|Any CPU.Build.0 = Release|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Release|x64.ActiveCfg = Release|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Release|x64.Build.0 = Release|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Release|x86.ActiveCfg = Release|Any CPU
{014C108A-C306-4CC3-BED4-82C052211507}.Release|x86.Build.0 = Release|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Debug|x64.ActiveCfg = Debug|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Debug|x64.Build.0 = Debug|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Debug|x86.ActiveCfg = Debug|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Debug|x86.Build.0 = Debug|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Release|Any CPU.Build.0 = Release|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Release|x64.ActiveCfg = Release|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Release|x64.Build.0 = Release|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Release|x86.ActiveCfg = Release|Any CPU
{BE6AFE15-973B-4FE5-A6C7-64FCBF7EA950}.Release|x86.Build.0 = Release|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Debug|x64.ActiveCfg = Debug|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Debug|x64.Build.0 = Debug|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Debug|x86.ActiveCfg = Debug|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Debug|x86.Build.0 = Debug|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Release|Any CPU.Build.0 = Release|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Release|x64.ActiveCfg = Release|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Release|x64.Build.0 = Release|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Release|x86.ActiveCfg = Release|Any CPU
{7502C17A-88F8-4852-9E1D-7E9FA30D1B9C}.Release|x86.Build.0 = Release|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Debug|x64.ActiveCfg = Debug|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Debug|x64.Build.0 = Debug|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Debug|x86.ActiveCfg = Debug|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Debug|x86.Build.0 = Debug|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Release|Any CPU.Build.0 = Release|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Release|x64.ActiveCfg = Release|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Release|x64.Build.0 = Release|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Release|x86.ActiveCfg = Release|Any CPU
{CB3C4F1E-B502-4CC4-A2AD-EEC77BAA1838}.Release|x86.Build.0 = Release|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Debug|Any CPU.Build.0 = Debug|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Debug|x64.ActiveCfg = Debug|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Debug|x64.Build.0 = Debug|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Debug|x86.ActiveCfg = Debug|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Debug|x86.Build.0 = Debug|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Release|Any CPU.ActiveCfg = Release|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Release|Any CPU.Build.0 = Release|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Release|x64.ActiveCfg = Release|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Release|x64.Build.0 = Release|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Release|x86.ActiveCfg = Release|Any CPU
{54D79BBD-D766-45F0-B7C1-874DD7B7BB94}.Release|x86.Build.0 = Release|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Debug|x64.ActiveCfg = Debug|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Debug|x64.Build.0 = Debug|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Debug|x86.ActiveCfg = Debug|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Debug|x86.Build.0 = Debug|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Release|Any CPU.Build.0 = Release|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Release|x64.ActiveCfg = Release|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Release|x64.Build.0 = Release|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Release|x86.ActiveCfg = Release|Any CPU
{8D1D7883-25C2-4317-ADE3-2BD3BF3A6DF3}.Release|x86.Build.0 = Release|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Debug|x64.ActiveCfg = Debug|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Debug|x64.Build.0 = Debug|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Debug|x86.ActiveCfg = Debug|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Debug|x86.Build.0 = Debug|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Release|Any CPU.Build.0 = Release|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Release|x64.ActiveCfg = Release|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Release|x64.Build.0 = Release|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Release|x86.ActiveCfg = Release|Any CPU
{7D025377-637F-4F3D-9657-5079045AEBFB}.Release|x86.Build.0 = Release|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Debug|x64.ActiveCfg = Debug|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Debug|x64.Build.0 = Debug|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Debug|x86.ActiveCfg = Debug|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Debug|x86.Build.0 = Debug|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Release|Any CPU.Build.0 = Release|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Release|x64.ActiveCfg = Release|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Release|x64.Build.0 = Release|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Release|x86.ActiveCfg = Release|Any CPU
{9AB72517-E580-430C-9284-8EB271093CEA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
9 changes: 8 additions & 1 deletion src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
<IsPackable>false</IsPackable>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand All @@ -23,8 +24,14 @@
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
<PackageReference Include="Microsoft.Azure.Management.Cdn" Version="4.0.1-preview" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Cdn" Version="3.0.0-preview" />
<Reference Include="Microsoft.Azure.Commands.Cdn">
<HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Cdn\Microsoft.Azure.Commands.Cdn.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
Expand Down
104 changes: 24 additions & 80 deletions src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/TestController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,48 +14,29 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.Azure.Commands.Common.Authentication;
using Microsoft.Azure.Gallery;
using Microsoft.Azure.Management.Authorization;
using Microsoft.Azure.Management.Cdn;
using Microsoft.Azure.Management.Internal.Resources;
using Microsoft.Azure.Subscriptions;
using Microsoft.Azure.Test;
using Microsoft.Azure.Test.HttpRecorder;
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
using TestBase = Microsoft.Azure.Test.TestBase;
using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
using TestUtilities = Microsoft.Azure.Test.TestUtilities;

namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
{
public class TestController : RMTestBase
{
private CSMTestEnvironmentFactory _csmTestFactory;

private readonly EnvironmentSetupHelper _helper;

public ResourceManagementClient ResourceManagementClient { get; private set; }

public SubscriptionClient SubscriptionClient { get; private set; }

public GalleryClient GalleryClient { get; private set; }

public AuthorizationManagementClient AuthorizationManagementClient { get; private set; }

public CdnManagementClient CdnManagementClient { get; private set; }

public static TestController NewInstance
{
get
{
return new TestController();
}
}
public static TestController NewInstance => new TestController();

protected TestController()
{
Expand All @@ -65,29 +46,22 @@ protected TestController()
protected void SetupManagementClients(MockContext context)
{
ResourceManagementClient = GetResourceManagementClient(context);
SubscriptionClient = GetSubscriptionClient();
GalleryClient = GetGalleryClient();
AuthorizationManagementClient = GetAuthorizationManagementClient();
CdnManagementClient = GetCdnManagementClient(context);

_helper.SetupManagementClients(
ResourceManagementClient,
SubscriptionClient,
GalleryClient,
AuthorizationManagementClient,
CdnManagementClient);
}

public void RunPowerShellTest(ServiceManagemenet.Common.Models.XunitTracingInterceptor logger, params string[] scripts)
{
var callingClassType = TestUtilities.GetCallingClass(2);
var mockName = TestUtilities.GetCurrentMethodName(2);
var sf = new StackTrace().GetFrame(1);
var callingClassType = sf.GetMethod().ReflectedType?.ToString();
var mockName = sf.GetMethod().Name;

_helper.TracingInterceptor = logger;
RunPsTestWorkflow(
() => scripts,
// no custom initializer
null,
// no custom cleanup
null,
callingClassType,
Expand All @@ -96,65 +70,51 @@ public void RunPowerShellTest(ServiceManagemenet.Common.Models.XunitTracingInter

public void RunPsTestWorkflow(
Func<string[]> scriptBuilder,
Action<CSMTestEnvironmentFactory> initialize,
Action cleanup,
string callingClassType,
string mockName)
{

var d = new Dictionary<string, string>();
d.Add("Microsoft.Resources", null);
d.Add("Microsoft.Features", null);
d.Add("Microsoft.Authorization", null);
d.Add("Microsoft.Compute", null);
var providersToIgnore = new Dictionary<string, string>();
providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
var d = new Dictionary<string, string>
{
{"Microsoft.Resources", null},
{"Microsoft.Features", null},
{"Microsoft.Authorization", null},
{"Microsoft.Compute", null}
};
var providersToIgnore = new Dictionary<string, string>
{
{"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
};
HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);

HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords");

using (var context = MockContext.Start(callingClassType, mockName))
{

_csmTestFactory = new CSMTestEnvironmentFactory();

if (initialize != null)
{
initialize(_csmTestFactory);
}

SetupManagementClients(context);

_helper.SetupEnvironment(AzureModule.AzureResourceManager);

var callingClassName = callingClassType
.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
.Last();
var callingClassName = callingClassType.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries).Last();

_helper.SetupModules(AzureModule.AzureResourceManager,
"ScenarioTests\\Common.ps1",
"ScenarioTests\\" + callingClassName + ".ps1",
_helper.RMProfileModule,
@"AzureRM.Cdn.psd1",
_helper.GetRMModulePath("AzureRM.Cdn.psd1"),
"AzureRM.Resources.ps1");
try
{
if (scriptBuilder != null)
var psScripts = scriptBuilder?.Invoke();
if (psScripts != null)
{
var psScripts = scriptBuilder();

if (psScripts != null)
{
_helper.RunPowerShellTest(psScripts);
}
_helper.RunPowerShellTest(psScripts);
}
}
finally
{
if (cleanup != null)
{
cleanup();
}
cleanup?.Invoke();
}
}
}
Expand All @@ -164,25 +124,9 @@ protected ResourceManagementClient GetResourceManagementClient(MockContext conte
return context.GetServiceClient<ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
}

private AuthorizationManagementClient GetAuthorizationManagementClient()
{
return TestBase.GetServiceClient<AuthorizationManagementClient>(_csmTestFactory);
}

private SubscriptionClient GetSubscriptionClient()
{
return TestBase.GetServiceClient<SubscriptionClient>(_csmTestFactory);
}

private GalleryClient GetGalleryClient()
{
return TestBase.GetServiceClient<GalleryClient>(_csmTestFactory);
}

private CdnManagementClient GetCdnManagementClient(MockContext context)
private static CdnManagementClient GetCdnManagementClient(MockContext context)
{
return
context.GetServiceClient<CdnManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
return context.GetServiceClient<CdnManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
}
}
}
Loading