Skip to content

Commit 6068422

Browse files
minwoolee-msftminwoolee-msft
authored
Live Test Updated V2 (Azure#47571)
1 parent 83b402b commit 6068422

File tree

100 files changed

+2956
-2934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+2956
-2934
lines changed

‎sdk/communication/Azure.Communication.CallAutomation/assets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "net",
44
"TagPrefix": "net/communication/Azure.Communication.CallAutomation",
5-
"Tag": "net/communication/Azure.Communication.CallAutomation_c4f60a9554"
5+
"Tag": "net/communication/Azure.Communication.CallAutomation_42ef7c9c87"
66
}

‎sdk/communication/Azure.Communication.CallAutomation/tests/CallAutomationClients/CallAutomationClientAutomatedLiveTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ public async Task CreateCallToACSGetCallAndHangUpCallTest()
3232
CommunicationUserIdentifier user = await CreateIdentityUserAsync().ConfigureAwait(false);
3333
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
3434
CallAutomationClient targetClient = CreateInstrumentedCallAutomationClientWithConnectionString(target);
35-
string? callConnectionId = null;
35+
string? callConnectionId = null, uniqueId = null;
3636

3737
try
3838
{
3939
try
4040
{
4141
// setup service bus
42-
var uniqueId = await ServiceBusWithNewCall(user, target);
42+
uniqueId = await ServiceBusWithNewCall(user, target);
4343

4444
// create call and assert response
4545
var createCallOptions = new CreateCallOptions(new CallInvite(target), new Uri(TestEnvironment.DispatcherCallback + $"?q={uniqueId}"));
@@ -84,7 +84,7 @@ public async Task CreateCallToACSGetCallAndHangUpCallTest()
8484
}
8585
finally
8686
{
87-
await CleanUpCall(client, callConnectionId);
87+
await CleanUpCall(client, callConnectionId, uniqueId);
8888
}
8989
}
9090

@@ -102,14 +102,14 @@ public async Task CreateCallAndReject()
102102
CommunicationUserIdentifier user = await CreateIdentityUserAsync().ConfigureAwait(false);
103103
CommunicationUserIdentifier target = await CreateIdentityUserAsync().ConfigureAwait(false);
104104
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
105-
string? callConnectionId = null;
105+
string? callConnectionId = null, uniqueId = null;
106106

107107
try
108108
{
109109
try
110110
{
111111
// setup service bus
112-
var uniqueId = await ServiceBusWithNewCall(user, target);
112+
uniqueId = await ServiceBusWithNewCall(user, target);
113113

114114
// create call and assert response
115115
var createCallOptions = new CreateCallOptions(
@@ -160,7 +160,7 @@ public async Task CreateCallAndReject()
160160
}
161161
finally
162162
{
163-
await CleanUpCall(client, callConnectionId);
163+
await CleanUpCall(client, callConnectionId, uniqueId);
164164
}
165165
}
166166

@@ -182,14 +182,14 @@ public async Task CreateCallToAcsConnectCallAndHangupForEveryoneTest()
182182
CommunicationUserIdentifier user = await CreateIdentityUserAsync().ConfigureAwait(false);
183183
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
184184
CallAutomationClient targetClient = CreateInstrumentedCallAutomationClientWithConnectionString(target);
185-
string? callConnectionId = null;
185+
string? callConnectionId = null, uniqueId = null;
186186

187187
try
188188
{
189189
try
190190
{
191191
// setup service bus
192-
var uniqueId = await ServiceBusWithNewCall(user, target);
192+
uniqueId = await ServiceBusWithNewCall(user, target);
193193

194194
// create call and assert response
195195
var createCallOptions = new CreateCallOptions(new CallInvite(target), new Uri(TestEnvironment.DispatcherCallback + $"?q={uniqueId}"));
@@ -261,7 +261,7 @@ public async Task CreateCallToAcsConnectCallAndHangupForEveryoneTest()
261261
}
262262
finally
263263
{
264-
await CleanUpCall(client, callConnectionId);
264+
await CleanUpCall(client, callConnectionId, uniqueId);
265265
}
266266
}
267267

@@ -283,14 +283,14 @@ public async Task CreateCallToAcsConnectCallAndHangupTest()
283283
CommunicationUserIdentifier user = await CreateIdentityUserAsync().ConfigureAwait(false);
284284
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
285285
CallAutomationClient targetClient = CreateInstrumentedCallAutomationClientWithConnectionString(target);
286-
string? callConnectionId = null;
286+
string? callConnectionId = null, uniqueId = null;
287287

288288
try
289289
{
290290
try
291291
{
292292
// setup service bus
293-
var uniqueId = await ServiceBusWithNewCall(user, target);
293+
uniqueId = await ServiceBusWithNewCall(user, target);
294294

295295
// create call and assert response
296296
var createCallOptions = new CreateCallOptions(new CallInvite(target), new Uri(TestEnvironment.DispatcherCallback + $"?q={uniqueId}"));
@@ -358,7 +358,7 @@ public async Task CreateCallToAcsConnectCallAndHangupTest()
358358
}
359359
finally
360360
{
361-
await CleanUpCall(client, callConnectionId);
361+
await CleanUpCall(client, callConnectionId, uniqueId);
362362
}
363363
}
364364
}

