finished ChoicePrompt tests; stripped whitespace from TestAdapter

Author: Zerryth

libraries/botbuilder-core/botbuilder/core/adapters/test_adapter.py

@@ -207,7 +207,7 @@ def default_inspector(reply, description=None):
                 validate_activity(reply, expected)
             else:
                 assert reply.type == 'message', description + f" type == {reply.type}"
-                assert reply.text == expected, description + f" text == {reply.text}"
+                assert reply.text.strip() == expected.strip(), description + f" text == {reply.text}"
 
         if description is None:
             description = ''

libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py

@@ -20,7 +20,7 @@ class ChoicePrompt(Prompt):
     By default the prompt will return to the calling dialog a `FoundChoice` object containing the choice that was selected.
     """
     _default_choice_options: Dict[str, ChoiceFactoryOptions] = {
-        Culture.English: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' o ', include_numbers = True),
+        Culture.Spanish: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' o ', include_numbers = True),
         Culture.Dutch: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' of ', include_numbers = True),
         Culture.English: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' or ', include_numbers = True),
         Culture.French: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' ou ', include_numbers = True),

libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/prompt_options.py

@@ -1,13 +1,15 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+from typing import List
+
 from botbuilder.schema import Activity
 from botbuilder.dialogs.choices import Choice, ListStyle
 
 
 class PromptOptions:
 
-    def __init__(self, prompt: Activity = None, retry_prompt: Activity = None, choices: [Choice] = None, style: ListStyle = None, validations: object = None, number_of_attempts: int = 0):
+    def __init__(self, prompt: Activity = None, retry_prompt: Activity = None, choices: List[Choice] = None, style: ListStyle = None, validations: object = None, number_of_attempts: int = 0):
         self.prompt= prompt 
         self.retry_prompt= retry_prompt
         self.choices= choices