Skip to content

Commit de4f3f8

Browse files
author
Lei Jin
committed
Add addtional properties and integrate common lib of 1.3.39
1 parent 62e23c6 commit de4f3f8

File tree

8 files changed

+118
-63
lines changed

8 files changed

+118
-63
lines changed

‎src/Accounts/Accounts.Test/AzureRMProfileTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private static RMProfileClient SetupTestEnvironment(List<string> tenants, params
6262
var clientFactory = new MockSubscriptionClientFactory(tenants, subscriptionList);
6363
var mock = new MockClientFactory(new List<object>
6464
{
65-
clientFactory.GetSubscriptionClientVer2019(),
65+
clientFactory.GetSubscriptionClientVerLatest(),
6666
clientFactory.GetSubscriptionClientVer2016()
6767
}, true);
6868
mock.MoqClients = true;
@@ -90,7 +90,7 @@ private static AzureRmProfile SetupLogin(List<string> tenants, params List<strin
9090
var clientFactory = new MockSubscriptionClientFactory(tenants, subscriptionList);
9191
var mock = new MockClientFactory(new List<object>
9292
{
93-
clientFactory.GetSubscriptionClientVer2019(),
93+
clientFactory.GetSubscriptionClientVerLatest(),
9494
clientFactory.GetSubscriptionClientVer2016()
9595
}, true);
9696
mock.MoqClients = true;
@@ -164,8 +164,8 @@ public void SubscriptionIdNotExist()
164164
TenantId = DefaultTenant.ToString()
165165
};
166166

167-
MockSubscriptionClientFactory.SubGetQueueVer2019 = new Queue<Func<AzureOperationResponse<Subscription>>>();
168-
MockSubscriptionClientFactory.SubGetQueueVer2019.Enqueue(() =>
167+
MockSubscriptionClientFactory.SubGetQueueVerLatest = new Queue<Func<AzureOperationResponse<Subscription>>>();
168+
MockSubscriptionClientFactory.SubGetQueueVerLatest.Enqueue(() =>
169169
{
170170
throw new CloudException("InvalidAuthenticationTokenTenant: The access token is from the wrong issuer");
171171
});
@@ -230,8 +230,8 @@ public void SubscriptionIdNotInFirstTenant()
230230
TenantId = DefaultTenant.ToString()
231231
};
232232

233-
MockSubscriptionClientFactory.SubGetQueueVer2019 = new Queue<Func<AzureOperationResponse<Subscription>>>();
234-
MockSubscriptionClientFactory.SubGetQueueVer2019.Enqueue(() =>
233+
MockSubscriptionClientFactory.SubGetQueueVerLatest = new Queue<Func<AzureOperationResponse<Subscription>>>();
234+
MockSubscriptionClientFactory.SubGetQueueVerLatest.Enqueue(() =>
235235
{
236236
throw new CloudException("InvalidAuthenticationTokenTenant: The access token is from the wrong issuer");
237237
});
@@ -266,8 +266,8 @@ public void SubscriptionNameNotInFirstTenant()
266266
TenantId = DefaultTenant.ToString()
267267
};
268268

269-
MockSubscriptionClientFactory.SubListQueueVer2019 = new Queue<Func<AzureOperationResponse<IPage<Subscription>>>>();
270-
MockSubscriptionClientFactory.SubListQueueVer2019.Enqueue(() =>
269+
MockSubscriptionClientFactory.SubListQueueVerLatest = new Queue<Func<AzureOperationResponse<IPage<Subscription>>>>();
270+
MockSubscriptionClientFactory.SubListQueueVerLatest.Enqueue(() =>
271271
{
272272
var sub1 = new Subscription(
273273
id: DefaultSubscription.ToString(),

‎src/Accounts/Accounts.Test/AzureRMProfileTestsForMultitenant.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void LoginByTenant()
276276

277277
Dictionary<string, string> subscriptionList = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
278278
subscriptionClients.Clear();
279-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
279+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
280280
null
281281
, null
282282
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionList.Values.ToList())
@@ -320,7 +320,7 @@ public void LoginBySubscriptionInMultitenantsHomeFirst()
320320
var subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
321321
var subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
322322
subscriptionClients.Clear();
323-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
323+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
324324
MockSubscriptionClientFactory.CreateTenantListFromJson(GetTenantsJson(tenantA, tenantB).Values.ToArray())
325325
, MockSubscriptionClientFactory.CreateSubscripitonsFromJson(subscriptionListA[subscriptionA], subscriptionListB[subscriptionA])
326326
, null
@@ -364,7 +364,7 @@ public void LoginBySubscriptionInMultitenantsHomeSecond()
364364
var subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
365365
var subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
366366
subscriptionClients.Clear();
367-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
367+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
368368
MockSubscriptionClientFactory.CreateTenantListFromJson(tenantList[tenantB], tenantList[tenantA])
369369
, null
370370
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionListB.Values.ToList(), subscriptionListA.Values.ToList())
@@ -409,7 +409,7 @@ public void LoginBySubscriptionInManagedByTenants()
409409
Dictionary<string, string> subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
410410
Dictionary<string, string> subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
411411
subscriptionClients.Clear();
412-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
412+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
413413
MockSubscriptionClientFactory.CreateTenantListFromJson(GetTenantsJson(tenantA, tenantB).Values.ToArray())
414414
, null
415415
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionListA.Values.ToList(), subscriptionListB.Values.ToList())
@@ -452,7 +452,7 @@ public void LoginBySubscriptionTenant()
452452

453453
Dictionary<string, string> subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
454454
subscriptionClients.Clear();
455-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
455+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
456456
null
457457
, MockSubscriptionClientFactory.CreateSubscripitonsFromJson(subscriptionListA[subscriptionB])
458458
, null
@@ -496,7 +496,7 @@ public void LoginByTenantSubscriptionNotExist()
496496
Dictionary<string, string> subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
497497
Dictionary<string, string> subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
498498
subscriptionClients.Clear();
499-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
499+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
500500
null
501501
, MockSubscriptionClientFactory.CreateSubscripitonsFromJson(null)
502502
, null
@@ -537,7 +537,7 @@ public void LoginSubscriptionNameNotExist()
537537
Dictionary<string, string> subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
538538
Dictionary<string, string> subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
539539
subscriptionClients.Clear();
540-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
540+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
541541
MockSubscriptionClientFactory.CreateTenantListFromJson(GetTenantsJson(tenantA, tenantB).Values.ToArray())
542542
, null
543543
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionListA.Values.ToList(), subscriptionListB.Values.ToList())
@@ -574,7 +574,7 @@ public void SetContextByValidTenant()
574574

575575
Dictionary<string, string> subscriptionList = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
576576
subscriptionClients.Clear();
577-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
577+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
578578
null
579579
, null
580580
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionList.Values.ToList())
@@ -611,7 +611,7 @@ public void SetContextBySubscriptionIdInHomeTenant()
611611
var subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
612612
var subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
613613
subscriptionClients.Clear();
614-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
614+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
615615
MockSubscriptionClientFactory.CreateTenantListFromJson(GetTenantsJson(tenantA, tenantB).Values.ToArray())
616616
, null
617617
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionListB.Values.ToList(), subscriptionListA.Values.ToList())
@@ -647,7 +647,7 @@ public void SetContextBySubscriptionNameInHomeTenant()
647647
var subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
648648
var subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
649649
subscriptionClients.Clear();
650-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
650+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
651651
MockSubscriptionClientFactory.CreateTenantListFromJson(tenantList[tenantB], tenantList[tenantA])
652652
, null
653653
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionListA.Values.ToList(), subscriptionListB.Values.ToList())
@@ -683,7 +683,7 @@ public void SetContextBySubscriptionInManagedByTenants()
683683
Dictionary<string, string> subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
684684
Dictionary<string, string> subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
685685
subscriptionClients.Clear();
686-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
686+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
687687
MockSubscriptionClientFactory.CreateTenantListFromJson(GetTenantsJson(tenantA, tenantB).Values.ToArray())
688688
, null
689689
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionListA.Values.ToList(), subscriptionListB.Values.ToList())
@@ -717,7 +717,7 @@ public void SetContextBySubscriptionTenant()
717717

718718
Dictionary<string, string> subscriptionListA = GetFirstTenantSubscriptionsJson(tenantA, subscriptionA, subscriptionB, subscriptionC, tenantB);
719719
subscriptionClients.Clear();
720-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
720+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
721721
null
722722
, null
723723
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionListA.Values.ToList())
@@ -752,7 +752,7 @@ public void SetContextBySubscriptionTenantNotExist()
752752

753753
Dictionary<string, string> subscriptionListB = GetSecondTenantSubscriptionsJson(tenantB, subscriptionA, subscriptionB, subscriptionC, subscriptionD, tenantA);
754754
subscriptionClients.Clear();
755-
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVer2019(
755+
subscriptionClients.Enqueue(clientFactory.GetSubscriptionClientVerLatest(
756756
null
757757
, null
758758
, MockSubscriptionClientFactory.CreateSubscriptionListsFromJson(subscriptionListB.Values.ToList())

0 commit comments

Comments
 (0)