‎sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionAutomatedLiveTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ public async Task RemoveAUserCallTest()
3232
CommunicationUserIdentifier target = await CreateIdentityUserAsync().ConfigureAwait(false);
3333
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
3434
CallAutomationClient targetClient = CreateInstrumentedCallAutomationClientWithConnectionString(target);
35-
string? callConnectionId = null;
35+
string? callConnectionId = null, uniqueId = null;
3636

3737
try
3838
{
3939
try
4040
{
4141
// setup service bus
42-
var uniqueId = await ServiceBusWithNewCall(user, target);
42+
uniqueId = await ServiceBusWithNewCall(user, target);
4343

4444
// create call and assert response
4545
var createCallOptions = new CreateCallOptions(new CallInvite(target), new Uri(TestEnvironment.DispatcherCallback + $"?q={uniqueId}"));
@@ -98,7 +98,7 @@ public async Task RemoveAUserCallTest()
9898
}
9999
finally
100100
{
101-
await CleanUpCall(client, callConnectionId);
101+
await CleanUpCall(client, callConnectionId, uniqueId);
102102
}
103103
}
104104

@@ -121,12 +121,12 @@ public async Task CancelAddParticipantTest()
121121
var participantToAdd = await CreateIdentityUserAsync().ConfigureAwait(false);
122122
var client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
123123
var targetClient = CreateInstrumentedCallAutomationClientWithConnectionString(target);
124-
string? callConnectionId = null;
124+
string? callConnectionId = null, uniqueId = null;
125125

126126
try
127127
{
128128
// setup service bus
129-
var uniqueId = await ServiceBusWithNewCall(user, target);
129+
uniqueId = await ServiceBusWithNewCall(user, target);
130130

131131
// create call and assert response
132132
var createCallOptions = new CreateCallOptions(new CallInvite(target), new Uri(TestEnvironment.DispatcherCallback + $"?q={uniqueId}"));
@@ -182,7 +182,7 @@ public async Task CancelAddParticipantTest()
182182
}
183183
finally
184184
{
185-
await CleanUpCall(client, callConnectionId);
185+
await CleanUpCall(client, callConnectionId, uniqueId);
186186
}
187187
}
188188
}

‎sdk/communication/Azure.Communication.CallAutomation/tests/CallDialogs/CallDialogAutomatedLiveTests.cs‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace Azure.Communication.CallAutomation.Tests.CallDialogs
1515
{
16+
[Ignore("Dialog Bot disabled")]
1617
internal class CallDialogAutomatedLiveTests : CallAutomationClientAutomatedLiveTestsBase
1718
{
1819
private const string dialogId = "92e08834-b6ee-4ede-8956-9fefa27a691c";
@@ -38,29 +39,12 @@ public async Task DialogOperationsTest()
3839
CommunicationIdentifier target;
3940

4041
// when in playback, use Sanatized values
41-
if (Mode == RecordedTestMode.Playback)
42-
{
43-
sourcePhone = new PhoneNumberIdentifier("Sanitized");
44-
target = new PhoneNumberIdentifier("Sanitized");
45-
}
46-
else
47-
{
48-
PhoneNumbersClient phoneNumbersClient = new PhoneNumbersClient(TestEnvironment.LiveTestStaticConnectionString);
49-
var purchasedPhoneNumbers = phoneNumbersClient.GetPurchasedPhoneNumbersAsync();
50-
List<string> phoneNumbers = new List<string>();
51-
await foreach (var phoneNumber in purchasedPhoneNumbers)
52-
{
53-
phoneNumbers.Add(phoneNumber.PhoneNumber);
54-
Console.WriteLine($"Phone number: {phoneNumber.PhoneNumber}, monthly cost: {phoneNumber.Cost}");
55-
}
56-
target = new PhoneNumberIdentifier(phoneNumbers[1]);
57-
sourcePhone = new PhoneNumberIdentifier(phoneNumbers[0]);
58-
}
42+
GetPhoneNumbers(out sourcePhone, out target);
5943

6044
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
6145

6246
// setup service bus
63-
var uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
47+
string uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
6448

6549
// create call and assert response
6650
CallInvite invite = new CallInvite((PhoneNumberIdentifier)target, (PhoneNumberIdentifier)sourcePhone);
@@ -125,7 +109,7 @@ public async Task DialogOperationsTest()
125109
}
126110
finally
127111
{
128-
await CleanUpCall(client, callConnectionId);
112+
await CleanUpCall(client, callConnectionId, uniqueId);
129113
}
130114
}
131115

