Skip to content

Commit da6fbcc

Browse files
author
Vinothini Dharmaraj
committed
updating the tests
1 parent 4f9ec29 commit da6fbcc

File tree

6 files changed

+65
-32
lines changed

6 files changed

+65
-32
lines changed

‎sdk/communication/Azure.Communication.CallAutomation/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- Support for PlayStarted event in Play/Recognize
99
- Support for the real time transcription
1010
- Monetization for real-time transcription and audio streaming
11-
- Hold and Unhold the participant with/without the play source
11+
- Hold and Unhold the participant
1212
- Support to manage the rooms/servercall/group call using connect API
1313
- Support for the audio streaming
1414
- Expose original PSTN number target from incoming call event in call connection properties

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public async Task AnswerCallAsync_200OK(string incomingCallContext, Uri callback
3333
Assert.NotNull(response);
3434
Assert.AreEqual((int)HttpStatusCode.OK, response.GetRawResponse().Status);
3535
verifyCallConnectionProperties(response.Value.CallConnectionProperties);
36-
// Assert.Null(response.Value.CallConnectionProperties.MediaSubscriptionId);
37-
// Assert.Null(response.Value.CallConnectionProperties.DataSubscriptionId);
36+
Assert.Null(response.Value.CallConnectionProperties.MediaStreamingSubscription);
37+
Assert.Null(response.Value.CallConnectionProperties.TranscriptionSubscription);
3838
Assert.AreEqual(CallConnectionId, response.Value.CallConnection.CallConnectionId);
3939
}
4040

@@ -47,8 +47,8 @@ public void AnswerCall_200OK(string incomingCallContext, Uri callbackUri)
4747
Assert.NotNull(response);
4848
Assert.AreEqual((int)HttpStatusCode.OK, response.GetRawResponse().Status);
4949
verifyCallConnectionProperties(response.Value.CallConnectionProperties);
50-
// Assert.Null(response.Value.CallConnectionProperties.MediaSubscriptionId);
51-
// Assert.Null(response.Value.CallConnectionProperties.DataSubscriptionId);
50+
Assert.Null(response.Value.CallConnectionProperties.MediaStreamingSubscription);
51+
Assert.Null(response.Value.CallConnectionProperties.TranscriptionSubscription);
5252
Assert.AreEqual(CallConnectionId, response.Value.CallConnection.CallConnectionId);
5353
}
5454

@@ -68,8 +68,8 @@ public async Task AnswerCallWithOptionsAsync_200OK(string incomingCallContext, U
6868
Assert.AreEqual((int)HttpStatusCode.OK, response.GetRawResponse().Status);
6969
verifyCallConnectionProperties(response.Value.CallConnectionProperties);
7070
Assert.AreEqual(CallConnectionId, response.Value.CallConnection.CallConnectionId);
71-
// Assert.AreEqual("mediaSubscriptionId", response.Value.CallConnectionProperties.MediaSubscriptionId);
72-
// Assert.AreEqual("dataSubscriptionId", response.Value.CallConnectionProperties.DataSubscriptionId);
71+
Assert.NotNull(response.Value.CallConnectionProperties.MediaStreamingSubscription);
72+
Assert.NotNull(response.Value.CallConnectionProperties.TranscriptionSubscription);
7373
}
7474

7575
[TestCaseSource(nameof(TestData_AnswerCall))]
@@ -87,8 +87,8 @@ public void AnswerCallWithOptions_200OK(string incomingCallContext, Uri callback
8787
Assert.AreEqual((int)HttpStatusCode.OK, response.GetRawResponse().Status);
8888
verifyCallConnectionProperties(response.Value.CallConnectionProperties);
8989
Assert.AreEqual(CallConnectionId, response.Value.CallConnection.CallConnectionId);
90-
// Assert.AreEqual("mediaSubscriptionId", response.Value.CallConnectionProperties.MediaSubscriptionId);
91-
// Assert.AreEqual("dataSubscriptionId", response.Value.CallConnectionProperties.DataSubscriptionId);
90+
Assert.NotNull(response.Value.CallConnectionProperties.MediaStreamingSubscription);
91+
Assert.NotNull(response.Value.CallConnectionProperties.TranscriptionSubscription);
9292
}
9393

