-
Notifications
You must be signed in to change notification settings - Fork 486
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3918 from microsoft/ccastro/unique-dialogset-ref
DialogSet.Add: Unique dialog ids for name collisions but not for reference collisions
- Loading branch information
Showing
10 changed files
with
396 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
...Dialogs.Adaptive.Tests/Tests/ActionTests/Action_CancelAllDialogs_DoubleCancel.test.dialog
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| { | ||
| "$schema": "../../../tests.schema", | ||
| "$kind": "Microsoft.Test.Script", | ||
| "dialog": { | ||
| "$kind": "Microsoft.AdaptiveDialog", | ||
| "recognizer": { | ||
| "$kind": "Microsoft.RegexRecognizer", | ||
| "intents": [ | ||
| { | ||
| "intent": "CancelIntent", | ||
| "pattern": "(?i)cancel|never mind" | ||
| }, | ||
| { | ||
| "intent": "RestartIntent", | ||
| "pattern": "(?i)restart" | ||
| } | ||
| ] | ||
| }, | ||
| "triggers": [ | ||
| { | ||
| "$kind": "Microsoft.OnBeginDialog", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.AdaptiveDialog", | ||
| "recognizer": { | ||
| "$kind": "Microsoft.RegexRecognizer", | ||
| "intents": [ | ||
| { | ||
| "intent": "CancelIntent", | ||
| "pattern": "(?i)cancel|never mind" | ||
| }, | ||
| { | ||
| "intent": "RestartIntent", | ||
| "pattern": "(?i)restart" | ||
| } | ||
| ] | ||
| }, | ||
| "triggers": [ | ||
| { | ||
| "$kind": "Microsoft.OnBeginDialog", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "Why did the chicken cross the road?" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.EndTurn" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "To get to the other side" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.OnIntent", | ||
| "intent": "CancelIntent", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "Canceled" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.SetProperty", | ||
| "property": "$disabled", | ||
| "value": "=false" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.CancelAllDialogs", | ||
| "disabled": "=$disabled" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "Not cancelled" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.OnIntent", | ||
| "intent": "RestartIntent", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "Restarted" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.SetProperty", | ||
| "property": "$disabled", | ||
| "value": "=true" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.CancelAllDialogs", | ||
| "disabled": "=$disabled" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "Not cancelled" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "What am I doing here?" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "script": [ | ||
| { | ||
| "$kind": "Microsoft.Test.UserSays", | ||
| "text": "hi" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.Test.AssertReply", | ||
| "text": "Why did the chicken cross the road?" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.Test.UserSays", | ||
| "text": "cancel" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.Test.AssertReply", | ||
| "text": "Canceled" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.Test.UserSays", | ||
| "text": "hi" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.Test.AssertReply", | ||
| "text": "Why did the chicken cross the road?" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.Test.UserSays", | ||
| "text": "restart" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.Test.AssertReply", | ||
| "text": "Restarted" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.Test.AssertReply", | ||
| "text": "Not cancelled" | ||
| }, | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
tests/Microsoft.Bot.Builder.TestBot.Json/Samples/DoubleReference/DoubleReference.dialog
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| { | ||
| "$schema": "../../testbot.schema", | ||
| "$kind": "Microsoft.AdaptiveDialog", | ||
| "recognizer": { | ||
| "$kind": "Microsoft.RegexRecognizer", | ||
| "id": "x", | ||
| "intents": [ | ||
| { | ||
| "intent": "aIntent", | ||
| "pattern": "a" | ||
| }, | ||
| { | ||
| "intent": "bIntent", | ||
| "pattern": "b" | ||
| }, | ||
| { | ||
| "intent": "cIntent", | ||
| "pattern": "c" | ||
| }, | ||
| { | ||
| "intent": "dIntent", | ||
| "pattern": "d" | ||
| }, | ||
| { | ||
| "intent": "eIntent", | ||
| "pattern": "e" | ||
| }, | ||
| { | ||
| "intent": "fIntent", | ||
| "pattern": "f" | ||
| } | ||
| ] | ||
| }, | ||
| "triggers": [ | ||
| { | ||
| "$kind": "Microsoft.OnBeginDialog", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.BeginDialog", | ||
| "dialog": "AskForName", | ||
| "resultProperty": "$name" | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "Hello ${dialog.name}, nice to meet you!" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.OnIntent", | ||
| "intent": "aIntent", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.BeginDialog", | ||
| "dialog": "sub3" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.OnIntent", | ||
| "intent": "bIntent", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.BeginDialog", | ||
| "dialog": "sub2" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.OnIntent", | ||
| "intent": "cIntent", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.BeginDialog", | ||
| "dialog": "sub0" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.OnIntent", | ||
| "intent": "dIntent", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.BeginDialog", | ||
| "dialog": "sub0" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.OnIntent", | ||
| "intent": "eIntent", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.BeginDialog", | ||
| "dialog": "sub3" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$kind": "Microsoft.OnIntent", | ||
| "intent": "fIntent", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.BeginDialog", | ||
| "dialog": "sub2" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
16 changes: 16 additions & 0 deletions
16
tests/Microsoft.Bot.Builder.TestBot.Json/Samples/DoubleReference/sub0.dialog
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "$schema": "../../testbot.schema", | ||
| "$kind": "Microsoft.AdaptiveDialog", | ||
| "id": "sub0", | ||
| "triggers": [ | ||
| { | ||
| "$kind": "Microsoft.OnBeginDialog", | ||
| "actions": [ | ||
| { | ||
| "$kind": "Microsoft.SendActivity", | ||
| "activity": "sub0" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.