Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return invalid state instead of throwing exceptions for non-string input of TextInput action #4966

Merged
merged 2 commits into from
Nov 18, 2020
Merged

Return invalid state instead of throwing exceptions for non-string input of TextInput action #4966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9340cc
fix to not throw exception for non string input of TextInput action
feich-ms Nov 13, 2020
9d6daac
change unrecognized state to invalid state
feich-ms Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/TextInput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@ public TextInput([CallerFilePath] string callerPath = "", [CallerLineNumber] int
/// <returns>InputState which reflects whether input was recognized as valid or not.</returns>
protected override Task<InputState> OnRecognizeInputAsync(DialogContext dc, CancellationToken cancellationToken = default(CancellationToken))
{
var input = dc.State.GetValue<string>(VALUE_PROPERTY);

var input = dc.State.GetValue<object>(VALUE_PROPERTY);
if (!(input is string strInput))
{
return Task.FromResult(InputState.Invalid);
}

if (this.OutputFormat != null)
{
var (outputValue, error) = this.OutputFormat.TryGetValue(dc.State);
Expand All @@ -57,7 +61,7 @@ public TextInput([CallerFilePath] string callerPath = "", [CallerLineNumber] int
if (!string.IsNullOrWhiteSpace(outputValue))
{
// if the result is null or empty string, ignore it.
input = outputValue.ToString();
strInput = outputValue.ToString();
}
}
else
Expand All @@ -66,8 +70,8 @@ public TextInput([CallerFilePath] string callerPath = "", [CallerLineNumber] int
}
}

dc.State.SetValue(VALUE_PROPERTY, input);
return input.Length > 0 ? Task.FromResult(InputState.Valid) : Task.FromResult(InputState.Unrecognized);
dc.State.SetValue(VALUE_PROPERTY, strInput);
return strInput.Length > 0 ? Task.FromResult(InputState.Valid) : Task.FromResult(InputState.Unrecognized);
}
}
}
6 changes: 6 additions & 0 deletions tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/ActionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,12 @@ public async Task Action_TextInputWithInvalidPrompt()
await TestUtils.RunTestScript(_resourceExplorerFixture.ResourceExplorer);
}

[Fact]
public async Task Action_TextInputWithNonStringInput()
{
await TestUtils.RunTestScript(_resourceExplorerFixture.ResourceExplorer);
}

[Fact]
public async Task Action_TextInputWithValueExpression()
{
Expand Down
51 changes: 51 additions & 0 deletions ...r.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithNonStringInput.test.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "planningTest",
"triggers": [
{
"$kind": "Microsoft.OnUnknownIntent",
"actions": [
{
"$kind": "Microsoft.SetProperty",
"property": "dialog.firstName",
"value": "lu"
},
{
"$kind": "Microsoft.SetProperty",
"property": "dialog.lastName",
"value": "han"
},
{
"$kind": "Microsoft.IfCondition",
"condition": "(user.name == null)",
"actions": [
{
"$kind": "Microsoft.TextInput",
"property": "user.name",
"prompt": "Hello, what is your name?",
"unrecognizedPrompt": "How should I call you?",
"invalidPrompt": "That does not soud like a name",
"value": "=json(`{'foo': '$firstName','item': '$lastName'}`)"
}
]
}
]
}
],
"autoEndDialog": true,
"defaultResultProperty": "dialog.result"
},
"script": [
{
"$kind": "Microsoft.Test.UserSays",
"text": "hi"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "That does not soud like a name"
}
]
}