Added missing tests for activity prompt

Author: axelsrz

libraries/botbuilder-dialogs/tests/test_activity_prompt.py

@@ -11,7 +11,7 @@
 
 from botbuilder.core import ConversationState, MemoryStorage, TurnContext, MessageFactory
 from botbuilder.core.adapters import TestAdapter
-from botbuilder.dialogs import DialogSet, DialogTurnStatus
+from botbuilder.dialogs import DialogSet, DialogTurnStatus, DialogReason
 
 
 async def validator(prompt_context: PromptValidatorContext):
@@ -96,3 +96,109 @@ async def exec_test(turn_context: TurnContext):
         step2 = await step1.assert_reply('please send an event.')
         step3 = await step2.send(event_activity)
         await step3.assert_reply('2')
+
+    async def test_retry_activity_prompt(self):
+        async def exec_test(turn_context: TurnContext):
+            dc = await dialogs.create_context(turn_context)
+
+            results = await dc.continue_dialog()
+            if results.status == DialogTurnStatus.Empty:
+                options = PromptOptions(prompt=Activity(type=ActivityTypes.message, text='please send an event.'))
+                await dc.prompt('EventActivityPrompt', options)
+            elif results.status == DialogTurnStatus.Complete:
+                await turn_context.send_activity(results.result)
+
+            await convo_state.save_changes(turn_context)
+
+        # Initialize TestAdapter.
+        adapter = TestAdapter(exec_test)
+
+        # Create ConversationState with MemoryStorage and register the state as middleware.
+        convo_state = ConversationState(MemoryStorage())
+
+        # Create a DialogState property, DialogSet and AttachmentPrompt.
+        dialog_state = convo_state.create_property('dialog_state')
+        dialogs = DialogSet(dialog_state)
+        dialogs.add(SimpleActivityPrompt('EventActivityPrompt', validator))
+
+        event_activity = Activity(type=ActivityTypes.event, value=2)
+
+        step1 = await adapter.send('hello')
+        step2 = await step1.assert_reply('please send an event.')
+        step3 = await step2.send('hello again')
+        step4 = await step3.assert_reply("Please send an 'event'-type Activity with a value of 2.")
+        step5 = await step4.send(event_activity)
+        await step5.assert_reply('2')
+
+    async def test_activity_prompt_should_return_dialog_end_if_validation_failed(self):
+        async def exec_test(turn_context: TurnContext):
+            dc = await dialogs.create_context(turn_context)
+
+            results = await dc.continue_dialog()
+            if results.status == DialogTurnStatus.Empty:
+                options = PromptOptions(
+                    prompt=Activity(type=ActivityTypes.message, text='please send an event.'),
+                    retry_prompt=Activity(type=ActivityTypes.message, text='event not received.')
+                )
+                await dc.prompt('EventActivityPrompt', options)
+            elif results.status == DialogTurnStatus.Complete:
+                await turn_context.send_activity(results.result)
+
+            await convo_state.save_changes(turn_context)
+
+        async def aux_validator(prompt_context: PromptValidatorContext):
+            assert prompt_context, 'Validator missing prompt_context'
+            return False
+
+        # Initialize TestAdapter.
+        adapter = TestAdapter(exec_test)
+
+
+
+        # Create ConversationState with MemoryStorage and register the state as middleware.
+        convo_state = ConversationState(MemoryStorage())
+
+        # Create a DialogState property, DialogSet and AttachmentPrompt.
+        dialog_state = convo_state.create_property('dialog_state')
+        dialogs = DialogSet(dialog_state)
+        dialogs.add(SimpleActivityPrompt('EventActivityPrompt', aux_validator))
+
+        step1 = await adapter.send('hello')
+        step2 = await step1.assert_reply('please send an event.')
+        step3 = await step2.send('test')
+        await step3.assert_reply('event not received.')
+
+    async def test_activity_prompt_resume_dialog_should_return_dialog_end(self):
+        async def exec_test(turn_context: TurnContext):
+            dc = await dialogs.create_context(turn_context)
+
+            results = await dc.continue_dialog()
+            if results.status == DialogTurnStatus.Empty:
+                options = PromptOptions(prompt=Activity(type=ActivityTypes.message, text='please send an event.'))
+                await dc.prompt('EventActivityPrompt', options)
+
+            second_results = await event_prompt.resume_dialog(dc, DialogReason.NextCalled)
+
+            assert second_results.status == DialogTurnStatus.Waiting, 'resume_dialog did not returned Dialog.EndOfTurn'
+
+            await convo_state.save_changes(turn_context)
+
+        async def aux_validator(prompt_context: PromptValidatorContext):
+            assert prompt_context, 'Validator missing prompt_context'
+            return False
+
+        # Initialize TestAdapter.
+        adapter = TestAdapter(exec_test)
+
+        # Create ConversationState with MemoryStorage and register the state as middleware.
+        convo_state = ConversationState(MemoryStorage())
+
+        # Create a DialogState property, DialogSet and AttachmentPrompt.
+        dialog_state = convo_state.create_property('dialog_state')
+        dialogs = DialogSet(dialog_state)
+        event_prompt = SimpleActivityPrompt('EventActivityPrompt', aux_validator)
+        dialogs.add(event_prompt)
+
+        step1 = await adapter.send('hello')
+        step2 = await step1.assert_reply('please send an event.')
+        await step2.assert_reply('please send an event.')