Add tests for pause and resume recording (#1165)

Co-authored-by: Pooja Nagpal <[email protected]>
microsoft · Jun 25, 2021 · b6ef2f4 · b6ef2f4
1 parent 9f1beba
commit b6ef2f4
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 65 deletions.
diff --git a/packages/Telephony/Actions/StartRecording.cs b/packages/Telephony/Actions/StartRecording.cs
@@ -7,15 +7,14 @@
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Components.Telephony.Common;
 using Microsoft.Bot.Connector;
-using Microsoft.Bot.Schema.Telephony;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Components.Telephony.Actions
 {
     /// <summary>
     /// Starts recording the current conversation.
     /// </summary>
-    public class StartRecording : CommandDialog<RecordingStartSettings>
+    public class StartRecording : CommandDialog
     {
         /// <summary>
         /// Class identifier.
@@ -38,12 +37,6 @@ public StartRecording([CallerFilePath] string sourceFilePath = "", [CallerLineNu
             this.RegisterSourceLocation(sourceFilePath, sourceLineNumber);
 
             this.CommandName = RecordingStart;
-
-            this.Data = new RecordingStartSettings()
-            {
-                RecordingChannelType = RecordingChannelType.Mixed,
-                RecordingContentType = RecordingContentType.AudioVideo,
-            };
         }
 
         /// <inheritdoc/>

diff --git a/packages/Telephony/Common/RecordingStartSettings.cs b/packages/Telephony/Common/RecordingStartSettings.cs
diff --git a/....Components.Telephony.Tests/Integration/RecordingTests/Recording_BaseScenario.test.dialog b/....Components.Telephony.Tests/Integration/RecordingTests/Recording_BaseScenario.test.dialog
@@ -13,6 +13,21 @@
                 {
                     "$kind": "Microsoft.SendActivity",
                     "activity": "Started recording!"
+                },
+                {
+                    "$kind": "Microsoft.SendActivity",
+                    "activity": "Enter your account number."
+                },
+                {
+                    "$kind": "Microsoft.Telephony.PauseRecording",
+                    "allowInterruptions": "=coalesce(settings.allowInterruptions, false)"
+                },
+                {
+                    "$kind": "Microsoft.SendActivity",
+                    "activity": "Paused recording!"
+                },
+                {
+                    "$kind": "Microsoft.EndTurn"                
                 }
             ]
         },
@@ -25,14 +40,36 @@
                     "activity": "On help intent handler"
                 }
             ]
+        },
+        {
+            "$kind": "Microsoft.OnIntent",
+            "intent": "AccountIntent",
+            "actions": [
+                {
+                    "$kind": "Microsoft.SendActivity",
+                    "activity": "Your account is active."
+                },
+                {
+                    "$kind": "Microsoft.Telephony.ResumeRecording",
+                    "allowInterruptions": "=coalesce(settings.allowInterruptions, false)"
+                },
+                {
+                    "$kind": "Microsoft.SendActivity",
+                    "activity": "Resumed recording!"
+                }
+            ]
         }
     ],
     "recognizer": {
         "$kind": "Microsoft.RegexRecognizer",
         "intents": [
             {
-                "intent": "HelpIntent",
-                "pattern": "help"
+              "intent": "HelpIntent",
+              "pattern": "help"
+            },
+            {
+              "intent": "AccountIntent",
+              "pattern": "account"
             }
         ]
     }

diff --git a/...ephony.Tests/Integration/RecordingTests/StartRecording_CommandResultWrongName.test.dialog b/...ephony.Tests/Integration/RecordingTests/StartRecording_CommandResultWrongName.test.dialog
@@ -10,8 +10,9 @@
         {
             "$kind": "Microsoft.Test.AssertReplyActivity",
             "assertions": [
-                "type == 'command'",
-            ]
+              "type == 'command'",
+              "name == 'channel/vnd.microsoft.telephony.recording.start'"
+          ]
         },
         {
             "$kind": "Microsoft.Test.UserActivity",

diff --git a/...omponents.Telephony.Tests/Integration/RecordingTests/StartRecording_HappyPath.test.dialog b/...omponents.Telephony.Tests/Integration/RecordingTests/StartRecording_HappyPath.test.dialog
@@ -7,22 +7,71 @@
             "$kind": "Microsoft.Test.UserSays",
             "text": "Hello I'm Calculon"
         },