9494
[TestCaseSource(nameof(TestData_AnswerCall))]
@@ -214,8 +214,8 @@ public async Task CreateCallAsync_201Created(CallInvite target, Uri callbackUri)
214214
Assert.NotNull(result);
215215
Assert.AreEqual((int)HttpStatusCode.Created, response.GetRawResponse().Status);
216216
verifyCallConnectionProperties(result.CallConnectionProperties);
217-
// Assert.Null(result.CallConnectionProperties.MediaSubscriptionId);
218-
// Assert.Null(result.CallConnectionProperties.DataSubscriptionId);
217+
Assert.Null(response.Value.CallConnectionProperties.MediaStreamingSubscription);
218+
Assert.Null(response.Value.CallConnectionProperties.TranscriptionSubscription);
219219
Assert.AreEqual(CallConnectionId, result.CallConnection.CallConnectionId);
220220
}
221221

@@ -230,8 +230,8 @@ public void CreateCall_201Created(CallInvite target, Uri callbackUri)
230230
Assert.NotNull(result);
231231
Assert.AreEqual((int)HttpStatusCode.Created, response.GetRawResponse().Status);
232232
verifyCallConnectionProperties(result.CallConnectionProperties);
233-
// Assert.Null(result.CallConnectionProperties.MediaSubscriptionId);
234-
// Assert.Null(result.CallConnectionProperties.DataSubscriptionId);
233+
Assert.Null(response.Value.CallConnectionProperties.MediaStreamingSubscription);
234+
Assert.Null(response.Value.CallConnectionProperties.TranscriptionSubscription);
235235
Assert.AreEqual(CallConnectionId, result.CallConnection.CallConnectionId);
236236
}
237237

@@ -253,8 +253,8 @@ public async Task CreateCallWithOptionsAsync_201Created(CallInvite target, Uri c
253253
Assert.AreEqual((int)HttpStatusCode.Created, response.GetRawResponse().Status);
254254
verifyCallConnectionProperties(result.CallConnectionProperties);
255255
Assert.AreEqual(CallConnectionId, result.CallConnection.CallConnectionId);
256-
// Assert.AreEqual("mediaSubscriptionId", result.CallConnectionProperties.MediaSubscriptionId);
257-
// Assert.AreEqual("dataSubscriptionId", result.CallConnectionProperties.DataSubscriptionId);
256+
Assert.NotNull(response.Value.CallConnectionProperties.MediaStreamingSubscription);
257+
Assert.NotNull(response.Value.CallConnectionProperties.TranscriptionSubscription);
258258
}
259259

260260
[TestCaseSource(nameof(TestData_CreateCall))]
@@ -275,8 +275,8 @@ public void CreateCallWithOptions_201Created(CallInvite target, Uri callbackUri)
275275
Assert.AreEqual((int)HttpStatusCode.Created, response.GetRawResponse().Status);
276276
verifyCallConnectionProperties(result.CallConnectionProperties);
277277
Assert.AreEqual(CallConnectionId, result.CallConnection.CallConnectionId);
278-
// Assert.AreEqual("mediaSubscriptionId", result.CallConnectionProperties.MediaSubscriptionId);
279-
// Assert.AreEqual("dataSubscriptionId", result.CallConnectionProperties.DataSubscriptionId);
278+
Assert.NotNull(response.Value.CallConnectionProperties.MediaStreamingSubscription);
279+
Assert.NotNull(response.Value.CallConnectionProperties.TranscriptionSubscription);
280280
}
281281

282282
[TestCaseSource(nameof(TestData_CreateCall))]
@@ -388,8 +388,8 @@ public async Task CreateGroupCallAsync_201Created(IEnumerable<CommunicationIdent
388388
Assert.AreEqual((int)HttpStatusCode.Created, response.GetRawResponse().Status);
389389
verifyCallConnectionProperties(result.CallConnectionProperties);
390390
Assert.AreEqual(CallConnectionId, result.CallConnection.CallConnectionId);
391-
// Assert.AreEqual("mediaSubscriptionId", result.CallConnectionProperties.MediaSubscriptionId);
392-
// Assert.AreEqual("dataSubscriptionId", result.CallConnectionProperties.DataSubscriptionId);
391+
Assert.NotNull(response.Value.CallConnectionProperties.MediaStreamingSubscription);
392+
Assert.NotNull(response.Value.CallConnectionProperties.TranscriptionSubscription);
393393
}
394394