@@ -169,7 +153,7 @@ public async Task DifferingConcurrentDialogsTest()
169153
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
170154

171155
// setup service bus
172-
var uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
156+
string uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
173157

174158
// create call and assert response
175159
CallInvite invite = new CallInvite((PhoneNumberIdentifier)target, (PhoneNumberIdentifier)sourcePhone);
@@ -246,7 +230,7 @@ public async Task DifferingConcurrentDialogsTest()
246230
}
247231
finally
248232
{
249-
await CleanUpCall(client, callConnectionId);
233+
await CleanUpCall(client, callConnectionId, uniqueId);
250234
}
251235
}
252236

@@ -290,7 +274,7 @@ public async Task DialogOperationsTest_AzureOpenAI()
290274
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
291275

292276
// setup service bus
293-
var uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
277+
string uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
294278

295279
// create call and assert response
296280
CallInvite invite = new CallInvite((PhoneNumberIdentifier)target, (PhoneNumberIdentifier)sourcePhone);
@@ -357,7 +341,7 @@ public async Task DialogOperationsTest_AzureOpenAI()
357341
}
358342
finally
359343
{
360-
await CleanUpCall(client, callConnectionId);
344+
await CleanUpCall(client, callConnectionId, uniqueId);
361345
}
362346
}
363347

@@ -402,7 +386,7 @@ public async Task IdenticalDialogsTest()
402386
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
403387

404388
// setup service bus
405-
var uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
389+
string uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
406390

407391
// create call and assert response
408392
CallInvite invite = new CallInvite((PhoneNumberIdentifier)target, (PhoneNumberIdentifier)sourcePhone);
@@ -468,7 +452,7 @@ public async Task IdenticalDialogsTest()
468452
}
469453
finally
470454
{
471-
await CleanUpCall(client, callConnectionId);
455+
await CleanUpCall(client, callConnectionId, uniqueId);
472456
}
473457
}
474458

@@ -512,7 +496,7 @@ public async Task SubsequentDialogsTest()
512496
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
513497

514498
// setup service bus
515-
var uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
499+
string uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
516500

517501
// create call and assert response
518502
CallInvite invite = new CallInvite((PhoneNumberIdentifier)target, (PhoneNumberIdentifier)sourcePhone);
@@ -591,7 +575,7 @@ public async Task SubsequentDialogsTest()
591575
}
592576
finally
593577
{
594-
await CleanUpCall(client, callConnectionId);
578+
await CleanUpCall(client, callConnectionId, uniqueId);
595579
}
596580
}
597581

@@ -635,7 +619,7 @@ public async Task StopNonexistingDialogTest()
635619
CallAutomationClient client = CreateInstrumentedCallAutomationClientWithConnectionString(user);
636620

637621
// setup service bus
638-
var uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
622+
string uniqueId = await ServiceBusWithNewCall(sourcePhone, target);
639623

640624
// create call and assert response
641625
CallInvite invite = new CallInvite((PhoneNumberIdentifier)target, (PhoneNumberIdentifier)sourcePhone);
@@ -678,7 +662,7 @@ public async Task StopNonexistingDialogTest()
678662
}
679663
finally
680664
{
681-
await CleanUpCall(client, callConnectionId);
665+
await CleanUpCall(client, callConnectionId, uniqueId);
682666
}
683667
}
684668
}

0 commit comments

Comments
 (0)