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

DialogSet.Add: Unique dialog ids for name collisions but not for reference collisions #3918

Merged
merged 4 commits into from
May 13, 2020
Merged

DialogSet.Add: Unique dialog ids for name collisions but not for reference collisions #3918

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
997cce1
DialogSet.Add: Unique dialog ids for name collisions but not for refe…
carlosscastro May 13, 2020
babb9c9
Adaptive: Add multi-CancelDialog tests.
carlosscastro May 13, 2020
ab28f56
Double cancellation test: improve test
carlosscastro May 13, 2020
5d7205d
Adaptive: Minor tweaks to CycleDetectionObserver. Clone from cache on…
carlosscastro May 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
9 changes: 9 additions & 0 deletions libraries/Microsoft.Bot.Builder.Dialogs/DialogSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,15 @@ public DialogSet Add(Dialog dialog)

if (_dialogs.ContainsKey(dialog.Id))
{
// If we are trying to add the same exact instance, it's not a name collision.
// No operation required since the instance is already in the dialog set.
if (_dialogs[dialog.Id] == dialog)
{
return this;
}

// If we are adding a new dialog with a conflicting name, add a suffix to avoid
// dialog name collisions.
var nextSuffix = 2;

while (true)
Expand Down
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 @@ -65,6 +65,12 @@ public async Task Action_CancelAllDialogs()
await TestUtils.RunTestScript(ResourceExplorer);
}

[TestMethod]
public async Task Action_CancelAllDialogs_DoubleCancel()
{
await TestUtils.RunTestScript(ResourceExplorer);
}

[TestMethod]
public async Task Action_ChoiceInput()
{
Expand Down
149 changes: 149 additions & 0 deletions ...Dialogs.Adaptive.Tests/Tests/ActionTests/Action_CancelAllDialogs_DoubleCancel.test.dialog
View file
Open in desktop
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"
},
]
}
11 changes: 11 additions & 0 deletions tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/JsonLoadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ public static void ClassCleanup()
resourceExplorer.Dispose();
}

[TestMethod]
public async Task JsonDialogLoad_DoubleReference()
{
await BuildTestFlow(@"DoubleReference.dialog")
.SendConversationUpdate()
.AssertReply("what is your name?")
.Send("c")
.AssertReply("sub0")
.StartTestAsync();
}

[TestMethod]
public async Task JsonDialogLoad_CycleDetection()
{
Expand Down
16 changes: 16 additions & 0 deletions tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

<ItemGroup>
<Folder Include="CustomDialogs\" />
<Folder Include="Samples\DoubleReference\" />
<Folder Include="wwwroot\" />
</ItemGroup>

Expand All @@ -56,6 +57,21 @@
<ProjectReference Include="..\..\libraries\Microsoft.Bot.Connector\Microsoft.Bot.Connector.csproj" />
</ItemGroup>

<ItemGroup>
<Content Update="Samples\DoubleReference\DoubleReference.dialog">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Samples\DoubleReference\sub0.dialog">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Samples\DoubleReference\sub2.dialog">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Samples\DoubleReference\sub3.dialog">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<None Update="Samples\CycleDetection\Child1.dialog">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
110 changes: 110 additions & 0 deletions tests/Microsoft.Bot.Builder.TestBot.Json/Samples/DoubleReference/DoubleReference.dialog
View file
Open in desktop
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 tests/Microsoft.Bot.Builder.TestBot.Json/Samples/DoubleReference/sub0.dialog
View file
Open in desktop
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"
}
]
}
]
}
Loading