Skip to content

Commit cc0c39a

Browse files
MiYanniMiYanni
committed
Remove excess sln file. Made test controller derive from controller base. Remove tests deriving of test controller base. Used updated test controller from master with slight modifications.
1 parent 84cc84b commit cc0c39a

File tree

8 files changed

+22
-207
lines changed

8 files changed

+22
-207
lines changed

‎src/ResourceManager/StorageSync/Commands.StorageSync.Test/ScenarioTests/CloudEndpointTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
using Microsoft.Azure.Commands.StorageSync.Test.ScenarioTests;
1717
using Microsoft.Azure.ServiceManagement.Common.Models;
1818
using Microsoft.WindowsAzure.Commands.ScenarioTest;
19-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2019
using Xunit;
2120
using Xunit.Abstractions;
2221

2322
namespace StorageSync.Test.ScenarioTests
2423
{
25-
public class CloudEndpointTests : RMTestBase
24+
public class CloudEndpointTests
2625
{
27-
public XunitTracingInterceptor _logger;
26+
private readonly XunitTracingInterceptor _logger;
2827

2928
public CloudEndpointTests(ITestOutputHelper output)
3029
{

‎src/ResourceManager/StorageSync/Commands.StorageSync.Test/ScenarioTests/RegisteredServerTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
using Microsoft.Azure.ServiceManagement.Common.Models;
1818
using Microsoft.Azure.Test.HttpRecorder;
1919
using Microsoft.WindowsAzure.Commands.ScenarioTest;
20-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2120
using Xunit;
2221
using Xunit.Abstractions;
2322

2423
namespace StorageSync.Test.ScenarioTests
2524
{
26-
public class RegisteredServerTests : RMTestBase
25+
public class RegisteredServerTests
2726
{
28-
public XunitTracingInterceptor _logger;
27+
private readonly XunitTracingInterceptor _logger;
2928

3029
public RegisteredServerTests(ITestOutputHelper output)
3130
{

‎src/ResourceManager/StorageSync/Commands.StorageSync.Test/ScenarioTests/ServerEndpointTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
using Microsoft.Azure.Commands.StorageSync.Test.ScenarioTests;
1717
using Microsoft.Azure.ServiceManagement.Common.Models;
1818
using Microsoft.WindowsAzure.Commands.ScenarioTest;
19-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2019
using Xunit;
2120
using Xunit.Abstractions;
2221

2322
namespace StorageSync.Test.ScenarioTests
2423
{
25-
public class ServerEndpointTests : RMTestBase
24+
public class ServerEndpointTests
2625
{
27-
public XunitTracingInterceptor _logger;
26+
private readonly XunitTracingInterceptor _logger;
2827

2928
public ServerEndpointTests(ITestOutputHelper output)
3029
{

‎src/ResourceManager/StorageSync/Commands.StorageSync.Test/ScenarioTests/StorageSyncServiceTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
using Microsoft.Azure.Commands.StorageSync.Test.ScenarioTests;
1717
using Microsoft.Azure.ServiceManagement.Common.Models;
1818
using Microsoft.WindowsAzure.Commands.ScenarioTest;
19-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2019
using Xunit;
2120
using Xunit.Abstractions;
2221

2322
namespace StorageSync.Test.ScenarioTests
2423
{
25-
public class StorageSyncServiceTests : RMTestBase
24+
public class StorageSyncServiceTests
2625
{
27-
public XunitTracingInterceptor _logger;
26+
private readonly XunitTracingInterceptor _logger;
2827

2928
public StorageSyncServiceTests(ITestOutputHelper output)
3029
{

‎src/ResourceManager/StorageSync/Commands.StorageSync.Test/ScenarioTests/StorageSyncTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515

1616
using Microsoft.Azure.ServiceManagement.Common.Models;
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1918
using Xunit;
2019
using Xunit.Abstractions;
2120

2221
namespace Microsoft.Azure.Commands.StorageSync.Test.ScenarioTests
2322
{
24-
public class StorageSyncTests : RMTestBase
23+
public class StorageSyncTests
2524
{
26-
public XunitTracingInterceptor _logger;
25+
private readonly XunitTracingInterceptor _logger;
2726

2827
public StorageSyncTests(ITestOutputHelper output)
2928
{

‎src/ResourceManager/StorageSync/Commands.StorageSync.Test/ScenarioTests/SyncGroupTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
using Microsoft.Azure.Commands.StorageSync.Test.ScenarioTests;
1717
using Microsoft.Azure.ServiceManagement.Common.Models;
1818
using Microsoft.WindowsAzure.Commands.ScenarioTest;
19-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2019
using Xunit;
2120
using Xunit.Abstractions;
2221

2322
namespace StorageSync.Test.ScenarioTests
2423
{
25-
public class SyncGroupTests : RMTestBase
24+
public class SyncGroupTests
2625
{
27-
public XunitTracingInterceptor _logger;
26+
private readonly XunitTracingInterceptor _logger;
2827

2928
public SyncGroupTests(ITestOutputHelper output)
3029
{

‎src/ResourceManager/StorageSync/Commands.StorageSync.Test/TestController.cs

Lines changed: 10 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.Common.Authentication;
16-
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
17-
using Microsoft.Azure.Graph.RBAC;
18-
using Microsoft.Azure.Management.Authorization;
19-
using Microsoft.Azure.Management.ResourceManager;
20-
using Microsoft.Azure.Management.Storage;
21-
using Microsoft.Azure.Management.StorageSync;
22-
using Microsoft.Azure.ServiceManagement.Common.Models;
2316
using Microsoft.Azure.Test.HttpRecorder;
2417
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
2518
using Microsoft.WindowsAzure.Commands.ScenarioTest;
@@ -28,52 +21,33 @@
2821
using System.Diagnostics;
2922
using System.IO;
3023
using System.Linq;
24+
using Microsoft.Azure.Management.Internal.Resources;
25+
using Microsoft.Azure.ServiceManagement.Common.Models;
26+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
3127

3228
namespace Microsoft.Azure.Commands.StorageSync.Test.ScenarioTests
3329
{
34-
public class TestController : IDisposable
30+
public class TestController : RMTestBase
3531
{
36-
private const string TenantIdKey = "TenantId";
37-
private const string DomainKey = "Domain";
38-
private const string SubscriptionIdKey = "SubscriptionId";
39-
4032
private readonly EnvironmentSetupHelper _helper;
4133

4234
public ResourceManagementClient ResourceManagementClient { get; private set; }
4335

44-
public Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient InternalResourceManagementClient { get; private set; }
45-
46-
public GraphRbacManagementClient GraphRbacManagementClient { get; private set; }
47-
//public ActiveDirectoryClient ActiveDirectoryClient { get; private set; }
48-
49-
public StorageManagementClient StorageClient { get; private set; }
50-
51-
public StorageSyncManagementClient StorageSyncClient { get; private set; }
52-
53-
public Internal.Subscriptions.SubscriptionClient SubscriptionClient { get; private set; }
54-
55-
public AuthorizationManagementClient AuthorizationManagementClient { get; private set; }
56-
57-
public string UserDomain { get; private set; }
58-
5936
public static TestController NewInstance => new TestController();
6037

61-
public TestEnvironment TestEnvironment { get; set; }
62-
6338
public TestController()
6439
{
6540
_helper = new EnvironmentSetupHelper();
66-
TestEnvironment = TestEnvironmentFactory.GetTestEnvironment();
6741
}
6842

6943
public void RunPsTest(XunitTracingInterceptor logger, params string[] scripts)
7044
{
71-
_helper.TracingInterceptor = logger;
72-
7345
var sf = new StackTrace().GetFrame(1);
7446
var callingClassType = sf.GetMethod().ReflectedType?.ToString();
7547
var mockName = sf.GetMethod().Name;
7648

49+
_helper.TracingInterceptor = logger;
50+
7751
RunPsTestWorkflow(
7852
() => scripts,
7953
// no custom cleanup
@@ -113,11 +87,7 @@ public void RunPsTestWorkflow(
11387
var callingClassName = callingClassType.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries).Last();
11488
_helper.SetupModules(AzureModule.AzureResourceManager,
11589
_helper.RMProfileModule,
116-
#if !NETSTANDARD
117-
_helper.RMStorageDataPlaneModule,
118-
#endif
119-
_helper.RMStorageModule,
120-
_helper.GetRMModulePath("Az.StorageSync.psd1"),
90+
_helper.GetRMModulePath("AzureRM.StorageSync.psd1"),
12191
"ScenarioTests\\Common.ps1",
12292
"ScenarioTests\\" + callingClassName + ".ps1",
12393
"AzureRM.Resources.ps1");
@@ -142,107 +112,13 @@ public void RunPsTestWorkflow(
142112
private void SetupManagementClients(MockContext context)
143113
{
144114
ResourceManagementClient = GetResourceManagementClient(context);
145-
InternalResourceManagementClient = GetInternalResourceManagementClient(context);
146-
SubscriptionClient = GetSubscriptionClient(context);
147-
AuthorizationManagementClient = GetAuthorizationManagementClient(context);
148-
StorageClient = GetStorageManagementClient(context);
149-
StorageSyncClient = GetStorageSyncManagementClient(context);
150-
GraphRbacManagementClient = GetGraphRbacManagementClient(context);
151-
152-
_helper.SetupManagementClients(
153-
ResourceManagementClient,
154-
InternalResourceManagementClient,
155-
SubscriptionClient,
156-
AuthorizationManagementClient,
157-
StorageClient,
158-
StorageSyncClient,
159-
GraphRbacManagementClient
160-
);
161-
}
162-
163-
private ResourceManagementClient GetResourceManagementClient(MockContext context) => context.GetServiceClient<ResourceManagementClient>(TestEnvironment)/*(TestEnvironmentFactory.GetTestEnvironment())*/;
164115

165-
private Internal.Subscriptions.SubscriptionClient GetSubscriptionClient(MockContext context)
166-
{
167-
return context.GetServiceClient<Internal.Subscriptions.SubscriptionClient>(TestEnvironment)/*(TestEnvironmentFactory.GetTestEnvironment())*/;
116+
_helper.SetupManagementClients(ResourceManagementClient);
168117
}
169118

170-
private GraphRbacManagementClient GetGraphRbacManagementClient(MockContext context)
171-
{
172-
var environment = TestEnvironmentFactory.GetTestEnvironment();
173-
string tenantId = null;
174-
175-
if (HttpMockServer.Mode == HttpRecorderMode.Record)
176-
{
177-
tenantId = environment.Tenant;
178-
UserDomain = String.IsNullOrEmpty(environment.UserName) ? String.Empty : environment.UserName.Split(new[] { "@" }, StringSplitOptions.RemoveEmptyEntries).Last();
179-
180-
HttpMockServer.Variables[TenantIdKey] = tenantId;
181-
HttpMockServer.Variables[DomainKey] = UserDomain;
182-
}
183-
else if (HttpMockServer.Mode == HttpRecorderMode.Playback)
184-
{
185-
if (HttpMockServer.Variables.ContainsKey(TenantIdKey))
186-
{
187-
tenantId = HttpMockServer.Variables[TenantIdKey];
188-
}
189-
if (HttpMockServer.Variables.ContainsKey(DomainKey))
190-
{
191-
UserDomain = HttpMockServer.Variables[DomainKey];
192-
}
193-
if (HttpMockServer.Variables.ContainsKey(SubscriptionIdKey))
194-
{
195-
AzureRmProfileProvider.Instance.Profile.DefaultContext.Subscription.Id = HttpMockServer.Variables[SubscriptionIdKey];
196-
}
197-
}
198-
199-
var client = context.GetGraphServiceClient<GraphRbacManagementClient>(environment);
200-
client.TenantID = tenantId;
201-
if (AzureRmProfileProvider.Instance != null &&
202-
AzureRmProfileProvider.Instance.Profile != null &&
203-
AzureRmProfileProvider.Instance.Profile.DefaultContext != null &&
204-
AzureRmProfileProvider.Instance.Profile.DefaultContext.Tenant != null)
205-
{
206-
AzureRmProfileProvider.Instance.Profile.DefaultContext.Tenant.Id = client.TenantID;
207-
}
208-
209-
#region Test Code starts
210-
211-
try
212-
{
213-
214-
var value = client.ServicePrincipals.List();
215-
value.Count();
216-
}
217-
218-
catch (Exception e)
219-
{
220-
Console.Write(e);
221-
}
222-
223-
#endregion Test Code ends
224-
225-
return client;
226-
}
227-
228-
private AuthorizationManagementClient GetAuthorizationManagementClient(MockContext context)
229-
{
230-
return context.GetServiceClient<AuthorizationManagementClient>(TestEnvironment)/*(TestEnvironmentFactory.GetTestEnvironment())*/;
231-
}
232-
233-
private StorageManagementClient GetStorageManagementClient(MockContext context) => context.GetServiceClient<StorageManagementClient>(TestEnvironment)/*(TestEnvironmentFactory.GetTestEnvironment())*/;
234-
235-
private StorageSyncManagementClient GetStorageSyncManagementClient(MockContext context) => context.GetServiceClient<StorageSyncManagementClient>(TestEnvironment)/*(TestEnvironmentFactory.GetTestEnvironment())*/;
236-
237-
private Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient GetInternalResourceManagementClient(MockContext context) => context.GetServiceClient<Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient>();
238-
239-
public void Dispose()
119+
private static ResourceManagementClient GetResourceManagementClient(MockContext context)
240120
{
241-
ResourceManagementClient?.Dispose();
242-
InternalResourceManagementClient?.Dispose();
243-
SubscriptionClient?.Dispose();
244-
AuthorizationManagementClient?.Dispose();
245-
StorageSyncClient?.Dispose();
121+
return context.GetServiceClient<ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
246122
}
247123
}
248124
}

‎src/ResourceManager/StorageSync/StorageSync.Netcore.sln

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

0 commit comments

Comments
 (0)