395395
private static void ValidateCreateCallResult(CreateCallResult createCallResult)

‎sdk/communication/Azure.Communication.CallAutomation/tests/Infrastructure/CallAutomationClientAutomatedLiveTestsBase.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public CallAutomationClientAutomatedLiveTestsBase(bool isAsync, RecordedTestMode
6262
UriRegexSanitizers.Add(new UriRegexSanitizer(ACSUserIdInUrlRegex, SanitizeValue));
6363
}
6464

65+
public bool SkipCallAutomationInteractionLiveTests
66+
=> TestEnvironment.Mode != RecordedTestMode.Playback && Environment.GetEnvironmentVariable("SKIP_CALLAUTOMATION_INTERACTION_LIVE_TESTS") == "TRUE";
67+
6568
[SetUp]
6669
public void TestSetup()
6770
{

‎sdk/communication/Azure.Communication.CallAutomation/tests/Infrastructure/CallAutomationEventProcessorTestBase.cs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@ public abstract class CallAutomationEventProcessorTestBase
2525
protected const string TargetUser = "TARGET_USER_ID";
2626
protected const string TransfereeUser = "TRANSFEREE_USER_ID";
2727
protected const int defaultTestTimeout = 3;
28-
private const string NoneMediaSubscriptionId = "null";
29-
private const string MediaSubscriptionId = "\"mediaSubscriptionId\"";
30-
protected string CreateOrAnswerCallOrGetCallConnectionPayload = string.Format(DummyPayload, NoneMediaSubscriptionId);
31-
protected string CreateOrAnswerCallOrGetCallConnectionWithMediaSubscriptionPayload = string.Format(DummyPayload, MediaSubscriptionId);
32-
33-
protected const string DummyPayload = "{{\"callConnectionId\": \"someCallConnectionId\",\"serverCallId\": \"someServerCallId\",\"targets\": [{{\"rawId\":\"targetId\",\"kind\":\"communicationUser\",\"communicationUser\":{{\"id\":\"targetId\"}}}}],\"source\":{{\"rawId\":\"sourceId\",\"kind\":\"communicationUser\",\"communicationUser\":{{\"id\":\"sourceId\"}}}},\"callConnectionState\": \"connecting\",\"subject\": \"dummySubject\",\"callbackUri\": \"https://bot.contoso.com/callback\",\"mediaSubscriptionId\": {0}}}";
28+
private const string NoneMediaSubscription = "null";
29+
private const string MediaStreamingSubscription = "{" +
30+
" \"id\": \"22c3a25a-aed5-47df-9ef9-5ba5c7b6d08e\"," +
31+
"\"state\": \"disabled\",\"subscribedContentTypes\": [" +
32+
"\"audio\"] }";
33+
protected string CreateOrAnswerCallOrGetCallConnectionPayload = string.Format(DummyPayload, NoneMediaSubscription);
34+
protected string CreateOrAnswerCallOrGetCallConnectionWithMediaSubscriptionPayload = string.Format(DummyPayload, MediaStreamingSubscription);
35+
36+
protected const string DummyPayload = "{{\"callConnectionId\": \"someCallConnectionId\",\"serverCallId\": \"someServerCallId\",\"targets\": [{{\"rawId\":\"targetId\",\"kind\":\"communicationUser\",\"communicationUser\":{{\"id\":\"targetId\"}}}}],\"source\":{{\"rawId\":\"sourceId\",\"kind\":\"communicationUser\",\"communicationUser\":{{\"id\":\"sourceId\"}}}},\"callConnectionState\": \"connecting\",\"subject\": \"dummySubject\",\"callbackUri\": \"https://bot.contoso.com/callback\",\"mediaStreamingSubscription\": {0}}}";
3437

3538
protected const string TransferCallOrRemoveParticipantsPayload = "{\"operationContext\": \"someOperationContext\"}";
3639

‎sdk/communication/Azure.Communication.CallAutomation/tests/Infrastructure/CallAutomationTestBase.cs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public class CallAutomationTestBase
3131
"\"callConnectionState\": \"connecting\"," +
3232
"\"subject\": \"dummySubject\"," +
3333
"\"callbackUri\": \"https://bot.contoso.com/callback\"," +
34-
"\"mediaSubscriptionId\": {0}," +
35-
"\"dataSubscriptionId\": {1}" +
34+
"\"mediaStreamingSubscription\": {0}," +
35+
"\"transcriptionSubscription\": {1}" +
3636
"}}";
3737
protected const string DummyConnectPayload = "{" +
3838
"\"callConnectionId\": \"someCallConnectionId\"," +
@@ -50,12 +50,20 @@ public class CallAutomationTestBase
5050
protected const string DisplayName = "displayName";
5151
protected static readonly CallLocator _serverCallLocator = new ServerCallLocator(ServerCallId);
5252

53-
private const string NoneMediaSubscriptionId = "null";
53+
private const string NoneMediaStreamingSubscription = "null";
5454
private const string MediaSubscriptionId = "\"mediaSubscriptionId\"";
55-
private const string NoneDataSubscriptionId = "null";
55+
private const string MediaStreamingSubscription = "{" +
56+
" \"id\": \"22c3a25a-aed5-47df-9ef9-5ba5c7b6d08e\"," +
57+
"\"state\": \"disabled\",\"subscribedContentTypes\": [" +
58+
"\"audio\"] }";
59+
private const string TranscriptionSubscription = "{" +
60+
"\"id\": \"81c66a1b-12eb-4d89-ab99-c9f0de59e893\"," +
61+
"\"state\": \"inactive\"," +
62+
"\"subscribedResultTypes\": [\"final\"]}";
63+
private const string NoneTranscriptionSubscription = "null";
5664
private const string DataSubscriptionId = "\"dataSubscriptionId\"";
57-
protected string CreateOrAnswerCallOrGetCallConnectionPayload = string.Format(DummyPayload, NoneMediaSubscriptionId, NoneDataSubscriptionId);
58-
protected string CreateOrAnswerCallOrGetCallConnectionWithMediaSubscriptionAndTranscriptionPayload = string.Format(DummyPayload, MediaSubscriptionId, DataSubscriptionId);
65+
protected string CreateOrAnswerCallOrGetCallConnectionPayload = string.Format(DummyPayload, NoneMediaStreamingSubscription, NoneTranscriptionSubscription);
66+
protected string CreateOrAnswerCallOrGetCallConnectionWithMediaSubscriptionAndTranscriptionPayload = string.Format(DummyPayload, MediaStreamingSubscription, TranscriptionSubscription);
5967

6068
internal CallAutomationClient CreateMockCallAutomationClient(int responseCode, object? responseContent = null, HttpHeader[]? httpHeaders = null)
6169
{

‎sdk/communication/Azure.Communication.CallAutomation/tests/Streaming/StreamingDataParserTests.cs‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,25 @@ private static void ValidateAudioDataNoParticipant(AudioData streamingAudio)
150150

151151
#region Transcription
152152

153+
[Test]
154+
public void ParseTranscriptionMetadata_Test()
155+
{
156+
var metadataJson =
157+
"{" +
158+
"\"kind\":\"TranscriptionMetadata\"," +
159+
"\"transcriptionMetadata\":" +
160+
"{" +
161+
"\"subscriptionId\":\"subscriptionId\"," +
162+
"\"locale\":\"en-US\"," +
163+
"\"callConnectionId\":\"callConnectionId\"," +
164+
"\"correlationId\":\"correlationId\"" +
165+
"}" +
166+
"}";
167+
168+
TranscriptionMetadata streamingMetadata = (TranscriptionMetadata)StreamingDataParser.Parse(metadataJson);
169+
ValidateTranscriptionMetadata(streamingMetadata);
170+
}
171+
153172
[Test]
154173
public void ParseTranscriptionData_Test()
155174
{
@@ -228,7 +247,7 @@ public void ParseTranscriptionBinaryData()
228247
}
229248

230249
[Test]
231-
public void ParseTranscriptionMetadata_Test()
250+
public void ParseTranscriptionMetadataBinaryArray_Test()
232251
{
233252
var metadataJson =
234253
"{" +

0 commit comments

Comments
 (0)