+        {
+            "$kind": "Microsoft.Test.AssertReplyActivity",
+            "assertions": [
+              "type == 'command'",
+              "name == 'channel/vnd.microsoft.telephony.recording.start'"
+            ]
+        },
+        {
+            "$kind": "Microsoft.Test.UserActivity",
+            "activity": {
+              "type": "commandResult",
+              "name": "channel/vnd.microsoft.telephony.recording.start"
+            }
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "Started recording!"
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "Enter your account number."
+        },
         {
             "$kind": "Microsoft.Test.AssertReplyActivity",
             "assertions": [
                 "type == 'command'",
+                "name == 'channel/vnd.microsoft.telephony.recording.pause'"
             ]
         },
         {
             "$kind": "Microsoft.Test.UserActivity",
             "activity": {
                 "type": "commandResult",
-                "name": "channel/vnd.microsoft.telephony.recording.start"
+                "name": "channel/vnd.microsoft.telephony.recording.pause"
             }
         },
         {
             "$kind": "Microsoft.Test.AssertReply",
-            "text": "Started recording!"
+            "text": "Paused recording!"
+        },
+        {
+            "$kind": "Microsoft.Test.UserSays",
+            "text": "account"
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "Your account is active."
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReplyActivity",
+            "assertions": [
+                "type == 'command'",
+                "name == 'channel/vnd.microsoft.telephony.recording.resume'"
+            ]
+        },
+        {
+            "$kind": "Microsoft.Test.UserActivity",
+            "activity": {
+                "type": "commandResult",
+                "name": "channel/vnd.microsoft.telephony.recording.resume"
+            }
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "Resumed recording!"
         }
     ]
 }
diff --git a/....Tests/Integration/RecordingTests/StartRecording_IgnoredInNonTelephonyChannel.test.dialog b/....Tests/Integration/RecordingTests/StartRecording_IgnoredInNonTelephonyChannel.test.dialog
@@ -4,12 +4,32 @@
     "dialog": "Recording_BaseScenario.test",
     "script": [
         {
-            "$kind": "Microsoft.Test.UserSays",
-            "text": "Hello I'm Bender"
+          "$kind": "Microsoft.Test.UserSays",
+          "text": "Hello I'm Bender"
         },
         {
-            "$kind": "Microsoft.Test.AssertReply",
-            "text": "Started recording!"
+          "$kind": "Microsoft.Test.AssertReply",
+          "text": "Started recording!"
+        },
+        {
+          "$kind": "Microsoft.Test.AssertReply",
+          "text": "Enter your account number."
+        },
+        {
+          "$kind": "Microsoft.Test.AssertReply",
+          "text": "Paused recording!"
+        },
+        {
+          "$kind": "Microsoft.Test.UserSays",
+          "text": "account"
+        },
+        {
+          "$kind": "Microsoft.Test.AssertReply",
+          "text": "Your account is active."
+        },
+        {
+          "$kind": "Microsoft.Test.AssertReply",
+          "text": "Resumed recording!"
         }
     ]
 }
diff --git a/...ts/Integration/RecordingTests/StartRecording_WithTangent_InterruptionDisabled.test.dialog b/...ts/Integration/RecordingTests/StartRecording_WithTangent_InterruptionDisabled.test.dialog
@@ -10,8 +10,9 @@
         {
             "$kind": "Microsoft.Test.AssertReplyActivity",
             "assertions": [
-                "type == 'command'",
-            ]
+              "type == 'command'",
+              "name == 'channel/vnd.microsoft.telephony.recording.start'"
+          ]
         },
         {
             "$kind": "Microsoft.Test.UserSays",

diff --git a/...sts/Integration/RecordingTests/StartRecording_WithTangent_InterruptionEnabled.test.dialog b/...sts/Integration/RecordingTests/StartRecording_WithTangent_InterruptionEnabled.test.dialog
@@ -10,7 +10,8 @@
         {
             "$kind": "Microsoft.Test.AssertReplyActivity",
             "assertions": [
-                "type == 'command'",
+              "type == 'command'",
+              "name == 'channel/vnd.microsoft.telephony.recording.start'"
             ]
         },
         {