1818using System . Diagnostics ;
1919using System . IO ;
2020using Microsoft . Azure . Management . Storage ;
21+ using Microsoft . Azure . ServiceManagemenet . Common . Models ;
2122using Microsoft . Rest . ClientRuntime . Azure . TestFramework ;
2223using TestEnvironmentFactory = Microsoft . Rest . ClientRuntime . Azure . TestFramework . TestEnvironmentFactory ;
23- #if ! NETSTANDARD
24- using Microsoft . Azure . Test ;
25- using TestBase = Microsoft . Azure . Test . TestBase ;
26- #endif
2724
2825namespace Microsoft . Azure . Commands . ApiManagement . Test . ScenarioTests
2926{
3027 using Azure . Test . HttpRecorder ;
3128 using WindowsAzure . Commands . ScenarioTest ;
3229 using WindowsAzure . Commands . Test . Utilities . Common ;
33- using ApiManagementClient = Management . ApiManagement . ApiManagementClient ;
3430 using ResourceManagementClient = Management . Internal . Resources . ResourceManagementClient ;
3531 using Xunit ;
3632
@@ -40,21 +36,19 @@ public class ApiManagementTests : RMTestBase
4036
4137 public ApiManagementTests ( Xunit . Abstractions . ITestOutputHelper output )
4238 {
43- _helper = new EnvironmentSetupHelper ( ) ;
44- _helper . TracingInterceptor = new ServiceManagemenet . Common . Models . XunitTracingInterceptor ( output ) ;
45- ServiceManagemenet . Common . Models . XunitTracingInterceptor . AddToContext ( _helper . TracingInterceptor ) ;
39+ _helper = new EnvironmentSetupHelper
40+ {
41+ TracingInterceptor = new XunitTracingInterceptor ( output )
42+ } ;
43+ XunitTracingInterceptor . AddToContext ( _helper . TracingInterceptor ) ;
4644 }
4745
4846 protected void SetupManagementClients ( MockContext context )
4947 {
50- var apiManagementManagementClient = GetApiManagementManagementClient ( context ) ;
5148 var resourceManagementClient = GetResourceManagementClient ( context ) ;
5249 var armStorageManagementClient = GetArmStorageManagementClient ( context ) ;
5350
54- _helper . SetupManagementClients (
55- apiManagementManagementClient ,
56- resourceManagementClient ,
57- armStorageManagementClient ) ;
51+ _helper . SetupSomeOfManagementClients ( resourceManagementClient , armStorageManagementClient ) ;
5852 }
5953
6054 protected StorageManagementClient GetArmStorageManagementClient ( MockContext context )
@@ -67,22 +61,7 @@ private ResourceManagementClient GetResourceManagementClient(MockContext context
6761 return context . GetServiceClient < ResourceManagementClient > ( TestEnvironmentFactory . GetTestEnvironment ( ) ) ;
6862 }
6963
70- private ApiManagementClient GetApiManagementManagementClient ( MockContext context )
71- {
72- #if NETSTANDARD
73- //return context.GetServiceClient<ApiManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
74- return null ;
75- #else
76- return TestBase . GetServiceClient < ApiManagementClient > ( new CSMTestEnvironmentFactory ( ) ) ;
77- #endif
78- }
79-
80- #if NETSTANDARD
81- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
82- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
83- #else
8464 [ Fact ]
85- #endif
8665 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
8766 public void TestCrudApiManagement ( )
8867 {
@@ -101,96 +80,56 @@ public void TestBackupRestoreApiManagement()
10180 RunPowerShellTest ( "Test-BackupRestoreApiManagement" ) ;
10281 }
10382
104- #if NETSTANDARD
105- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
106- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
107- #else
10883 [ Fact ]
109- #endif
11084 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
11185 public void TestSetApiManagementDeploymentExternalVN ( )
11286 {
11387 RunPowerShellTest ( "Test-SetApiManagementDeploymentExternalVirtualNetwork" ) ;
11488 }
11589
116- #if NETSTANDARD
117- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
118- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
119- #else
12090 [ Fact ]
121- #endif
12291 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
12392 public void TestSetApiManagementDeploymentInternalVN ( )
12493 {
12594 RunPowerShellTest ( "Test-SetApiManagementDeploymentInternalVirtualNetwork" ) ;
12695 }
12796
128- #if NETSTANDARD
129- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
130- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
131- #else
13297 [ Fact ]
133- #endif
13498 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
13599 public void TestUpdateApiManagementDeployment ( )
136100 {
137101 RunPowerShellTest ( "Test-UpdateApiManagementDeployment" ) ;
138102 }
139103
140- #if NETSTANDARD
141- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
142- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
143- #else
144104 [ Fact ]
145- #endif
146105 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
147106 public void TestUpdateDeploymentComplex ( )
148107 {
149108 RunPowerShellTest ( "Test-UpdateApiManagementDeploymentWithHelpersAndPipeline" ) ;
150109 }
151110
152- #if NETSTANDARD
153- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
154- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
155- #else
156111 [ Fact ]
157- #endif
158112 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
159113 public void TestImportApiManagementHostnameCertificate ( )
160114 {
161115 RunPowerShellTest ( "Test-ImportApiManagementHostnameCertificate" ) ;
162116 }
163117
164- #if NETSTANDARD
165- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
166- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
167- #else
168118 [ Fact ]
169- #endif
170119 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
171120 public void TestSetApiManagementHostnames ( )
172121 {
173122 RunPowerShellTest ( "Test-SetApiManagementHostnames" ) ;
174123 }
175124
176- #if NETSTANDARD
177- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
178- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
179- #else
180125 [ Fact ]
181- #endif
182126 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
183127 public void TestCrudApiManagementWithExternalVpn ( )
184128 {
185129 RunPowerShellTest ( "Test-CrudApiManagementWithExternalVpn" ) ;
186130 }
187131
188- #if NETSTANDARD
189- [ Fact ( Skip = "Cannot construct ApiManagementClient using MockContext" ) ]
190- [ Trait ( Category . RunType , Category . DesktopOnly ) ]
191- #else
192132 [ Fact ]
193- #endif
194133 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
195134 public void TestCrudApiManagementWithAdditionalRegions ( )
196135 {
@@ -203,12 +142,16 @@ private void RunPowerShellTest(params string[] scripts)
203142 var callingClassType = sf . GetMethod ( ) . ReflectedType ? . ToString ( ) ;
204143 var mockName = sf . GetMethod ( ) . Name ;
205144
206- Dictionary < string , string > d = new Dictionary < string , string > ( ) ;
207- d . Add ( "Microsoft.Resources" , null ) ;
208- d . Add ( "Microsoft.Features" , null ) ;
209- d . Add ( "Microsoft.Authorization" , null ) ;
210- var providersToIgnore = new Dictionary < string , string > ( ) ;
211- providersToIgnore . Add ( "Microsoft.Azure.Management.Resources.ResourceManagementClient" , "2016-02-01" ) ;
145+ Dictionary < string , string > d = new Dictionary < string , string >
146+ {
147+ { "Microsoft.Resources" , null } ,
148+ { "Microsoft.Features" , null } ,
149+ { "Microsoft.Authorization" , null }
150+ } ;
151+ var providersToIgnore = new Dictionary < string , string >
152+ {
153+ { "Microsoft.Azure.Management.Resources.ResourceManagementClient" , "2016-02-01" }
154+ } ;
212155 HttpMockServer . Matcher = new PermissiveRecordMatcherWithApiExclusion ( true , d , providersToIgnore ) ;
213156 HttpMockServer . RecordsDirectory = Path . Combine ( AppDomain . CurrentDomain . BaseDirectory , "SessionRecords" ) ;
214157
0 commit comments