diff --git a/Microsoft.Bot.Builder.sln b/Microsoft.Bot.Builder.sln index 9f2869815..5cf877c48 100644 --- a/Microsoft.Bot.Builder.sln +++ b/Microsoft.Bot.Builder.sln @@ -210,7 +210,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Azure EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Azure.Queues", "libraries\Microsoft.Bot.Builder.Azure.Queues\Microsoft.Bot.Builder.Azure.Queues.csproj", "{36641924-DE75-4EA9-B139-87F5330D4A09}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Bot.Builder.TestBot.Shared", "tests\Microsoft.Bot.Builder.TestBot.Shared\Microsoft.Bot.Builder.TestBot.Shared.csproj", "{92F88315-B33B-4D8C-AD8E-9E94CADC867F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.TestBot.Shared", "tests\Microsoft.Bot.Builder.TestBot.Shared\Microsoft.Bot.Builder.TestBot.Shared.csproj", "{92F88315-B33B-4D8C-AD8E-9E94CADC867F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Parsers", "Parsers", "{ABB57A05-A284-40BA-A143-0CFEADE2B630}" EndProject @@ -218,7 +218,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Parse EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Parsers", "Parsers", "{37BA1593-FE3D-4CB9-A040-6CAB7B2D134A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Bot.Builder.Parsers.LU.Tests", "tests\Parsers\Microsoft.Bot.Builder.Parsers.LU.Tests\Microsoft.Bot.Builder.Parsers.LU.Tests.csproj", "{D7FFAB17-C7BE-490F-A974-584B5E37CF6D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Parsers.LU.Tests", "tests\Parsers\Microsoft.Bot.Builder.Parsers.LU.Tests\Microsoft.Bot.Builder.Parsers.LU.Tests.csproj", "{D7FFAB17-C7BE-490F-A974-584B5E37CF6D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -852,7 +852,7 @@ Global {92F88315-B33B-4D8C-AD8E-9E94CADC867F}.Release|Any CPU.Build.0 = Release|Any CPU {92F88315-B33B-4D8C-AD8E-9E94CADC867F}.Release-Windows|Any CPU.ActiveCfg = Release|Any CPU {92F88315-B33B-4D8C-AD8E-9E94CADC867F}.Release-Windows|Any CPU.Build.0 = Release|Any CPU - {C395D6D2-DF99-4FD9-B5C5-04E8BB866509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C395D6D2-DF99-4FD9-B5C5-04E8BB866509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C395D6D2-DF99-4FD9-B5C5-04E8BB866509}.Debug|Any CPU.Build.0 = Debug|Any CPU {C395D6D2-DF99-4FD9-B5C5-04E8BB866509}.Debug-Windows|Any CPU.ActiveCfg = Debug|Any CPU {C395D6D2-DF99-4FD9-B5C5-04E8BB866509}.Debug-Windows|Any CPU.Build.0 = Debug|Any CPU @@ -960,7 +960,6 @@ Global {8EDAA935-DAA1-4E00-9596-7E40D8C0F58C} = {4269F3C3-6B42-419B-B64A-3E6DC0F1574A} {36641924-DE75-4EA9-B139-87F5330D4A09} = {4269F3C3-6B42-419B-B64A-3E6DC0F1574A} {92F88315-B33B-4D8C-AD8E-9E94CADC867F} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} - {ABB57A05-A284-40BA-A143-0CFEADE2B630} = {4269F3C3-6B42-419B-B64A-3E6DC0F1574A} {C395D6D2-DF99-4FD9-B5C5-04E8BB866509} = {ABB57A05-A284-40BA-A143-0CFEADE2B630} {37BA1593-FE3D-4CB9-A040-6CAB7B2D134A} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {D7FFAB17-C7BE-490F-A974-584B5E37CF6D} = {37BA1593-FE3D-4CB9-A040-6CAB7B2D134A} @@ -968,4 +967,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7173C9F3-A7F9-496E-9078-9156E35D6E16} EndGlobalSection -EndGlobal \ No newline at end of file +EndGlobal diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveDialog.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveDialog.cs index 77d5fd9ed..8deede382 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveDialog.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveDialog.cs @@ -41,6 +41,7 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive private const string InstanceKey = "$instance"; private const string NoneIntentKey = "None"; private const string OperationsKey = "$operations"; + private const string PropertyEnding = "Property"; private const string RequiresValueKey = "$requiresValue"; private const string UtteranceKey = "utterance"; @@ -1074,12 +1075,17 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive } } + private string StripProperty(string name) + => name.EndsWith(PropertyEnding, StringComparison.InvariantCulture) ? name.Substring(0, name.Length - PropertyEnding.Length) : name; + // Expand the array of entities for a particular entity private void ExpandEntities( string name, JArray entities, JArray instances, JObject rootInstance, string op, string property, List operations, List properties, uint turn, string text, Dictionary> entityToInfo) { if (!name.StartsWith("$", StringComparison.InvariantCulture)) { + // Entities representing schema properties end in "Property" to prevent name collisions with the property itself. + var propName = StripProperty(name); string entityName = null; var isOp = false; var isProperty = false; @@ -1088,9 +1094,9 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive op = name; isOp = true; } - else if (properties.Contains(name)) + else if (properties.Contains(propName)) { - property = name; + property = propName; isProperty = true; } else @@ -1302,8 +1308,9 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive { var isExpected = expected.Contains(propSchema.Name); var expectedOnly = propSchema.ExpectedOnly ?? globalExpectedOnly; - foreach (var entityName in propSchema.Entities) + foreach (var propEntity in propSchema.Entities) { + var entityName = StripProperty(propEntity); if (entities.TryGetValue(entityName, out var matches) && (isExpected || !expectedOnly.Contains(entityName))) { foreach (var entity in matches) diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/Luis2Ops.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/Luis2Ops.mock.dialog index 7962fec6c..0b83f0480 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/Luis2Ops.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/Luis2Ops.mock.dialog @@ -18,7 +18,7 @@ "entities": { "Add()": [ { - "Bread": [ + "BreadProperty": [ { "BreadEntity": [ [ @@ -43,9 +43,9 @@ } ], "$instance": { - "Bread": [ + "BreadProperty": [ { - "type": "Bread", + "type": "BreadProperty", "text": "whole wheat", "startIndex": 0, "length": 11, @@ -61,14 +61,14 @@ ], "Show()": [ { - "Bread": [ + "BreadProperty": [ { } ], "$instance": { - "Bread": [ + "BreadProperty": [ { - "type": "Bread", + "type": "BreadProperty", "text": "Bread", "startIndex": 0, "length": 11, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisBreadEntities.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisBreadEntities.mock.dialog index fd8a8e55e..685dbdd00 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisBreadEntities.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisBreadEntities.mock.dialog @@ -16,7 +16,7 @@ } }, "entities": { - "Bread": [ + "BreadProperty": [ { "BreadEntity": [ [ @@ -41,9 +41,9 @@ } ], "$instance": { - "Bread": [ + "BreadProperty": [ { - "type": "Bread", + "type": "BreadProperty", "text": "wheat", "startIndex": 0, "length": 5, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisBreadEntity.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisBreadEntity.mock.dialog index cc5909316..9e334550c 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisBreadEntity.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisBreadEntity.mock.dialog @@ -16,7 +16,7 @@ } }, "entities": { - "Bread": [ + "BreadProperty": [ { "BreadEntity": [ [ @@ -41,9 +41,9 @@ } ], "$instance": { - "Bread": [ + "BreadProperty": [ { - "type": "Bread", + "type": "BreadProperty", "text": "rye", "startIndex": 0, "length": 3, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisMeat.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisMeat.mock.dialog index 2dc647729..655fd5d41 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisMeat.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisMeat.mock.dialog @@ -16,13 +16,13 @@ } }, "entities": { - "Meat": [ + "MeatProperty": [ {} ], "$instance": { - "Meat": [ + "MeatProperty": [ { - "type": "Meat", + "type": "MeatProperty", "text": "Meat", "startIndex": 0, "length": 4, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisProperties.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisProperties.mock.dialog index 0671a0e7c..eefb1f571 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisProperties.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/LuisProperties.mock.dialog @@ -16,7 +16,7 @@ } }, "entities": { - "Meat": [ + "MeatProperty": [ { "MeatEntity": [ [ @@ -40,7 +40,7 @@ } } ], - "Cheese": [ + "CheeseProperty": [ { "CheeseEntity": [ [ @@ -65,9 +65,9 @@ } ], "$instance": { - "Meat": [ + "MeatProperty": [ { - "type": "Meat", + "type": "MeatProperty", "text": "none", "startIndex": 0, "length": 4, @@ -78,9 +78,9 @@ ] } ], - "Cheese": [ + "CheeseProperty": [ { - "type": "Cheese", + "type": "CheeseProperty", "text": "none", "startIndex": 0, "length": 4, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/threeProperties.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/threeProperties.json index 5678f0a6c..78322929e 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/threeProperties.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AskTests/threeProperties.json @@ -35,9 +35,9 @@ "PropertyToChange": { "type": "string", "$entities": [ - "Bread", - "Cheese", - "Meat" + "BreadProperty", + "CheeseProperty", + "MeatProperty" ] } }, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisAddEntity.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisAddEntity.mock.dialog index cc5909316..9e334550c 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisAddEntity.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisAddEntity.mock.dialog @@ -16,7 +16,7 @@ } }, "entities": { - "Bread": [ + "BreadProperty": [ { "BreadEntity": [ [ @@ -41,9 +41,9 @@ } ], "$instance": { - "Bread": [ + "BreadProperty": [ { - "type": "Bread", + "type": "BreadProperty", "text": "rye", "startIndex": 0, "length": 3, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisAddToppingsEntity.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisAddToppingsEntity.mock.dialog index f42f45363..920c9248e 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisAddToppingsEntity.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisAddToppingsEntity.mock.dialog @@ -28,7 +28,7 @@ "Add()": [ { "$instance": { - "Toppings": [ + "ToppingsProperty": [ { "length": 18, "modelType": "Entity Extractor", @@ -38,11 +38,11 @@ ], "startIndex": 4, "text": "tomato and lettuce", - "type": "Toppings" + "type": "ToppingsProperty" } ] }, - "Toppings": [ + "ToppingsProperty": [ { "$instance": { "ToppingsEntity": [ diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisClearEntity.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisClearEntity.mock.dialog index 4bf41a0d5..52e130079 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisClearEntity.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisClearEntity.mock.dialog @@ -28,7 +28,7 @@ "Clear()": [ { "$instance": { - "Bread": [ + "BreadProperty": [ { "length": 5, "modelType": "Entity Extractor", @@ -38,11 +38,11 @@ ], "startIndex": 6, "text": "bread", - "type": "Bread" + "type": "BreadProperty" } ] }, - "Bread": [ + "BreadProperty": [ {} ] } diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisHelpEntity.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisHelpEntity.mock.dialog index 7dad1953d..33a7dbd0d 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisHelpEntity.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisHelpEntity.mock.dialog @@ -28,7 +28,7 @@ "Help()": [ { "$instance": { - "Bread": [ + "BreadProperty": [ { "length": 5, "modelType": "Entity Extractor", @@ -38,11 +38,11 @@ ], "startIndex": 5, "text": "bread", - "type": "Bread" + "type": "BreadProperty" } ] }, - "Bread": [ + "BreadProperty": [ {} ] } diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisRemoveEntity.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisRemoveEntity.mock.dialog index ad29d52df..049004135 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisRemoveEntity.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisRemoveEntity.mock.dialog @@ -28,7 +28,7 @@ "Remove()": [ { "$instance": { - "Toppings": [ + "ToppingsProperty": [ { "length": 6, "modelType": "Entity Extractor", @@ -38,11 +38,11 @@ ], "startIndex": 7, "text": "tomato", - "type": "Toppings" + "type": "ToppingsProperty" } ] }, - "Toppings": [ + "ToppingsProperty": [ { "$instance": { "ToppingsEntity": [ diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisShowEntity.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisShowEntity.mock.dialog index f077fb46e..ac21cd63f 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisShowEntity.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AssignEntityTests/LuisShowEntity.mock.dialog @@ -28,7 +28,7 @@ "Show()": [ { "$instance": { - "Bread": [ + "BreadProperty": [ { "length": 5, "modelType": "Entity Extractor", @@ -38,11 +38,11 @@ ], "startIndex": 5, "text": "bread", - "type": "Bread" + "type": "BreadProperty" } ] }, - "Bread": [ + "BreadProperty": [ {} ] } diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChooseEntityTests/LuisChooseEntity.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChooseEntityTests/LuisChooseEntity.mock.dialog index 1bdc28e08..a99f556cc 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChooseEntityTests/LuisChooseEntity.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChooseEntityTests/LuisChooseEntity.mock.dialog @@ -12,7 +12,7 @@ "topIntent": "sandwich", "intents": { "sandwich": { "score": 0.9939042 } }, "entities": { - "Bread": [ + "BreadProperty": [ { "BreadEntity": [ [ "multiGrainWheat", "wholeWheat" ] ], "$instance": { @@ -31,9 +31,9 @@ } ], "$instance": { - "Bread": [ + "BreadProperty": [ { - "type": "Bread", + "type": "BreadProperty", "text": "wheat", "startIndex": 0, "length": 5, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/LuisChooseProperty.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/LuisChooseProperty.mock.dialog index ebe0635eb..3ab5abd4d 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/LuisChooseProperty.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/LuisChooseProperty.mock.dialog @@ -24,7 +24,7 @@ "type": "CheeseEntity" } ], - "Meat": [ + "MeatProperty": [ { "length": 4, "modelType": "Entity Extractor", @@ -34,7 +34,7 @@ ], "startIndex": 0, "text": "none", - "type": "Meat" + "type": "MeatProperty" } ] }, @@ -43,7 +43,7 @@ "none" ] ], - "Meat": [ + "MeatProperty": [ { "$instance": { "MeatEntity": [ diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/LuisProperty.mock.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/LuisProperty.mock.dialog index 4c75ff327..312ad50be 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/LuisProperty.mock.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/LuisProperty.mock.dialog @@ -11,7 +11,7 @@ "prediction": { "entities": { "$instance": { - "Meat": [ + "MeatProperty": [ { "length": 4, "modelType": "Entity Extractor", @@ -21,11 +21,11 @@ ], "startIndex": 0, "text": "meat", - "type": "Meat" + "type": "MeatProperty" } ] }, - "Meat": [ + "MeatProperty": [ {} ] }, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/threeProperties.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/threeProperties.json index 775cd5ff4..b00aa846b 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/threeProperties.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ChoosePropertyTests/threeProperties.json @@ -43,9 +43,9 @@ "PropertyToChange": { "type": "string", "$entities": [ - "Name", - "Meat", - "Cheese" + "NameProperty", + "MeatProperty", + "CheeseProperty" ] } }, diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2294272525.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2294272525.json index cc1eee449..2c580a2f3 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2294272525.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2294272525.json @@ -1 +1 @@ -{"query":"dijon, remove pickles and show toppings","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.9996801}},"entities":{"Remove()":[{"Toppings":[{"ToppingsEntity":[["pickles"]],"$instance":{"ToppingsEntity":[{"type":"ToppingsEntity","text":"pickles","startIndex":14,"length":7,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"$instance":{"Toppings":[{"type":"Toppings","text":"pickles","startIndex":14,"length":7,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"Show()":[{"Toppings":[{}],"$instance":{"Toppings":[{"type":"Toppings","text":"toppings","startIndex":31,"length":8,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"SaucesEntity":[["dijonMustard"]],"$instance":{"Remove()":[{"type":"Remove()","text":"remove pickles","startIndex":7,"length":14,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"Show()":[{"type":"Show()","text":"show toppings","startIndex":26,"length":13,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"SaucesEntity":[{"type":"SaucesEntity","text":"dijon","startIndex":0,"length":5,"modelTypeId":5,"modelType":"List Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file +{"query":"dijon, remove pickles and show toppings","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.9996801}},"entities":{"Remove()":[{"ToppingsProperty":[{"ToppingsEntity":[["pickles"]],"$instance":{"ToppingsEntity":[{"type":"ToppingsEntity","text":"pickles","startIndex":14,"length":7,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"$instance":{"ToppingsProperty":[{"type":"ToppingsProperty","text":"pickles","startIndex":14,"length":7,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"Show()":[{"ToppingsProperty":[{}],"$instance":{"ToppingsProperty":[{"type":"ToppingsProperty","text":"toppings","startIndex":31,"length":8,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"SaucesEntity":[["dijonMustard"]],"$instance":{"Remove()":[{"type":"Remove()","text":"remove pickles","startIndex":7,"length":14,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"Show()":[{"type":"Show()","text":"show toppings","startIndex":26,"length":13,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"SaucesEntity":[{"type":"SaucesEntity","text":"dijon","startIndex":0,"length":5,"modelTypeId":5,"modelType":"List Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2724006514.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2724006514.json index b9d9408f4..2ae684cc4 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2724006514.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2724006514.json @@ -1 +1 @@ -{"query":"wheat","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.9939042}},"entities":{"Bread":[{"BreadEntity":[["multiGrainWheat","wholeWheat"]],"$instance":{"BreadEntity":[{"type":"BreadEntity","text":"wheat","startIndex":0,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"$instance":{"Bread":[{"type":"Bread","text":"wheat","startIndex":0,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file +{"query":"wheat","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.9939042}},"entities":{"BreadProperty":[{"BreadEntity":[["multiGrainWheat","wholeWheat"]],"$instance":{"BreadEntity":[{"type":"BreadEntity","text":"wheat","startIndex":0,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"$instance":{"BreadProperty":[{"type":"BreadProperty","text":"wheat","startIndex":0,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2812617195.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2812617195.json index 88458380d..979019cba 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2812617195.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2812617195.json @@ -1 +1 @@ -{"query":"ham and swiss with pickles and lettuce","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.999082744}},"entities":{"Add()":[{"Cheese":[{"CheeseEntity":[["swiss"]],"$instance":{"CheeseEntity":[{"type":"CheeseEntity","text":"swiss","startIndex":8,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"Toppings":[{"ToppingsEntity":[["pickles"],["lettuce"]],"$instance":{"ToppingsEntity":[{"type":"ToppingsEntity","text":"pickles","startIndex":19,"length":7,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]},{"type":"ToppingsEntity","text":"lettuce","startIndex":31,"length":7,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"$instance":{"Cheese":[{"type":"Cheese","text":"swiss","startIndex":8,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"Toppings":[{"type":"Toppings","text":"pickles and lettuce","startIndex":19,"length":19,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"MeatEntity":[["ham"]],"personName":["pickles"],"$instance":{"Add()":[{"type":"Add()","text":"swiss with pickles and lettuce","startIndex":8,"length":30,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"MeatEntity":[{"type":"MeatEntity","text":"ham","startIndex":0,"length":3,"modelTypeId":5,"modelType":"List Entity Extractor","recognitionSources":["model"]}],"personName":[{"type":"builtin.personName","text":"pickles","startIndex":19,"length":7,"modelTypeId":2,"modelType":"Prebuilt Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file +{"query":"ham and swiss with pickles and lettuce","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.999082744}},"entities":{"Add()":[{"CheeseProperty":[{"CheeseEntity":[["swiss"]],"$instance":{"CheeseEntity":[{"type":"CheeseEntity","text":"swiss","startIndex":8,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"ToppingsProperty":[{"ToppingsEntity":[["pickles"],["lettuce"]],"$instance":{"ToppingsEntity":[{"type":"ToppingsEntity","text":"pickles","startIndex":19,"length":7,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]},{"type":"ToppingsEntity","text":"lettuce","startIndex":31,"length":7,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"$instance":{"CheeseProperty":[{"type":"CheeseProperty","text":"swiss","startIndex":8,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"ToppingsProperty":[{"type":"ToppingsProperty","text":"pickles and lettuce","startIndex":19,"length":19,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"MeatEntity":[["ham"]],"personName":["pickles"],"$instance":{"Add()":[{"type":"Add()","text":"swiss with pickles and lettuce","startIndex":8,"length":30,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"MeatEntity":[{"type":"MeatEntity","text":"ham","startIndex":0,"length":3,"modelTypeId":5,"modelType":"List Entity Extractor","recognitionSources":["model"]}],"personName":[{"type":"builtin.personName","text":"pickles","startIndex":19,"length":7,"modelTypeId":2,"modelType":"Prebuilt Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2852734888.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2852734888.json index ead671672..530ec9fe7 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2852734888.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/2852734888.json @@ -1 +1 @@ -{"query":"whole wheat","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.996567667}},"entities":{"Bread":[{"BreadEntity":[["wholeWheat"]],"$instance":{"BreadEntity":[{"type":"BreadEntity","text":"whole wheat","startIndex":0,"length":11,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"BreadEntity":[["multiGrainWheat","wholeWheat"]],"$instance":{"Bread":[{"type":"Bread","text":"whole wheat","startIndex":0,"length":11,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"BreadEntity":[{"type":"BreadEntity","text":"wheat","startIndex":6,"length":5,"modelTypeId":5,"modelType":"List Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file +{"query":"whole wheat","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.996567667}},"entities":{"BreadProperty":[{"BreadEntity":[["wholeWheat"]],"$instance":{"BreadEntity":[{"type":"BreadEntity","text":"whole wheat","startIndex":0,"length":11,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"BreadEntity":[["multiGrainWheat","wholeWheat"]],"$instance":{"BreadProperty":[{"type":"BreadProperty","text":"whole wheat","startIndex":0,"length":11,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"BreadEntity":[{"type":"BreadEntity","text":"wheat","startIndex":6,"length":5,"modelTypeId":5,"modelType":"List Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/66524776.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/66524776.json index bde0d0805..b835e7929 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/66524776.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/66524776.json @@ -1 +1 @@ -{"query":"bread","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.9975799}},"entities":{"Bread":[{}],"personName":["bread"],"$instance":{"Bread":[{"type":"Bread","text":"bread","startIndex":0,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"personName":[{"type":"builtin.personName","text":"bread","startIndex":0,"length":5,"modelTypeId":2,"modelType":"Prebuilt Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file +{"query":"bread","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.9975799}},"entities":{"BreadProperty":[{}],"personName":["bread"],"$instance":{"BreadProperty":[{"type":"BreadProperty","text":"bread","startIndex":0,"length":5,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"personName":[{"type":"builtin.personName","text":"bread","startIndex":0,"length":5,"modelTypeId":2,"modelType":"Prebuilt Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/882512208.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/882512208.json index 6674de12c..0659d5120 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/882512208.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/cachedResponses/sandwich_en_us_lu/882512208.json @@ -1 +1 @@ -{"query":"rye","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.991865039}},"entities":{"Bread":[{"BreadEntity":[["rye"]],"$instance":{"BreadEntity":[{"type":"BreadEntity","text":"rye","startIndex":0,"length":3,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"personName":["rye"],"$instance":{"Bread":[{"type":"Bread","text":"rye","startIndex":0,"length":3,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"personName":[{"type":"builtin.personName","text":"rye","startIndex":0,"length":3,"modelTypeId":2,"modelType":"Prebuilt Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file +{"query":"rye","prediction":{"topIntent":"sandwich","intents":{"sandwich":{"score":0.991865039}},"entities":{"BreadProperty":[{"BreadEntity":[["rye"]],"$instance":{"BreadEntity":[{"type":"BreadEntity","text":"rye","startIndex":0,"length":3,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}],"personName":["rye"],"$instance":{"BreadProperty":[{"type":"BreadProperty","text":"rye","startIndex":0,"length":3,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"personName":[{"type":"builtin.personName","text":"rye","startIndex":0,"length":3,"modelTypeId":2,"modelType":"Prebuilt Entity Extractor","recognitionSources":["model"]}]}}}} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Bread/sandwich-Bread-BreadEntity.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Bread/sandwich-Bread-BreadEntity.en-us.lu index c0ca0dc91..e12fdaa87 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Bread/sandwich-Bread-BreadEntity.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Bread/sandwich-Bread-BreadEntity.en-us.lu @@ -1,5 +1,5 @@ -> List entity for Bread enum values +> List entity for BreadProperty enum values @ list BreadEntity = - multiGrainWheat: - multi @@ -23,102 +23,102 @@ - bread > Define property entity and optional value for Bread property. -@ ml Bread usesFeature BreadPhrases +@ ml BreadProperty usesFeature BreadPhrases - @ BreadEntity BreadEntity > Define operations on 'Bread' property. @ ml Add() usesFeature AddPhrases - -@ ml Bread usesFeature Bread + -@ ml BreadProperty usesFeature BreadProperty - @ BreadEntity BreadEntity @ ml Remove() usesFeature RemovePhrases - -@ ml Bread usesFeature Bread + -@ ml BreadProperty usesFeature BreadProperty - @ BreadEntity BreadEntity @ ml Clear() usesFeature ClearPhrases - -@ ml Bread usesFeature Bread + -@ ml BreadProperty usesFeature BreadProperty - @ BreadEntity BreadEntity @ ml Change() usesFeature ChangePhrases - -@ ml Bread usesFeature Bread + -@ ml BreadProperty usesFeature BreadProperty - @ BreadEntity BreadEntity @ ml Show() usesFeature ShowPhrases - -@ ml Bread usesFeature Bread + -@ ml BreadProperty usesFeature BreadProperty - @ BreadEntity BreadEntity @ ml Help() usesFeature HelpPhrases - -@ ml Bread usesFeature Bread + -@ ml BreadProperty usesFeature BreadProperty - @ BreadEntity BreadEntity > Add examples for operations on the 'Bread' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Bread with BreadEntity -- {@Bread={@BreadEntity=multi}} -- {@Bread={@BreadEntity=grain}} -- {@Bread={@BreadEntity=wheat}} -- {@Bread={@BreadEntity=multi grain}} -- {@Bread={@BreadEntity=grain wheat}} -- {@Bread={@BreadEntity=multi grain wheat}} -- {@Bread={@BreadEntity=rye}} -- {@Bread={@BreadEntity=white}} -- {@Bread={@BreadEntity=whole}} -- {@Bread={@BreadEntity=whole wheat}} -- {@Bread={@BreadEntity=multi} bread} -- {@Bread={@BreadEntity=grain} bread} -- {@Bread={@BreadEntity=wheat} bread} -- {@Bread={@BreadEntity=multi grain} bread} -- {@Bread={@BreadEntity=grain wheat} bread} -- {@Bread={@BreadEntity=multi grain wheat} bread} -- {@Bread={@BreadEntity=rye} bread} -- {@Bread={@BreadEntity=white} bread} -- {@Bread={@BreadEntity=whole} bread} -- {@Bread={@BreadEntity=whole wheat} bread} +>> entity: Standalone BreadProperty with BreadEntity +- {@BreadProperty={@BreadEntity=multi}} +- {@BreadProperty={@BreadEntity=grain}} +- {@BreadProperty={@BreadEntity=wheat}} +- {@BreadProperty={@BreadEntity=multi grain}} +- {@BreadProperty={@BreadEntity=grain wheat}} +- {@BreadProperty={@BreadEntity=multi grain wheat}} +- {@BreadProperty={@BreadEntity=rye}} +- {@BreadProperty={@BreadEntity=white}} +- {@BreadProperty={@BreadEntity=whole}} +- {@BreadProperty={@BreadEntity=whole wheat}} +- {@BreadProperty={@BreadEntity=multi} bread} +- {@BreadProperty={@BreadEntity=grain} bread} +- {@BreadProperty={@BreadEntity=wheat} bread} +- {@BreadProperty={@BreadEntity=multi grain} bread} +- {@BreadProperty={@BreadEntity=grain wheat} bread} +- {@BreadProperty={@BreadEntity=multi grain wheat} bread} +- {@BreadProperty={@BreadEntity=rye} bread} +- {@BreadProperty={@BreadEntity=white} bread} +- {@BreadProperty={@BreadEntity=whole} bread} +- {@BreadProperty={@BreadEntity=whole wheat} bread} ->> property: Standalone Bread name -- {@Bread=bread} +>> property: Standalone BreadProperty name +- {@BreadProperty=bread} -> Add() examples for Bread and BreadEntity -- {@Add()=add {@Bread={@BreadEntity=multi grain} bread}} -- {@Add()=add {@Bread={@BreadEntity=multi} bread}} -- {@Add()=add {@Bread={@BreadEntity=multi grain wheat} bread}} -- {@Add()=with {@Bread={@BreadEntity=grain}}} -- {@Add()=with {@Bread={@BreadEntity=white}}} -- {@Add()=with {@Bread={@BreadEntity=rye}}} -- {@Add()={@Bread=bread is {@BreadEntity=multi grain}}} -- {@Add()={@Bread=bread is {@BreadEntity=whole wheat}}} -- {@Add()={@Bread=bread is {@BreadEntity=grain wheat}}} -- {@Add()={@Bread=bread of {@BreadEntity=multi}}} -- {@Add()={@Bread=bread of {@BreadEntity=white}}} -- {@Add()={@Bread=bread of {@BreadEntity=whole}}} +> Add() examples for BreadProperty and BreadEntity +- {@Add()=add {@BreadProperty={@BreadEntity=multi grain} bread}} +- {@Add()=add {@BreadProperty={@BreadEntity=multi} bread}} +- {@Add()=add {@BreadProperty={@BreadEntity=multi grain wheat} bread}} +- {@Add()=with {@BreadProperty={@BreadEntity=grain}}} +- {@Add()=with {@BreadProperty={@BreadEntity=white}}} +- {@Add()=with {@BreadProperty={@BreadEntity=rye}}} +- {@Add()={@BreadProperty=bread is {@BreadEntity=multi grain}}} +- {@Add()={@BreadProperty=bread is {@BreadEntity=whole wheat}}} +- {@Add()={@BreadProperty=bread is {@BreadEntity=grain wheat}}} +- {@Add()={@BreadProperty=bread of {@BreadEntity=multi}}} +- {@Add()={@BreadProperty=bread of {@BreadEntity=white}}} +- {@Add()={@BreadProperty=bread of {@BreadEntity=whole}}} -> Remove() examples for Bread and BreadEntity -- {@Remove()=remove {@Bread={@BreadEntity=multi grain}} -- {@Remove()=remove {@Bread={@BreadEntity=multi grain wheat}} -- {@Remove()=remove {@Bread={@BreadEntity=wheat}} +> Remove() examples for BreadProperty and BreadEntity +- {@Remove()=remove {@BreadProperty={@BreadEntity=multi grain}} +- {@Remove()=remove {@BreadProperty={@BreadEntity=multi grain wheat}} +- {@Remove()=remove {@BreadProperty={@BreadEntity=wheat}} - {@Remove()=with no {@BreadEntity=whole wheat} bread} - {@Remove()=with no {@BreadEntity=multi} bread} - {@Remove()=with no {@BreadEntity=grain} bread} > Clear() examples for Bread -- {@Clear()=clear {@Bread=bread}} -- {@Clear()=reset {@Bread=bread}} +- {@Clear()=clear {@BreadProperty=bread}} +- {@Clear()=reset {@BreadProperty=bread}} > Show() examples for Bread -- {@Show()=show {@Bread=bread}} -- {@Show()=value of {@Bread=bread}} -- {@Show()={@Bread=bread} values} -- {@Show()={@Bread=bread} selection} +- {@Show()=show {@BreadProperty=bread}} +- {@Show()=value of {@BreadProperty=bread}} +- {@Show()={@BreadProperty=bread} values} +- {@Show()={@BreadProperty=bread} selection} > Help() examples for Bread -- {@Help()=help {@Bread=bread}} -- {@Help()=what can I say for {@Bread=bread}} -- {@Help()={@Bread=bread} help} +- {@Help()=help {@BreadProperty=bread}} +- {@Help()=what can I say for {@BreadProperty=bread}} +- {@Help()={@BreadProperty=bread} help} > Change() examples for Bread -- {@Change()=change {@Bread=bread}} -- {@Change()=goto {@Bread=bread}} +- {@Change()=change {@BreadProperty=bread}} +- {@Change()=goto {@BreadProperty=bread}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Cheese/sandwich-Cheese-CheeseEntity.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Cheese/sandwich-Cheese-CheeseEntity.en-us.lu index 3794ab1b6..2db54af82 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Cheese/sandwich-Cheese-CheeseEntity.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Cheese/sandwich-Cheese-CheeseEntity.en-us.lu @@ -26,38 +26,38 @@ - cheese > Define property entity and optional value for Cheese property. -@ ml Cheese usesFeature CheesePhrases +@ ml CheeseProperty usesFeature CheesePhrases - @ CheeseEntity CheeseEntity > Define operations on 'Cheese' property. @ ml Add() usesFeature AddPhrases - -@ ml Cheese usesFeature Cheese + -@ ml CheeseProperty usesFeature CheeseProperty - @ CheeseEntity CheeseEntity @ ml Remove() usesFeature RemovePhrases - -@ ml Cheese usesFeature Cheese + -@ ml CheeseProperty usesFeature CheeseProperty - @ CheeseEntity CheeseEntity @ ml Clear() usesFeature ClearPhrases - -@ ml Cheese usesFeature Cheese + -@ ml CheeseProperty usesFeature CheeseProperty - @ CheeseEntity CheeseEntity @ ml Change() usesFeature ChangePhrases - -@ ml Cheese usesFeature Cheese + -@ ml CheeseProperty usesFeature CheeseProperty - @ CheeseEntity CheeseEntity @ ml Show() usesFeature ShowPhrases - -@ ml Cheese usesFeature Cheese + -@ ml CheeseProperty usesFeature CheeseProperty - @ CheeseEntity CheeseEntity @ ml Help() usesFeature HelpPhrases - -@ ml Cheese usesFeature Cheese + -@ ml CheeseProperty usesFeature CheeseProperty - @ CheeseEntity CheeseEntity > Add examples for operations on the 'Cheese' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Cheese with CheeseEntity +>> entity: Standalone CheeseProperty with CheeseEntity - {@Cheese={@CheeseEntity=american}} - {@Cheese={@CheeseEntity=cheddar}} - {@Cheese={@CheeseEntity=feta}} @@ -79,10 +79,10 @@ - {@Cheese={@CheeseEntity=swiss} cheese} - {@Cheese={@CheeseEntity=none} cheese} ->> property: Standalone Cheese name +>> property: Standalone CheeseProperty name - {@Cheese=cheese} -> Add() examples for Cheese and CheeseEntity +> Add() examples for CheeseProperty and CheeseEntity - {@Add()=add {@Cheese={@CheeseEntity=provolone} cheese}} - {@Add()=add {@Cheese={@CheeseEntity=american} cheese}} - {@Add()=add {@Cheese={@CheeseEntity=gouda} cheese}} @@ -96,7 +96,7 @@ - {@Add()={@Cheese=cheese of {@CheeseEntity=none}}} - {@Add()={@Cheese=cheese of {@CheeseEntity=pepper}}} -> Remove() examples for Cheese and CheeseEntity +> Remove() examples for CheeseProperty and CheeseEntity - {@Remove()=remove {@Cheese={@CheeseEntity=none}} - {@Remove()=remove {@Cheese={@CheeseEntity=provolone}} - {@Remove()=remove {@Cheese={@CheeseEntity=swiss}} @@ -104,22 +104,22 @@ - {@Remove()=with no {@CheeseEntity=jack} cheese} - {@Remove()=with no {@CheeseEntity=swiss} cheese} -> Clear() examples for Cheese +> Clear() examples for CheeseProperty - {@Clear()=clear {@Cheese=cheese}} - {@Clear()=reset {@Cheese=cheese}} -> Show() examples for Cheese +> Show() examples for CheeseProperty - {@Show()=show {@Cheese=cheese}} - {@Show()=value of {@Cheese=cheese}} - {@Show()={@Cheese=cheese} values} - {@Show()={@Cheese=cheese} selection} -> Help() examples for Cheese +> Help() examples for CheeseProperty - {@Help()=help {@Cheese=cheese}} - {@Help()=what can I say for {@Cheese=cheese}} - {@Help()={@Cheese=cheese} help} -> Change() examples for Cheese +> Change() examples for CheeseProperty - {@Change()=change {@Cheese=cheese}} - {@Change()=goto {@Cheese=cheese}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Length/sandwich-Length-dimension.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Length/sandwich-Length-dimension.en-us.lu index 08eeaba90..0b428220d 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Length/sandwich-Length-dimension.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Length/sandwich-Length-dimension.en-us.lu @@ -7,89 +7,89 @@ - length > Define property entity and optional value for Length property. -@ ml Length usesFeature LengthPhrases +@ ml LengthProperty usesFeature LengthPhrases - @ dimension dimension > Define operations on 'Length' property. @ ml Add() usesFeature AddPhrases - -@ ml Length usesFeature Length + -@ ml LengthProperty usesFeature LengthProperty - @ dimension dimension @ ml Remove() usesFeature RemovePhrases - -@ ml Length usesFeature Length + -@ ml LengthProperty usesFeature LengthProperty - @ dimension dimension @ ml Clear() usesFeature ClearPhrases - -@ ml Length usesFeature Length + -@ ml LengthProperty usesFeature LengthProperty - @ dimension dimension @ ml Change() usesFeature ChangePhrases - -@ ml Length usesFeature Length + -@ ml LengthProperty usesFeature LengthProperty - @ dimension dimension @ ml Show() usesFeature ShowPhrases - -@ ml Length usesFeature Length + -@ ml LengthProperty usesFeature LengthProperty - @ dimension dimension @ ml Help() usesFeature HelpPhrases - -@ ml Length usesFeature Length + -@ ml LengthProperty usesFeature LengthProperty - @ dimension dimension > Add examples for operations on the 'Length' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Length with dimension -- {@Length={@dimension=2 feet}} -- {@Length={@dimension=19 inches}} -- {@Length={@dimension=2.5 meters}} -- {@Length={@dimension=200 sq feet}} -- {@Length={@dimension=2 feet} length} -- {@Length={@dimension=19 inches} length} -- {@Length={@dimension=2.5 meters} length} -- {@Length={@dimension=200 sq feet} length} +>> entity: Standalone LengthProperty with dimension +- {@LengthProperty={@dimension=2 feet}} +- {@LengthProperty={@dimension=19 inches}} +- {@LengthProperty={@dimension=2.5 meters}} +- {@LengthProperty={@dimension=200 sq feet}} +- {@LengthProperty={@dimension=2 feet} length} +- {@LengthProperty={@dimension=19 inches} length} +- {@LengthProperty={@dimension=2.5 meters} length} +- {@LengthProperty={@dimension=200 sq feet} length} ->> property: Standalone Length name -- {@Length=length} +>> property: Standalone LengthProperty name +- {@LengthProperty=length} -> Add() examples for Length and dimension -- {@Add()=add {@Length={@dimension=200 sq feet} length}} -- {@Add()=add {@Length={@dimension=2.5 meters} length}} -- {@Add()=add {@Length={@dimension=19 inches} length}} -- {@Add()=with {@Length={@dimension=2.5 meters}}} -- {@Add()=with {@Length={@dimension=2 feet}}} -- {@Add()=with {@Length={@dimension=200 sq feet}}} -- {@Add()={@Length=length is {@dimension=200 sq feet}}} -- {@Add()={@Length=length is {@dimension=19 inches}}} -- {@Add()={@Length=length is {@dimension=2 feet}}} -- {@Add()={@Length=length of {@dimension=2.5 meters}}} -- {@Add()={@Length=length of {@dimension=2 feet}}} -- {@Add()={@Length=length of {@dimension=200 sq feet}}} +> Add() examples for LengthProperty and dimension +- {@Add()=add {@LengthProperty={@dimension=200 sq feet} length}} +- {@Add()=add {@LengthProperty={@dimension=2.5 meters} length}} +- {@Add()=add {@LengthProperty={@dimension=19 inches} length}} +- {@Add()=with {@LengthProperty={@dimension=2.5 meters}}} +- {@Add()=with {@LengthProperty={@dimension=2 feet}}} +- {@Add()=with {@LengthProperty={@dimension=200 sq feet}}} +- {@Add()={@LengthProperty=length is {@dimension=200 sq feet}}} +- {@Add()={@LengthProperty=length is {@dimension=19 inches}}} +- {@Add()={@LengthProperty=length is {@dimension=2 feet}}} +- {@Add()={@LengthProperty=length of {@dimension=2.5 meters}}} +- {@Add()={@LengthProperty=length of {@dimension=2 feet}}} +- {@Add()={@LengthProperty=length of {@dimension=200 sq feet}}} -> Remove() examples for Length and dimension -- {@Remove()=remove {@Length={@dimension=2.5 meters}} -- {@Remove()=remove {@Length={@dimension=2 feet}} -- {@Remove()=remove {@Length={@dimension=19 inches}} +> Remove() examples for LengthProperty and dimension +- {@Remove()=remove {@LengthProperty={@dimension=2.5 meters}} +- {@Remove()=remove {@LengthProperty={@dimension=2 feet}} +- {@Remove()=remove {@LengthProperty={@dimension=19 inches}} - {@Remove()=with no {@dimension=19 inches} length} - {@Remove()=with no {@dimension=2.5 meters} length} -> Clear() examples for Length -- {@Clear()=clear {@Length=length}} -- {@Clear()=reset {@Length=length}} +> Clear() examples for LengthProperty +- {@Clear()=clear {@LengthProperty=length}} +- {@Clear()=reset {@LengthProperty=length}} -> Show() examples for Length -- {@Show()=show {@Length=length}} -- {@Show()=value of {@Length=length}} -- {@Show()={@Length=length} values} -- {@Show()={@Length=length} selection} +> Show() examples for LengthProperty +- {@Show()=show {@LengthProperty=length}} +- {@Show()=value of {@LengthProperty=length}} +- {@Show()={@LengthProperty=length} values} +- {@Show()={@LengthProperty=length} selection} -> Help() examples for Length -- {@Help()=help {@Length=length}} -- {@Help()=what can I say for {@Length=length}} -- {@Help()={@Length=length} help} +> Help() examples for LengthProperty +- {@Help()=help {@LengthProperty=length}} +- {@Help()=what can I say for {@LengthProperty=length}} +- {@Help()={@LengthProperty=length} help} -> Change() examples for Length -- {@Change()=change {@Length=length}} -- {@Change()=goto {@Length=length}} +> Change() examples for LengthProperty +- {@Change()=change {@LengthProperty=length}} +- {@Change()=goto {@LengthProperty=length}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Meat/sandwich-Meat-MeatEntity.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Meat/sandwich-Meat-MeatEntity.en-us.lu index e77576415..5a44f325b 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Meat/sandwich-Meat-MeatEntity.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Meat/sandwich-Meat-MeatEntity.en-us.lu @@ -1,5 +1,5 @@ -> List entity for Meat enum values +> List entity for MeatProperty enum values @ list MeatEntity = - bacon: - bacon @@ -28,106 +28,106 @@ - meat > Define property entity and optional value for Meat property. -@ ml Meat usesFeature MeatPhrases +@ ml MeatProperty usesFeature MeatPhrases - @ MeatEntity MeatEntity > Define operations on 'Meat' property. @ ml Add() usesFeature AddPhrases - -@ ml Meat usesFeature Meat + -@ ml MeatProperty usesFeature MeatProperty - @ MeatEntity MeatEntity @ ml Remove() usesFeature RemovePhrases - -@ ml Meat usesFeature Meat + -@ ml MeatProperty usesFeature MeatProperty - @ MeatEntity MeatEntity @ ml Clear() usesFeature ClearPhrases - -@ ml Meat usesFeature Meat + -@ ml MeatProperty usesFeature MeatProperty - @ MeatEntity MeatEntity @ ml Change() usesFeature ChangePhrases - -@ ml Meat usesFeature Meat + -@ ml MeatProperty usesFeature MeatProperty - @ MeatEntity MeatEntity @ ml Show() usesFeature ShowPhrases - -@ ml Meat usesFeature Meat + -@ ml MeatProperty usesFeature MeatProperty - @ MeatEntity MeatEntity @ ml Help() usesFeature HelpPhrases - -@ ml Meat usesFeature Meat + -@ ml MeatProperty usesFeature MeatProperty - @ MeatEntity MeatEntity > Add examples for operations on the 'Meat' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Meat with MeatEntity -- {@Meat={@MeatEntity=bacon}} -- {@Meat={@MeatEntity=chicken}} -- {@Meat={@MeatEntity=ham}} -- {@Meat={@MeatEntity=pulled}} -- {@Meat={@MeatEntity=pork}} -- {@Meat={@MeatEntity=pulled pork}} -- {@Meat={@MeatEntity=roast}} -- {@Meat={@MeatEntity=beef}} -- {@Meat={@MeatEntity=roast beef}} -- {@Meat={@MeatEntity=salami}} -- {@Meat={@MeatEntity=turkey}} -- {@Meat={@MeatEntity=none}} -- {@Meat={@MeatEntity=bacon} meat} -- {@Meat={@MeatEntity=chicken} meat} -- {@Meat={@MeatEntity=ham} meat} -- {@Meat={@MeatEntity=pulled} meat} -- {@Meat={@MeatEntity=pork} meat} -- {@Meat={@MeatEntity=pulled pork} meat} -- {@Meat={@MeatEntity=roast} meat} -- {@Meat={@MeatEntity=beef} meat} -- {@Meat={@MeatEntity=roast beef} meat} -- {@Meat={@MeatEntity=salami} meat} -- {@Meat={@MeatEntity=turkey} meat} -- {@Meat={@MeatEntity=none} meat} +>> entity: Standalone MeatProperty with MeatEntity +- {@MeatProperty={@MeatEntity=bacon}} +- {@MeatProperty={@MeatEntity=chicken}} +- {@MeatProperty={@MeatEntity=ham}} +- {@MeatProperty={@MeatEntity=pulled}} +- {@MeatProperty={@MeatEntity=pork}} +- {@MeatProperty={@MeatEntity=pulled pork}} +- {@MeatProperty={@MeatEntity=roast}} +- {@MeatProperty={@MeatEntity=beef}} +- {@MeatProperty={@MeatEntity=roast beef}} +- {@MeatProperty={@MeatEntity=salami}} +- {@MeatProperty={@MeatEntity=turkey}} +- {@MeatProperty={@MeatEntity=none}} +- {@MeatProperty={@MeatEntity=bacon} meat} +- {@MeatProperty={@MeatEntity=chicken} meat} +- {@MeatProperty={@MeatEntity=ham} meat} +- {@MeatProperty={@MeatEntity=pulled} meat} +- {@MeatProperty={@MeatEntity=pork} meat} +- {@MeatProperty={@MeatEntity=pulled pork} meat} +- {@MeatProperty={@MeatEntity=roast} meat} +- {@MeatProperty={@MeatEntity=beef} meat} +- {@MeatProperty={@MeatEntity=roast beef} meat} +- {@MeatProperty={@MeatEntity=salami} meat} +- {@MeatProperty={@MeatEntity=turkey} meat} +- {@MeatProperty={@MeatEntity=none} meat} ->> property: Standalone Meat name -- {@Meat=meat} +>> property: Standalone MeatProperty name +- {@MeatProperty=meat} -> Add() examples for Meat and MeatEntity -- {@Add()=add {@Meat={@MeatEntity=roast} meat}} -- {@Add()=add {@Meat={@MeatEntity=none} meat}} -- {@Add()=add {@Meat={@MeatEntity=chicken} meat}} -- {@Add()=with {@Meat={@MeatEntity=salami}}} -- {@Add()=with {@Meat={@MeatEntity=roast beef}}} -- {@Add()=with {@Meat={@MeatEntity=pulled}}} -- {@Add()={@Meat=meat is {@MeatEntity=beef}}} -- {@Add()={@Meat=meat is {@MeatEntity=roast beef}}} -- {@Add()={@Meat=meat is {@MeatEntity=pulled}}} -- {@Add()={@Meat=meat of {@MeatEntity=turkey}}} -- {@Add()={@Meat=meat of {@MeatEntity=roast}}} -- {@Add()={@Meat=meat of {@MeatEntity=chicken}}} +> Add() examples for MeatProperty and MeatEntity +- {@Add()=add {@MeatProperty={@MeatEntity=roast} meat}} +- {@Add()=add {@MeatProperty={@MeatEntity=none} meat}} +- {@Add()=add {@MeatProperty={@MeatEntity=chicken} meat}} +- {@Add()=with {@MeatProperty={@MeatEntity=salami}}} +- {@Add()=with {@MeatProperty={@MeatEntity=roast beef}}} +- {@Add()=with {@MeatProperty={@MeatEntity=pulled}}} +- {@Add()={@MeatProperty=meat is {@MeatEntity=beef}}} +- {@Add()={@MeatProperty=meat is {@MeatEntity=roast beef}}} +- {@Add()={@MeatProperty=meat is {@MeatEntity=pulled}}} +- {@Add()={@MeatProperty=meat of {@MeatEntity=turkey}}} +- {@Add()={@MeatProperty=meat of {@MeatEntity=roast}}} +- {@Add()={@MeatProperty=meat of {@MeatEntity=chicken}}} -> Remove() examples for Meat and MeatEntity -- {@Remove()=remove {@Meat={@MeatEntity=pulled}} -- {@Remove()=remove {@Meat={@MeatEntity=ham}} -- {@Remove()=remove {@Meat={@MeatEntity=pork}} +> Remove() examples for MeatProperty and MeatEntity +- {@Remove()=remove {@MeatProperty={@MeatEntity=pulled}} +- {@Remove()=remove {@MeatProperty={@MeatEntity=ham}} +- {@Remove()=remove {@MeatProperty={@MeatEntity=pork}} - {@Remove()=with no {@MeatEntity=ham} meat} - {@Remove()=with no {@MeatEntity=pulled pork} meat} - {@Remove()=with no {@MeatEntity=none} meat} -> Clear() examples for Meat -- {@Clear()=clear {@Meat=meat}} -- {@Clear()=reset {@Meat=meat}} +> Clear() examples for MeatProperty +- {@Clear()=clear {@MeatProperty=meat}} +- {@Clear()=reset {@MeatProperty=meat}} -> Show() examples for Meat -- {@Show()=show {@Meat=meat}} -- {@Show()=value of {@Meat=meat}} -- {@Show()={@Meat=meat} values} -- {@Show()={@Meat=meat} selection} +> Show() examples for MeatProperty +- {@Show()=show {@MeatProperty=meat}} +- {@Show()=value of {@MeatProperty=meat}} +- {@Show()={@MeatProperty=meat} values} +- {@Show()={@MeatProperty=meat} selection} -> Help() examples for Meat -- {@Help()=help {@Meat=meat}} -- {@Help()=what can I say for {@Meat=meat}} -- {@Help()={@Meat=meat} help} +> Help() examples for MeatProperty +- {@Help()=help {@MeatProperty=meat}} +- {@Help()=what can I say for {@MeatProperty=meat}} +- {@Help()={@MeatProperty=meat} help} -> Change() examples for Meat -- {@Change()=change {@Meat=meat}} -- {@Change()=goto {@Meat=meat}} +> Change() examples for MeatProperty +- {@Change()=change {@MeatProperty=meat}} +- {@Change()=goto {@MeatProperty=meat}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Name/sandwich-Name-personName.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Name/sandwich-Name-personName.en-us.lu index 4272f2be2..f0201adaa 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Name/sandwich-Name-personName.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Name/sandwich-Name-personName.en-us.lu @@ -7,87 +7,87 @@ - name > Define property entity and optional value for Name property. -@ ml Name usesFeature NamePhrases +@ ml NameProperty usesFeature NamePhrases - @ personName personName > Define operations on 'Name' property. @ ml Add() usesFeature AddPhrases - -@ ml Name usesFeature Name + -@ ml NameProperty usesFeature NameProperty - @ personName personName @ ml Remove() usesFeature RemovePhrases - -@ ml Name usesFeature Name + -@ ml NameProperty usesFeature NameProperty - @ personName personName @ ml Clear() usesFeature ClearPhrases - -@ ml Name usesFeature Name + -@ ml NameProperty usesFeature NameProperty - @ personName personName @ ml Change() usesFeature ChangePhrases - -@ ml Name usesFeature Name + -@ ml NameProperty usesFeature NameProperty - @ personName personName @ ml Show() usesFeature ShowPhrases - -@ ml Name usesFeature Name + -@ ml NameProperty usesFeature NameProperty - @ personName personName @ ml Help() usesFeature HelpPhrases - -@ ml Name usesFeature Name + -@ ml NameProperty usesFeature NameProperty - @ personName personName > Add examples for operations on the 'Name' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Name with personName -- {@Name={@personName=Bart Simpson}} -- {@Name={@personName=Thomas Matthews}} -- {@Name={@personName=Christopher Robin}} -- {@Name={@personName=Bart Simpson} name} -- {@Name={@personName=Thomas Matthews} name} -- {@Name={@personName=Christopher Robin} name} +>> entity: Standalone NameProperty with personName +- {@NameProperty={@personName=Bart Simpson}} +- {@NameProperty={@personName=Thomas Matthews}} +- {@NameProperty={@personName=Christopher Robin}} +- {@NameProperty={@personName=Bart Simpson} name} +- {@NameProperty={@personName=Thomas Matthews} name} +- {@NameProperty={@personName=Christopher Robin} name} ->> property: Standalone Name name -- {@Name=name} +>> property: Standalone NameProperty name +- {@NameProperty=name} -> Add() examples for Name and personName -- {@Add()=add {@Name={@personName=Christopher Robin} name}} -- {@Add()=add {@Name={@personName=Bart Simpson} name}} -- {@Add()=add {@Name={@personName=Thomas Matthews} name}} -- {@Add()=with {@Name={@personName=Christopher Robin}}} -- {@Add()=with {@Name={@personName=Thomas Matthews}}} -- {@Add()={@Name=name is {@personName=Thomas Matthews}}} -- {@Add()={@Name=name is {@personName=Christopher Robin}}} -- {@Add()={@Name=name is {@personName=Bart Simpson}}} -- {@Add()={@Name=name of {@personName=Bart Simpson}}} -- {@Add()={@Name=name of {@personName=Thomas Matthews}}} -- {@Add()={@Name=name of {@personName=Christopher Robin}}} +> Add() examples for NameProperty and personName +- {@Add()=add {@NameProperty={@personName=Christopher Robin} name}} +- {@Add()=add {@NameProperty={@personName=Bart Simpson} name}} +- {@Add()=add {@NameProperty={@personName=Thomas Matthews} name}} +- {@Add()=with {@NameProperty={@personName=Christopher Robin}}} +- {@Add()=with {@NameProperty={@personName=Thomas Matthews}}} +- {@Add()={@NameProperty=name is {@personName=Thomas Matthews}}} +- {@Add()={@NameProperty=name is {@personName=Christopher Robin}}} +- {@Add()={@NameProperty=name is {@personName=Bart Simpson}}} +- {@Add()={@NameProperty=name of {@personName=Bart Simpson}}} +- {@Add()={@NameProperty=name of {@personName=Thomas Matthews}}} +- {@Add()={@NameProperty=name of {@personName=Christopher Robin}}} -> Remove() examples for Name and personName -- {@Remove()=remove {@Name={@personName=Bart Simpson}} -- {@Remove()=remove {@Name={@personName=Christopher Robin}} -- {@Remove()=remove {@Name={@personName=Thomas Matthews}} +> Remove() examples for NameProperty and personName +- {@Remove()=remove {@NameProperty={@personName=Bart Simpson}} +- {@Remove()=remove {@NameProperty={@personName=Christopher Robin}} +- {@Remove()=remove {@NameProperty={@personName=Thomas Matthews}} - {@Remove()=with no {@personName=Bart Simpson} name} - {@Remove()=with no {@personName=Christopher Robin} name} - {@Remove()=with no {@personName=Thomas Matthews} name} -> Clear() examples for Name -- {@Clear()=clear {@Name=name}} -- {@Clear()=reset {@Name=name}} +> Clear() examples for NameProperty +- {@Clear()=clear {@NameProperty=name}} +- {@Clear()=reset {@NameProperty=name}} -> Show() examples for Name -- {@Show()=show {@Name=name}} -- {@Show()=value of {@Name=name}} -- {@Show()={@Name=name} values} -- {@Show()={@Name=name} selection} +> Show() examples for NameProperty +- {@Show()=show {@NameProperty=name}} +- {@Show()=value of {@NameProperty=name}} +- {@Show()={@NameProperty=name} values} +- {@Show()={@NameProperty=name} selection} -> Help() examples for Name -- {@Help()=help {@Name=name}} -- {@Help()=what can I say for {@Name=name}} -- {@Help()={@Name=name} help} +> Help() examples for NameProperty +- {@Help()=help {@NameProperty=name}} +- {@Help()=what can I say for {@NameProperty=name}} +- {@Help()={@NameProperty=name} help} -> Change() examples for Name -- {@Change()=change {@Name=name}} -- {@Change()=goto {@Name=name}} +> Change() examples for NameProperty +- {@Change()=change {@NameProperty=name}} +- {@Change()=goto {@NameProperty=name}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Price/sandwich-Price-money.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Price/sandwich-Price-money.en-us.lu index 4a2ed4153..3d5aa5e1a 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Price/sandwich-Price-money.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Price/sandwich-Price-money.en-us.lu @@ -7,87 +7,87 @@ - price > Define property entity and optional value for Price property. -@ ml Price usesFeature PricePhrases +@ ml PriceProperty usesFeature PricePhrases - @ money money > Define operations on 'Price' property. @ ml Add() usesFeature AddPhrases - -@ ml Price usesFeature Price + -@ ml PriceProperty usesFeature PriceProperty - @ money money @ ml Remove() usesFeature RemovePhrases - -@ ml Price usesFeature Price + -@ ml PriceProperty usesFeature PriceProperty - @ money money @ ml Clear() usesFeature ClearPhrases - -@ ml Price usesFeature Price + -@ ml PriceProperty usesFeature PriceProperty - @ money money @ ml Change() usesFeature ChangePhrases - -@ ml Price usesFeature Price + -@ ml PriceProperty usesFeature PriceProperty - @ money money @ ml Show() usesFeature ShowPhrases - -@ ml Price usesFeature Price + -@ ml PriceProperty usesFeature PriceProperty - @ money money @ ml Help() usesFeature HelpPhrases - -@ ml Price usesFeature Price + -@ ml PriceProperty usesFeature PriceProperty - @ money money > Add examples for operations on the 'Price' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Price with money -- {@Price={@money=$3.50}} -- {@Price={@money=12 dollars}} -- {@Price={@money=8 dollars and 25 cents}} -- {@Price={@money=$3.50} price} -- {@Price={@money=12 dollars} price} -- {@Price={@money=8 dollars and 25 cents} price} +>> entity: Standalone PriceProperty with money +- {@PriceProperty={@money=$3.50}} +- {@PriceProperty={@money=12 dollars}} +- {@PriceProperty={@money=8 dollars and 25 cents}} +- {@PriceProperty={@money=$3.50} price} +- {@PriceProperty={@money=12 dollars} price} +- {@PriceProperty={@money=8 dollars and 25 cents} price} ->> property: Standalone Price name -- {@Price=price} +>> property: Standalone PriceProperty name +- {@PriceProperty=price} -> Add() examples for Price and money -- {@Add()=add {@Price={@money=8 dollars and 25 cents} price}} -- {@Add()=add {@Price={@money=$3.50} price}} -- {@Add()=add {@Price={@money=12 dollars} price}} -- {@Add()=with {@Price={@money=8 dollars and 25 cents}}} -- {@Add()=with {@Price={@money=12 dollars}}} -- {@Add()={@Price=price is {@money=12 dollars}}} -- {@Add()={@Price=price is {@money=8 dollars and 25 cents}}} -- {@Add()={@Price=price is {@money=$3.50}}} -- {@Add()={@Price=price of {@money=$3.50}}} -- {@Add()={@Price=price of {@money=12 dollars}}} -- {@Add()={@Price=price of {@money=8 dollars and 25 cents}}} +> Add() examples for PriceProperty and money +- {@Add()=add {@PriceProperty={@money=8 dollars and 25 cents} price}} +- {@Add()=add {@PriceProperty={@money=$3.50} price}} +- {@Add()=add {@PriceProperty={@money=12 dollars} price}} +- {@Add()=with {@PriceProperty={@money=8 dollars and 25 cents}}} +- {@Add()=with {@PriceProperty={@money=12 dollars}}} +- {@Add()={@PriceProperty=price is {@money=12 dollars}}} +- {@Add()={@PriceProperty=price is {@money=8 dollars and 25 cents}}} +- {@Add()={@PriceProperty=price is {@money=$3.50}}} +- {@Add()={@PriceProperty=price of {@money=$3.50}}} +- {@Add()={@PriceProperty=price of {@money=12 dollars}}} +- {@Add()={@PriceProperty=price of {@money=8 dollars and 25 cents}}} -> Remove() examples for Price and money -- {@Remove()=remove {@Price={@money=$3.50}} -- {@Remove()=remove {@Price={@money=8 dollars and 25 cents}} -- {@Remove()=remove {@Price={@money=12 dollars}} +> Remove() examples for PriceProperty and money +- {@Remove()=remove {@PriceProperty={@money=$3.50}} +- {@Remove()=remove {@PriceProperty={@money=8 dollars and 25 cents}} +- {@Remove()=remove {@PriceProperty={@money=12 dollars}} - {@Remove()=with no {@money=$3.50} price} - {@Remove()=with no {@money=8 dollars and 25 cents} price} - {@Remove()=with no {@money=12 dollars} price} -> Clear() examples for Price -- {@Clear()=clear {@Price=price}} -- {@Clear()=reset {@Price=price}} +> Clear() examples for PriceProperty +- {@Clear()=clear {@PriceProperty=price}} +- {@Clear()=reset {@PriceProperty=price}} -> Show() examples for Price -- {@Show()=show {@Price=price}} -- {@Show()=value of {@Price=price}} -- {@Show()={@Price=price} values} -- {@Show()={@Price=price} selection} +> Show() examples for PriceProperty +- {@Show()=show {@PriceProperty=price}} +- {@Show()=value of {@PriceProperty=price}} +- {@Show()={@PriceProperty=price} values} +- {@Show()={@PriceProperty=price} selection} -> Help() examples for Price -- {@Help()=help {@Price=price}} -- {@Help()=what can I say for {@Price=price}} -- {@Help()={@Price=price} help} +> Help() examples for PriceProperty +- {@Help()=help {@PriceProperty=price}} +- {@Help()=what can I say for {@PriceProperty=price}} +- {@Help()={@PriceProperty=price} help} -> Change() examples for Price -- {@Change()=change {@Price=price}} -- {@Change()=goto {@Price=price}} +> Change() examples for PriceProperty +- {@Change()=change {@PriceProperty=price}} +- {@Change()=goto {@PriceProperty=price}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Quantity/sandwich-Quantity-number.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Quantity/sandwich-Quantity-number.en-us.lu index 0ca32cc80..983d99e75 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Quantity/sandwich-Quantity-number.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Quantity/sandwich-Quantity-number.en-us.lu @@ -7,92 +7,92 @@ - quantity > Define property entity and optional value for Quantity property. -@ ml Quantity usesFeature QuantityPhrases +@ ml QuantityProperty usesFeature QuantityPhrases - @ number number > Define operations on 'Quantity' property. @ ml Add() usesFeature AddPhrases - -@ ml Quantity usesFeature Quantity + -@ ml QuantityProperty usesFeature QuantityProperty - @ number number @ ml Remove() usesFeature RemovePhrases - -@ ml Quantity usesFeature Quantity + -@ ml QuantityProperty usesFeature QuantityProperty - @ number number @ ml Clear() usesFeature ClearPhrases - -@ ml Quantity usesFeature Quantity + -@ ml QuantityProperty usesFeature QuantityProperty - @ number number @ ml Change() usesFeature ChangePhrases - -@ ml Quantity usesFeature Quantity + -@ ml QuantityProperty usesFeature QuantityProperty - @ number number @ ml Show() usesFeature ShowPhrases - -@ ml Quantity usesFeature Quantity + -@ ml QuantityProperty usesFeature QuantityProperty - @ number number @ ml Help() usesFeature HelpPhrases - -@ ml Quantity usesFeature Quantity + -@ ml QuantityProperty usesFeature QuantityProperty - @ number number > Add examples for operations on the 'Quantity' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Quantity with number -- {@Quantity={@number=1}} -- {@Quantity={@number=32.4}} -- {@Quantity={@number=99}} -- {@Quantity={@number=215}} -- {@Quantity={@number=1000}} -- {@Quantity={@number=1} quantity} -- {@Quantity={@number=32.4} quantity} -- {@Quantity={@number=99} quantity} -- {@Quantity={@number=215} quantity} -- {@Quantity={@number=1000} quantity} +>> entity: Standalone QuantityProperty with number +- {@QuantityProperty={@number=1}} +- {@QuantityProperty={@number=32.4}} +- {@QuantityProperty={@number=99}} +- {@QuantityProperty={@number=215}} +- {@QuantityProperty={@number=1000}} +- {@QuantityProperty={@number=1} quantity} +- {@QuantityProperty={@number=32.4} quantity} +- {@QuantityProperty={@number=99} quantity} +- {@QuantityProperty={@number=215} quantity} +- {@QuantityProperty={@number=1000} quantity} ->> property: Standalone Quantity name -- {@Quantity=quantity} +>> property: Standalone QuantityProperty name +- {@QuantityProperty=quantity} -> Add() examples for Quantity and number -- {@Add()=add {@Quantity={@number=32.4} quantity}} -- {@Add()=add {@Quantity={@number=1} quantity}} -- {@Add()=add {@Quantity={@number=215} quantity}} -- {@Add()=with {@Quantity={@number=215}}} -- {@Add()=with {@Quantity={@number=99}}} -- {@Add()=with {@Quantity={@number=1000}}} -- {@Add()={@Quantity=quantity is {@number=99}}} -- {@Add()={@Quantity=quantity is {@number=215}}} -- {@Add()={@Quantity=quantity is {@number=32.4}}} -- {@Add()={@Quantity=quantity of {@number=1}}} -- {@Add()={@Quantity=quantity of {@number=32.4}}} -- {@Add()={@Quantity=quantity of {@number=99}}} +> Add() examples for QuantityProperty and number +- {@Add()=add {@QuantityProperty={@number=32.4} quantity}} +- {@Add()=add {@QuantityProperty={@number=1} quantity}} +- {@Add()=add {@QuantityProperty={@number=215} quantity}} +- {@Add()=with {@QuantityProperty={@number=215}}} +- {@Add()=with {@QuantityProperty={@number=99}}} +- {@Add()=with {@QuantityProperty={@number=1000}}} +- {@Add()={@QuantityProperty=quantity is {@number=99}}} +- {@Add()={@QuantityProperty=quantity is {@number=215}}} +- {@Add()={@QuantityProperty=quantity is {@number=32.4}}} +- {@Add()={@QuantityProperty=quantity of {@number=1}}} +- {@Add()={@QuantityProperty=quantity of {@number=32.4}}} +- {@Add()={@QuantityProperty=quantity of {@number=99}}} -> Remove() examples for Quantity and number -- {@Remove()=remove {@Quantity={@number=1000}} -- {@Remove()=remove {@Quantity={@number=32.4}} -- {@Remove()=remove {@Quantity={@number=1}} +> Remove() examples for QuantityProperty and number +- {@Remove()=remove {@QuantityProperty={@number=1000}} +- {@Remove()=remove {@QuantityProperty={@number=32.4}} +- {@Remove()=remove {@QuantityProperty={@number=1}} - {@Remove()=with no {@number=1} quantity} - {@Remove()=with no {@number=32.4} quantity} - {@Remove()=with no {@number=215} quantity} -> Clear() examples for Quantity -- {@Clear()=clear {@Quantity=quantity}} -- {@Clear()=reset {@Quantity=quantity}} +> Clear() examples for QuantityProperty +- {@Clear()=clear {@QuantityProperty=quantity}} +- {@Clear()=reset {@QuantityProperty=quantity}} -> Show() examples for Quantity -- {@Show()=show {@Quantity=quantity}} -- {@Show()=value of {@Quantity=quantity}} -- {@Show()={@Quantity=quantity} values} -- {@Show()={@Quantity=quantity} selection} +> Show() examples for QuantityProperty +- {@Show()=show {@QuantityProperty=quantity}} +- {@Show()=value of {@QuantityProperty=quantity}} +- {@Show()={@QuantityProperty=quantity} values} +- {@Show()={@QuantityProperty=quantity} selection} -> Help() examples for Quantity -- {@Help()=help {@Quantity=quantity}} -- {@Help()=what can I say for {@Quantity=quantity}} -- {@Help()={@Quantity=quantity} help} +> Help() examples for QuantityProperty +- {@Help()=help {@QuantityProperty=quantity}} +- {@Help()=what can I say for {@QuantityProperty=quantity}} +- {@Help()={@QuantityProperty=quantity} help} -> Change() examples for Quantity -- {@Change()=change {@Quantity=quantity}} -- {@Change()=goto {@Quantity=quantity}} +> Change() examples for QuantityProperty +- {@Change()=change {@QuantityProperty=quantity}} +- {@Change()=goto {@QuantityProperty=quantity}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Sauces/sandwich-Sauces-SaucesEntity.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Sauces/sandwich-Sauces-SaucesEntity.en-us.lu index b303a7dac..e79597da4 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Sauces/sandwich-Sauces-SaucesEntity.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Sauces/sandwich-Sauces-SaucesEntity.en-us.lu @@ -18,142 +18,142 @@ - vinegar -> Define phrase list for Sauces property. +> Define phrase list for SaucesProperty. @ phraselist SaucesPhrases(interchangeable)= - sauces -> Define property entity and optional value for Sauces property. -@ ml Sauces usesFeature SaucesPhrases +> Define property entity and optional value for SaucesProperty. +@ ml SaucesProperty usesFeature SaucesPhrases - @ SaucesEntity SaucesEntity > Define operations on 'Sauces' property. @ ml Add() usesFeature AddPhrases - -@ ml Sauces usesFeature Sauces + -@ ml SaucesProperty usesFeature SaucesProperty - @ SaucesEntity SaucesEntity @ ml Remove() usesFeature RemovePhrases - -@ ml Sauces usesFeature Sauces + -@ ml SaucesProperty usesFeature SaucesProperty - @ SaucesEntity SaucesEntity @ ml Clear() usesFeature ClearPhrases - -@ ml Sauces usesFeature Sauces + -@ ml SaucesProperty usesFeature SaucesProperty - @ SaucesEntity SaucesEntity @ ml Change() usesFeature ChangePhrases - -@ ml Sauces usesFeature Sauces + -@ ml SaucesProperty usesFeature SaucesProperty - @ SaucesEntity SaucesEntity @ ml Show() usesFeature ShowPhrases - -@ ml Sauces usesFeature Sauces + -@ ml SaucesProperty usesFeature SaucesProperty - @ SaucesEntity SaucesEntity @ ml Help() usesFeature HelpPhrases - -@ ml Sauces usesFeature Sauces + -@ ml SaucesProperty usesFeature SaucesProperty - @ SaucesEntity SaucesEntity > Add examples for operations on the 'Sauces' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Sauces with SaucesEntity -- {@Sauces={@SaucesEntity=pepper}} -- {@Sauces={@SaucesEntity=salt}} -- {@Sauces={@SaucesEntity=yellow}} -- {@Sauces={@SaucesEntity=mustard}} -- {@Sauces={@SaucesEntity=yellow mustard}} -- {@Sauces={@SaucesEntity=dijon}} -- {@Sauces={@SaucesEntity=dijon mustard}} -- {@Sauces={@SaucesEntity=mayo}} -- {@Sauces={@SaucesEntity=vinegar}} -- {@Sauces={@SaucesEntity=pepper} sauces} -- {@Sauces={@SaucesEntity=salt} sauces} -- {@Sauces={@SaucesEntity=yellow} sauces} -- {@Sauces={@SaucesEntity=mustard} sauces} -- {@Sauces={@SaucesEntity=yellow mustard} sauces} -- {@Sauces={@SaucesEntity=dijon} sauces} -- {@Sauces={@SaucesEntity=dijon mustard} sauces} -- {@Sauces={@SaucesEntity=mayo} sauces} -- {@Sauces={@SaucesEntity=vinegar} sauces} +>> entity: Standalone SaucesProperty with SaucesEntity +- {@SaucesProperty={@SaucesEntity=pepper}} +- {@SaucesProperty={@SaucesEntity=salt}} +- {@SaucesProperty={@SaucesEntity=yellow}} +- {@SaucesProperty={@SaucesEntity=mustard}} +- {@SaucesProperty={@SaucesEntity=yellow mustard}} +- {@SaucesProperty={@SaucesEntity=dijon}} +- {@SaucesProperty={@SaucesEntity=dijon mustard}} +- {@SaucesProperty={@SaucesEntity=mayo}} +- {@SaucesProperty={@SaucesEntity=vinegar}} +- {@SaucesProperty={@SaucesEntity=pepper} sauces} +- {@SaucesProperty={@SaucesEntity=salt} sauces} +- {@SaucesProperty={@SaucesEntity=yellow} sauces} +- {@SaucesProperty={@SaucesEntity=mustard} sauces} +- {@SaucesProperty={@SaucesEntity=yellow mustard} sauces} +- {@SaucesProperty={@SaucesEntity=dijon} sauces} +- {@SaucesProperty={@SaucesEntity=dijon mustard} sauces} +- {@SaucesProperty={@SaucesEntity=mayo} sauces} +- {@SaucesProperty={@SaucesEntity=vinegar} sauces} ->> property: Standalone Sauces name -- {@Sauces=sauces} +>> property: Standalone SaucesProperty name +- {@SaucesProperty=sauces} -> Add() examples for Sauces and SaucesEntity -- {@Add()=add {@Sauces={@SaucesEntity=vinegar} sauces}} -- {@Add()=add {@Sauces={@SaucesEntity=mayo} sauces}} -- {@Add()=add {@Sauces={@SaucesEntity=dijon mustard} sauces}} -- {@Add()=with {@Sauces={@SaucesEntity=mayo}}} -- {@Add()=with {@Sauces={@SaucesEntity=pepper}}} -- {@Add()=with {@Sauces={@SaucesEntity=yellow mustard}}} -- {@Add()={@Sauces=sauces is {@SaucesEntity=vinegar}}} -- {@Add()={@Sauces=sauces is {@SaucesEntity=mustard}}} -- {@Add()={@Sauces=sauces is {@SaucesEntity=dijon mustard}}} -- {@Add()={@Sauces=sauces of {@SaucesEntity=vinegar}}} -- {@Add()={@Sauces=sauces of {@SaucesEntity=mayo}}} -- {@Add()={@Sauces=sauces of {@SaucesEntity=yellow mustard}}} +> Add() examples for SaucesProperty and SaucesEntity +- {@Add()=add {@SaucesProperty={@SaucesEntity=vinegar} sauces}} +- {@Add()=add {@SaucesProperty={@SaucesEntity=mayo} sauces}} +- {@Add()=add {@SaucesProperty={@SaucesEntity=dijon mustard} sauces}} +- {@Add()=with {@SaucesProperty={@SaucesEntity=mayo}}} +- {@Add()=with {@SaucesProperty={@SaucesEntity=pepper}}} +- {@Add()=with {@SaucesProperty={@SaucesEntity=yellow mustard}}} +- {@Add()={@SaucesProperty=sauces is {@SaucesEntity=vinegar}}} +- {@Add()={@SaucesProperty=sauces is {@SaucesEntity=mustard}}} +- {@Add()={@SaucesProperty=sauces is {@SaucesEntity=dijon mustard}}} +- {@Add()={@SaucesProperty=sauces of {@SaucesEntity=vinegar}}} +- {@Add()={@SaucesProperty=sauces of {@SaucesEntity=mayo}}} +- {@Add()={@SaucesProperty=sauces of {@SaucesEntity=yellow mustard}}} > Add() examples with multiple SaucesEntity -- {@Add()={@Sauces=sauces are {@SaucesEntity=mustard}}} -- {@Add()={@Sauces=sauces are {@SaucesEntity=vinegar}}} -- {@Add()={@Sauces=sauces are {@SaucesEntity=dijon}}} -- {@Add()=add {@Sauces={@SaucesEntity=dijon mustard} and {@SaucesEntity=dijon mustard} sauces} -- {@Add()=add {@Sauces={@SaucesEntity=yellow} and {@SaucesEntity=mayo} sauces} -- {@Add()=add {@Sauces={@SaucesEntity=salt} and {@SaucesEntity=salt} sauces} -- {@Add()=set {@Sauces={@SaucesEntity=salt} and {@SaucesEntity=pepper}} -- {@Add()=set {@Sauces={@SaucesEntity=pepper} and {@SaucesEntity=dijon mustard}} -- {@Add()=set {@Sauces={@SaucesEntity=mustard} and {@SaucesEntity=mustard}} -- {@Add()=with {@Sauces={@SaucesEntity=pepper}, {@SaucesEntity=dijon} and {@SaucesEntity=yellow mustard} sauces} -- {@Add()=with {@Sauces={@SaucesEntity=vinegar}, {@SaucesEntity=mustard} and {@SaucesEntity=dijon mustard} sauces} -- {@Add()=with {@Sauces={@SaucesEntity=salt}, {@SaucesEntity=salt} and {@SaucesEntity=dijon mustard} sauces} -- {@Add()=add {@Sauces={@SaucesEntity=pepper}, {@SaucesEntity=yellow mustard} and {@SaucesEntity=dijon}} -- {@Add()=add {@Sauces={@SaucesEntity=dijon mustard}, {@SaucesEntity=vinegar} and {@SaucesEntity=vinegar}} -- {@Add()=add {@Sauces={@SaucesEntity=yellow mustard}, {@SaucesEntity=vinegar} and {@SaucesEntity=mustard}} -- {@Add()={@Sauces=sauces are {@SaucesEntity=mayo} and {@SaucesEntity=vinegar}}} -- {@Add()={@Sauces=sauces are {@SaucesEntity=pepper} and {@SaucesEntity=dijon}}} -- {@Add()={@Sauces=sauces are {@SaucesEntity=yellow} and {@SaucesEntity=dijon mustard}}} -- {@Add()={@Sauces=sauces of {@SaucesEntity=yellow mustard}, {@SaucesEntity=dijon mustard} and {@SaucesEntity=yellow mustard}}} -- {@Add()={@Sauces=sauces of {@SaucesEntity=dijon mustard}, {@SaucesEntity=vinegar} and {@SaucesEntity=mayo}}} -- {@Add()={@Sauces=sauces of {@SaucesEntity=mustard}, {@SaucesEntity=mayo} and {@SaucesEntity=mayo}}} +- {@Add()={@SaucesProperty=sauces are {@SaucesEntity=mustard}}} +- {@Add()={@SaucesProperty=sauces are {@SaucesEntity=vinegar}}} +- {@Add()={@SaucesProperty=sauces are {@SaucesEntity=dijon}}} +- {@Add()=add {@SaucesProperty={@SaucesEntity=dijon mustard} and {@SaucesEntity=dijon mustard} sauces} +- {@Add()=add {@SaucesProperty={@SaucesEntity=yellow} and {@SaucesEntity=mayo} sauces} +- {@Add()=add {@SaucesProperty={@SaucesEntity=salt} and {@SaucesEntity=salt} sauces} +- {@Add()=set {@SaucesProperty={@SaucesEntity=salt} and {@SaucesEntity=pepper}} +- {@Add()=set {@SaucesProperty={@SaucesEntity=pepper} and {@SaucesEntity=dijon mustard}} +- {@Add()=set {@SaucesProperty={@SaucesEntity=mustard} and {@SaucesEntity=mustard}} +- {@Add()=with {@SaucesProperty={@SaucesEntity=pepper}, {@SaucesEntity=dijon} and {@SaucesEntity=yellow mustard} sauces} +- {@Add()=with {@SaucesProperty={@SaucesEntity=vinegar}, {@SaucesEntity=mustard} and {@SaucesEntity=dijon mustard} sauces} +- {@Add()=with {@SaucesProperty={@SaucesEntity=salt}, {@SaucesEntity=salt} and {@SaucesEntity=dijon mustard} sauces} +- {@Add()=add {@SaucesProperty={@SaucesEntity=pepper}, {@SaucesEntity=yellow mustard} and {@SaucesEntity=dijon}} +- {@Add()=add {@SaucesProperty={@SaucesEntity=dijon mustard}, {@SaucesEntity=vinegar} and {@SaucesEntity=vinegar}} +- {@Add()=add {@SaucesProperty={@SaucesEntity=yellow mustard}, {@SaucesEntity=vinegar} and {@SaucesEntity=mustard}} +- {@Add()={@SaucesProperty=sauces are {@SaucesEntity=mayo} and {@SaucesEntity=vinegar}}} +- {@Add()={@SaucesProperty=sauces are {@SaucesEntity=pepper} and {@SaucesEntity=dijon}}} +- {@Add()={@SaucesProperty=sauces are {@SaucesEntity=yellow} and {@SaucesEntity=dijon mustard}}} +- {@Add()={@SaucesProperty=sauces of {@SaucesEntity=yellow mustard}, {@SaucesEntity=dijon mustard} and {@SaucesEntity=yellow mustard}}} +- {@Add()={@SaucesProperty=sauces of {@SaucesEntity=dijon mustard}, {@SaucesEntity=vinegar} and {@SaucesEntity=mayo}}} +- {@Add()={@SaucesProperty=sauces of {@SaucesEntity=mustard}, {@SaucesEntity=mayo} and {@SaucesEntity=mayo}}} -> Remove() examples for Sauces and SaucesEntity -- {@Remove()=remove {@Sauces={@SaucesEntity=pepper}} -- {@Remove()=remove {@Sauces={@SaucesEntity=dijon}} -- {@Remove()=remove {@Sauces={@SaucesEntity=mustard}} +> Remove() examples for SaucesProperty and SaucesEntity +- {@Remove()=remove {@SaucesProperty={@SaucesEntity=pepper}} +- {@Remove()=remove {@SaucesProperty={@SaucesEntity=dijon}} +- {@Remove()=remove {@SaucesProperty={@SaucesEntity=mustard}} - {@Remove()=with no {@SaucesEntity=yellow mustard} sauces} - {@Remove()=with no {@SaucesEntity=mustard} sauces} - {@Remove()=with no {@SaucesEntity=yellow} sauces} -> Remove() examples for Sauces and 2-3 SaucesEntity -- {@Remove()=delete {@Sauces={@SaucesEntity=salt} and {@SaucesEntity=pepper}}} -- {@Remove()=delete {@Sauces={@SaucesEntity=mustard} and {@SaucesEntity=mustard}}} -- {@Remove()=delete {@Sauces={@SaucesEntity=dijon mustard} and {@SaucesEntity=mayo}}} -- {@Remove()=without {@Sauces={@SaucesEntity=yellow}, {@SaucesEntity=salt} and {@SaucesEntity=salt}}} -- {@Remove()=without {@Sauces={@SaucesEntity=vinegar}, {@SaucesEntity=vinegar} and {@SaucesEntity=vinegar}}} -- {@Remove()=without {@Sauces={@SaucesEntity=dijon}, {@SaucesEntity=dijon mustard} and {@SaucesEntity=mayo}}} -- {@Remove()=remove {@Sauces={@SaucesEntity=salt} and {@SaucesEntity=mustard} sauces}} -- {@Remove()=remove {@Sauces={@SaucesEntity=yellow mustard} and {@SaucesEntity=dijon mustard} sauces}} -- {@Remove()=remove {@Sauces={@SaucesEntity=vinegar} and {@SaucesEntity=mayo} sauces}} -- {@Remove()=delete {@Sauces={@SaucesEntity=dijon mustard}, {@SaucesEntity=mustard} and {@SaucesEntity=dijon} sauces}} -- {@Remove()=delete {@Sauces={@SaucesEntity=vinegar}, {@SaucesEntity=yellow mustard} and {@SaucesEntity=yellow mustard} sauces}} -- {@Remove()=delete {@Sauces={@SaucesEntity=vinegar}, {@SaucesEntity=yellow} and {@SaucesEntity=yellow mustard} sauces}} +> Remove() examples for SaucesProperty and 2-3 SaucesEntity +- {@Remove()=delete {@SaucesProperty={@SaucesEntity=salt} and {@SaucesEntity=pepper}}} +- {@Remove()=delete {@SaucesProperty={@SaucesEntity=mustard} and {@SaucesEntity=mustard}}} +- {@Remove()=delete {@SaucesProperty={@SaucesEntity=dijon mustard} and {@SaucesEntity=mayo}}} +- {@Remove()=without {@SaucesProperty={@SaucesEntity=yellow}, {@SaucesEntity=salt} and {@SaucesEntity=salt}}} +- {@Remove()=without {@SaucesProperty={@SaucesEntity=vinegar}, {@SaucesEntity=vinegar} and {@SaucesEntity=vinegar}}} +- {@Remove()=without {@SaucesProperty={@SaucesEntity=dijon}, {@SaucesEntity=dijon mustard} and {@SaucesEntity=mayo}}} +- {@Remove()=remove {@SaucesProperty={@SaucesEntity=salt} and {@SaucesEntity=mustard} sauces}} +- {@Remove()=remove {@SaucesProperty={@SaucesEntity=yellow mustard} and {@SaucesEntity=dijon mustard} sauces}} +- {@Remove()=remove {@SaucesProperty={@SaucesEntity=vinegar} and {@SaucesEntity=mayo} sauces}} +- {@Remove()=delete {@SaucesProperty={@SaucesEntity=dijon mustard}, {@SaucesEntity=mustard} and {@SaucesEntity=dijon} sauces}} +- {@Remove()=delete {@SaucesProperty={@SaucesEntity=vinegar}, {@SaucesEntity=yellow mustard} and {@SaucesEntity=yellow mustard} sauces}} +- {@Remove()=delete {@SaucesProperty={@SaucesEntity=vinegar}, {@SaucesEntity=yellow} and {@SaucesEntity=yellow mustard} sauces}} -> Clear() examples for Sauces -- {@Clear()=clear {@Sauces=sauces}} -- {@Clear()=reset {@Sauces=sauces}} +> Clear() examples for SaucesProperty +- {@Clear()=clear {@SaucesProperty=sauces}} +- {@Clear()=reset {@SaucesProperty=sauces}} -> Show() examples for Sauces -- {@Show()=show {@Sauces=sauces}} -- {@Show()=value of {@Sauces=sauces}} -- {@Show()={@Sauces=sauces} values} -- {@Show()={@Sauces=sauces} selection} +> Show() examples for SaucesProperty +- {@Show()=show {@SaucesProperty=sauces}} +- {@Show()=value of {@SaucesProperty=sauces}} +- {@Show()={@SaucesProperty=sauces} values} +- {@Show()={@SaucesProperty=sauces} selection} -> Help() examples for Sauces -- {@Help()=help {@Sauces=sauces}} -- {@Help()=what can I say for {@Sauces=sauces}} -- {@Help()={@Sauces=sauces} help} +> Help() examples for SaucesProperty +- {@Help()=help {@SaucesProperty=sauces}} +- {@Help()=what can I say for {@SaucesProperty=sauces}} +- {@Help()={@SaucesProperty=sauces} help} -> Change() examples for Sauces -- {@Change()=change {@Sauces=sauces}} -- {@Change()=goto {@Sauces=sauces}} +> Change() examples for SaucesProperty +- {@Change()=change {@SaucesProperty=sauces}} +- {@Change()=goto {@SaucesProperty=sauces}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Toppings/sandwich-Toppings-ToppingsEntity.en-us.lu b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Toppings/sandwich-Toppings-ToppingsEntity.en-us.lu index 02c546132..76bc9bad2 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Toppings/sandwich-Toppings-ToppingsEntity.en-us.lu +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/en-us/Toppings/sandwich-Toppings-ToppingsEntity.en-us.lu @@ -24,148 +24,148 @@ - red onions -> Define phrase list for Toppings property. +> Define phrase list for ToppingsProperty. @ phraselist ToppingsPhrases(interchangeable)= - toppings -> Define property entity and optional value for Toppings property. -@ ml Toppings usesFeature ToppingsPhrases +> Define property entity and optional value for ToppingsProperty. +@ ml ToppingsProperty usesFeature ToppingsPhrases - @ ToppingsEntity ToppingsEntity > Define operations on 'Toppings' property. @ ml Add() usesFeature AddPhrases - -@ ml Toppings usesFeature Toppings + -@ ml ToppingsProperty usesFeature ToppingsProperty - @ ToppingsEntity ToppingsEntity @ ml Remove() usesFeature RemovePhrases - -@ ml Toppings usesFeature Toppings + -@ ml ToppingsProperty usesFeature ToppingsProperty - @ ToppingsEntity ToppingsEntity @ ml Clear() usesFeature ClearPhrases - -@ ml Toppings usesFeature Toppings + -@ ml ToppingsProperty usesFeature ToppingsProperty - @ ToppingsEntity ToppingsEntity @ ml Change() usesFeature ChangePhrases - -@ ml Toppings usesFeature Toppings + -@ ml ToppingsProperty usesFeature ToppingsProperty - @ ToppingsEntity ToppingsEntity @ ml Show() usesFeature ShowPhrases - -@ ml Toppings usesFeature Toppings + -@ ml ToppingsProperty usesFeature ToppingsProperty - @ ToppingsEntity ToppingsEntity @ ml Help() usesFeature HelpPhrases - -@ ml Toppings usesFeature Toppings + -@ ml ToppingsProperty usesFeature ToppingsProperty - @ ToppingsEntity ToppingsEntity > Add examples for operations on the 'Toppings' property to the intent 'sandwich'. # sandwich ->> entity: Standalone Toppings with ToppingsEntity -- {@Toppings={@ToppingsEntity=tomato}} -- {@Toppings={@ToppingsEntity=lettuce}} -- {@Toppings={@ToppingsEntity=pickles}} -- {@Toppings={@ToppingsEntity=green}} -- {@Toppings={@ToppingsEntity=peppers}} -- {@Toppings={@ToppingsEntity=green peppers}} -- {@Toppings={@ToppingsEntity=red}} -- {@Toppings={@ToppingsEntity=red peppers}} -- {@Toppings={@ToppingsEntity=white}} -- {@Toppings={@ToppingsEntity=onions}} -- {@Toppings={@ToppingsEntity=white onions}} -- {@Toppings={@ToppingsEntity=red onions}} -- {@Toppings={@ToppingsEntity=tomato} toppings} -- {@Toppings={@ToppingsEntity=lettuce} toppings} -- {@Toppings={@ToppingsEntity=pickles} toppings} -- {@Toppings={@ToppingsEntity=green} toppings} -- {@Toppings={@ToppingsEntity=peppers} toppings} -- {@Toppings={@ToppingsEntity=green peppers} toppings} -- {@Toppings={@ToppingsEntity=red} toppings} -- {@Toppings={@ToppingsEntity=red peppers} toppings} -- {@Toppings={@ToppingsEntity=white} toppings} -- {@Toppings={@ToppingsEntity=onions} toppings} -- {@Toppings={@ToppingsEntity=white onions} toppings} -- {@Toppings={@ToppingsEntity=red onions} toppings} +>> entity: Standalone ToppingsProperty with ToppingsEntity +- {@ToppingsProperty={@ToppingsEntity=tomato}} +- {@ToppingsProperty={@ToppingsEntity=lettuce}} +- {@ToppingsProperty={@ToppingsEntity=pickles}} +- {@ToppingsProperty={@ToppingsEntity=green}} +- {@ToppingsProperty={@ToppingsEntity=peppers}} +- {@ToppingsProperty={@ToppingsEntity=green peppers}} +- {@ToppingsProperty={@ToppingsEntity=red}} +- {@ToppingsProperty={@ToppingsEntity=red peppers}} +- {@ToppingsProperty={@ToppingsEntity=white}} +- {@ToppingsProperty={@ToppingsEntity=onions}} +- {@ToppingsProperty={@ToppingsEntity=white onions}} +- {@ToppingsProperty={@ToppingsEntity=red onions}} +- {@ToppingsProperty={@ToppingsEntity=tomato} toppings} +- {@ToppingsProperty={@ToppingsEntity=lettuce} toppings} +- {@ToppingsProperty={@ToppingsEntity=pickles} toppings} +- {@ToppingsProperty={@ToppingsEntity=green} toppings} +- {@ToppingsProperty={@ToppingsEntity=peppers} toppings} +- {@ToppingsProperty={@ToppingsEntity=green peppers} toppings} +- {@ToppingsProperty={@ToppingsEntity=red} toppings} +- {@ToppingsProperty={@ToppingsEntity=red peppers} toppings} +- {@ToppingsProperty={@ToppingsEntity=white} toppings} +- {@ToppingsProperty={@ToppingsEntity=onions} toppings} +- {@ToppingsProperty={@ToppingsEntity=white onions} toppings} +- {@ToppingsProperty={@ToppingsEntity=red onions} toppings} ->> property: Standalone Toppings name -- {@Toppings=toppings} +>> property: Standalone ToppingsProperty name +- {@ToppingsProperty=toppings} -> Add() examples for Toppings and ToppingsEntity -- {@Add()=add {@Toppings={@ToppingsEntity=onions} toppings}} -- {@Add()=add {@Toppings={@ToppingsEntity=red} toppings}} -- {@Add()=add {@Toppings={@ToppingsEntity=tomato} toppings}} -- {@Add()=with {@Toppings={@ToppingsEntity=onions}}} -- {@Add()=with {@Toppings={@ToppingsEntity=green peppers}}} -- {@Add()=with {@Toppings={@ToppingsEntity=peppers}}} -- {@Add()={@Toppings=toppings is {@ToppingsEntity=red onions}}} -- {@Add()={@Toppings=toppings is {@ToppingsEntity=lettuce}}} -- {@Add()={@Toppings=toppings is {@ToppingsEntity=peppers}}} -- {@Add()={@Toppings=toppings of {@ToppingsEntity=green peppers}}} -- {@Add()={@Toppings=toppings of {@ToppingsEntity=red peppers}}} -- {@Add()={@Toppings=toppings of {@ToppingsEntity=onions}}} +> Add() examples for ToppingsProperty and ToppingsEntity +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=onions} toppings}} +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=red} toppings}} +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=tomato} toppings}} +- {@Add()=with {@ToppingsProperty={@ToppingsEntity=onions}}} +- {@Add()=with {@ToppingsProperty={@ToppingsEntity=green peppers}}} +- {@Add()=with {@ToppingsProperty={@ToppingsEntity=peppers}}} +- {@Add()={@ToppingsProperty=toppings is {@ToppingsEntity=red onions}}} +- {@Add()={@ToppingsProperty=toppings is {@ToppingsEntity=lettuce}}} +- {@Add()={@ToppingsProperty=toppings is {@ToppingsEntity=peppers}}} +- {@Add()={@ToppingsProperty=toppings of {@ToppingsEntity=green peppers}}} +- {@Add()={@ToppingsProperty=toppings of {@ToppingsEntity=red peppers}}} +- {@Add()={@ToppingsProperty=toppings of {@ToppingsEntity=onions}}} > Add() examples with multiple ToppingsEntity -- {@Add()={@Toppings=toppings are {@ToppingsEntity=peppers}}} -- {@Add()={@Toppings=toppings are {@ToppingsEntity=onions}}} -- {@Add()={@Toppings=toppings are {@ToppingsEntity=lettuce}}} -- {@Add()=add {@Toppings={@ToppingsEntity=tomato} and {@ToppingsEntity=white} toppings} -- {@Add()=add {@Toppings={@ToppingsEntity=pickles} and {@ToppingsEntity=red peppers} toppings} -- {@Add()=add {@Toppings={@ToppingsEntity=green peppers} and {@ToppingsEntity=green} toppings} -- {@Add()=set {@Toppings={@ToppingsEntity=white onions} and {@ToppingsEntity=white onions}} -- {@Add()=set {@Toppings={@ToppingsEntity=green} and {@ToppingsEntity=red onions}} -- {@Add()=set {@Toppings={@ToppingsEntity=green} and {@ToppingsEntity=red}} -- {@Add()=with {@Toppings={@ToppingsEntity=green peppers}, {@ToppingsEntity=red peppers} and {@ToppingsEntity=green peppers} toppings} -- {@Add()=with {@Toppings={@ToppingsEntity=peppers}, {@ToppingsEntity=pickles} and {@ToppingsEntity=white onions} toppings} -- {@Add()=with {@Toppings={@ToppingsEntity=white onions}, {@ToppingsEntity=lettuce} and {@ToppingsEntity=onions} toppings} -- {@Add()=add {@Toppings={@ToppingsEntity=green peppers}, {@ToppingsEntity=red} and {@ToppingsEntity=red peppers}} -- {@Add()=add {@Toppings={@ToppingsEntity=lettuce}, {@ToppingsEntity=white} and {@ToppingsEntity=red peppers}} -- {@Add()=add {@Toppings={@ToppingsEntity=peppers}, {@ToppingsEntity=tomato} and {@ToppingsEntity=white onions}} -- {@Add()={@Toppings=toppings are {@ToppingsEntity=peppers} and {@ToppingsEntity=red peppers}}} -- {@Add()={@Toppings=toppings are {@ToppingsEntity=green} and {@ToppingsEntity=lettuce}}} -- {@Add()={@Toppings=toppings are {@ToppingsEntity=white} and {@ToppingsEntity=red peppers}}} -- {@Add()={@Toppings=toppings of {@ToppingsEntity=red peppers}, {@ToppingsEntity=white} and {@ToppingsEntity=green peppers}}} -- {@Add()={@Toppings=toppings of {@ToppingsEntity=red peppers}, {@ToppingsEntity=onions} and {@ToppingsEntity=onions}}} -- {@Add()={@Toppings=toppings of {@ToppingsEntity=green peppers}, {@ToppingsEntity=white onions} and {@ToppingsEntity=peppers}}} +- {@Add()={@ToppingsProperty=toppings are {@ToppingsEntity=peppers}}} +- {@Add()={@ToppingsProperty=toppings are {@ToppingsEntity=onions}}} +- {@Add()={@ToppingsProperty=toppings are {@ToppingsEntity=lettuce}}} +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=tomato} and {@ToppingsEntity=white} toppings} +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=pickles} and {@ToppingsEntity=red peppers} toppings} +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=green peppers} and {@ToppingsEntity=green} toppings} +- {@Add()=set {@ToppingsProperty={@ToppingsEntity=white onions} and {@ToppingsEntity=white onions}} +- {@Add()=set {@ToppingsProperty={@ToppingsEntity=green} and {@ToppingsEntity=red onions}} +- {@Add()=set {@ToppingsProperty={@ToppingsEntity=green} and {@ToppingsEntity=red}} +- {@Add()=with {@ToppingsProperty={@ToppingsEntity=green peppers}, {@ToppingsEntity=red peppers} and {@ToppingsEntity=green peppers} toppings} +- {@Add()=with {@ToppingsProperty={@ToppingsEntity=peppers}, {@ToppingsEntity=pickles} and {@ToppingsEntity=white onions} toppings} +- {@Add()=with {@ToppingsProperty={@ToppingsEntity=white onions}, {@ToppingsEntity=lettuce} and {@ToppingsEntity=onions} toppings} +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=green peppers}, {@ToppingsEntity=red} and {@ToppingsEntity=red peppers}} +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=lettuce}, {@ToppingsEntity=white} and {@ToppingsEntity=red peppers}} +- {@Add()=add {@ToppingsProperty={@ToppingsEntity=peppers}, {@ToppingsEntity=tomato} and {@ToppingsEntity=white onions}} +- {@Add()={@ToppingsProperty=toppings are {@ToppingsEntity=peppers} and {@ToppingsEntity=red peppers}}} +- {@Add()={@ToppingsProperty=toppings are {@ToppingsEntity=green} and {@ToppingsEntity=lettuce}}} +- {@Add()={@ToppingsProperty=toppings are {@ToppingsEntity=white} and {@ToppingsEntity=red peppers}}} +- {@Add()={@ToppingsProperty=toppings of {@ToppingsEntity=red peppers}, {@ToppingsEntity=white} and {@ToppingsEntity=green peppers}}} +- {@Add()={@ToppingsProperty=toppings of {@ToppingsEntity=red peppers}, {@ToppingsEntity=onions} and {@ToppingsEntity=onions}}} +- {@Add()={@ToppingsProperty=toppings of {@ToppingsEntity=green peppers}, {@ToppingsEntity=white onions} and {@ToppingsEntity=peppers}}} -> Remove() examples for Toppings and ToppingsEntity -- {@Remove()=remove {@Toppings={@ToppingsEntity=peppers}} -- {@Remove()=remove {@Toppings={@ToppingsEntity=red}} -- {@Remove()=remove {@Toppings={@ToppingsEntity=white onions}} +> Remove() examples for ToppingsProperty and ToppingsEntity +- {@Remove()=remove {@ToppingsProperty={@ToppingsEntity=peppers}} +- {@Remove()=remove {@ToppingsProperty={@ToppingsEntity=red}} +- {@Remove()=remove {@ToppingsProperty={@ToppingsEntity=white onions}} - {@Remove()=with no {@ToppingsEntity=onions} toppings} - {@Remove()=with no {@ToppingsEntity=tomato} toppings} - {@Remove()=with no {@ToppingsEntity=red peppers} toppings} -> Remove() examples for Toppings and 2-3 ToppingsEntity -- {@Remove()=delete {@Toppings={@ToppingsEntity=onions} and {@ToppingsEntity=green}}} -- {@Remove()=delete {@Toppings={@ToppingsEntity=onions} and {@ToppingsEntity=red}}} -- {@Remove()=delete {@Toppings={@ToppingsEntity=red} and {@ToppingsEntity=lettuce}}} -- {@Remove()=without {@Toppings={@ToppingsEntity=white}, {@ToppingsEntity=tomato} and {@ToppingsEntity=green}}} -- {@Remove()=without {@Toppings={@ToppingsEntity=green}, {@ToppingsEntity=green peppers} and {@ToppingsEntity=red}}} -- {@Remove()=without {@Toppings={@ToppingsEntity=white onions}, {@ToppingsEntity=red} and {@ToppingsEntity=red onions}}} -- {@Remove()=remove {@Toppings={@ToppingsEntity=pickles} and {@ToppingsEntity=peppers} toppings}} -- {@Remove()=remove {@Toppings={@ToppingsEntity=onions} and {@ToppingsEntity=red onions} toppings}} -- {@Remove()=remove {@Toppings={@ToppingsEntity=red peppers} and {@ToppingsEntity=green peppers} toppings}} -- {@Remove()=delete {@Toppings={@ToppingsEntity=white}, {@ToppingsEntity=white onions} and {@ToppingsEntity=tomato} toppings}} -- {@Remove()=delete {@Toppings={@ToppingsEntity=tomato}, {@ToppingsEntity=pickles} and {@ToppingsEntity=onions} toppings}} -- {@Remove()=delete {@Toppings={@ToppingsEntity=peppers}, {@ToppingsEntity=green} and {@ToppingsEntity=tomato} toppings}} +> Remove() examples for ToppingsProperty and 2-3 ToppingsEntity +- {@Remove()=delete {@ToppingsProperty={@ToppingsEntity=onions} and {@ToppingsEntity=green}}} +- {@Remove()=delete {@ToppingsProperty={@ToppingsEntity=onions} and {@ToppingsEntity=red}}} +- {@Remove()=delete {@ToppingsProperty={@ToppingsEntity=red} and {@ToppingsEntity=lettuce}}} +- {@Remove()=without {@ToppingsProperty={@ToppingsEntity=white}, {@ToppingsEntity=tomato} and {@ToppingsEntity=green}}} +- {@Remove()=without {@ToppingsProperty={@ToppingsEntity=green}, {@ToppingsEntity=green peppers} and {@ToppingsEntity=red}}} +- {@Remove()=without {@ToppingsProperty={@ToppingsEntity=white onions}, {@ToppingsEntity=red} and {@ToppingsEntity=red onions}}} +- {@Remove()=remove {@ToppingsProperty={@ToppingsEntity=pickles} and {@ToppingsEntity=peppers} toppings}} +- {@Remove()=remove {@ToppingsProperty={@ToppingsEntity=onions} and {@ToppingsEntity=red onions} toppings}} +- {@Remove()=remove {@ToppingsProperty={@ToppingsEntity=red peppers} and {@ToppingsEntity=green peppers} toppings}} +- {@Remove()=delete {@ToppingsProperty={@ToppingsEntity=white}, {@ToppingsEntity=white onions} and {@ToppingsEntity=tomato} toppings}} +- {@Remove()=delete {@ToppingsProperty={@ToppingsEntity=tomato}, {@ToppingsEntity=pickles} and {@ToppingsEntity=onions} toppings}} +- {@Remove()=delete {@ToppingsProperty={@ToppingsEntity=peppers}, {@ToppingsEntity=green} and {@ToppingsEntity=tomato} toppings}} -> Clear() examples for Toppings -- {@Clear()=clear {@Toppings=toppings}} -- {@Clear()=reset {@Toppings=toppings}} +> Clear() examples for ToppingsProperty +- {@Clear()=clear {@ToppingsProperty=toppings}} +- {@Clear()=reset {@ToppingsProperty=toppings}} -> Show() examples for Toppings -- {@Show()=show {@Toppings=toppings}} -- {@Show()=value of {@Toppings=toppings}} -- {@Show()={@Toppings=toppings} values} -- {@Show()={@Toppings=toppings} selection} +> Show() examples for ToppingsProperty +- {@Show()=show {@ToppingsProperty=toppings}} +- {@Show()=value of {@ToppingsProperty=toppings}} +- {@Show()={@ToppingsProperty=toppings} values} +- {@Show()={@ToppingsProperty=toppings} selection} -> Help() examples for Toppings -- {@Help()=help {@Toppings=toppings}} -- {@Help()=what can I say for {@Toppings=toppings}} -- {@Help()={@Toppings=toppings} help} +> Help() examples for ToppingsProperty +- {@Help()=help {@ToppingsProperty=toppings}} +- {@Help()=what can I say for {@ToppingsProperty=toppings}} +- {@Help()={@ToppingsProperty=toppings} help} -> Change() examples for Toppings -- {@Change()=change {@Toppings=toppings}} -- {@Change()=goto {@Toppings=toppings}} +> Change() examples for ToppingsProperty +- {@Change()=change {@ToppingsProperty=toppings}} +- {@Change()=goto {@ToppingsProperty=toppings}} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwich.en-us.lu.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwich.en-us.lu.dialog new file mode 100644 index 000000000..a3c2cd3c0 --- /dev/null +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwich.en-us.lu.dialog @@ -0,0 +1,9 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-samples/main/experimental/generation/runbot/runbot.schema", + "$kind": "Microsoft.LuisRecognizer", + "id": "LUIS_sandwich", + "applicationId": "=settings.luis.sandwich_en_us_lu.appId", + "version": "=settings.luis.sandwich_en_us_lu.version", + "endpoint": "=settings.luis.endpoint", + "endpointKey": "=settings.luis.endpointKey" +} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwich.json b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwich.json index 2c110bae8..85988b12a 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwich.json +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwich.json @@ -145,29 +145,29 @@ "type": "string", "$entities": [ "boolean", - "Quantity", - "Length", - "Name", - "Bread", - "Meat", - "Cheese", - "Toppings", - "Sauces", - "Price" + "QuantityProperty", + "LengthProperty", + "NameProperty", + "BreadProperty", + "MeatProperty", + "CheeseProperty", + "ToppingsProperty", + "SaucesProperty", + "PriceProperty" ] }, "PropertyToChange": { "type": "string", "$entities": [ - "Quantity", - "Length", - "Name", - "Bread", - "Meat", - "Cheese", - "Toppings", - "Sauces", - "Price" + "QuantityProperty", + "LengthProperty", + "NameProperty", + "BreadProperty", + "MeatProperty", + "CheeseProperty", + "ToppingsProperty", + "SaucesProperty", + "PriceProperty" ] } }, diff --git a/tests/tests.schema b/tests/tests.schema index bd7421a46..870033c92 100644 --- a/tests/tests.schema +++ b/tests/tests.schema @@ -3633,7 +3633,10 @@ "$role": "interface", "oneOf": [ { - "type": "string" + "$ref": "#/definitions/Microsoft.ActivityTemplate" + }, + { + "$ref": "#/definitions/Microsoft.StaticActivityTemplate" }, { "$ref": "#/definitions/botframework.json/definitions/Activity", @@ -3642,10 +3645,7 @@ ] }, { - "$ref": "#/definitions/Microsoft.ActivityTemplate" - }, - { - "$ref": "#/definitions/Microsoft.StaticActivityTemplate" + "type": "string" } ] }, @@ -3655,41 +3655,20 @@ "$role": "interface", "oneOf": [ { - "type": "string" + "$ref": "#/definitions/CustomAction.dialog" }, { - "$ref": "#/definitions/Microsoft.QnAMakerDialog" + "$ref": "#/definitions/CustomAction2.dialog" }, { "$ref": "#/definitions/Microsoft.AdaptiveDialog" }, - { - "$ref": "#/definitions/Microsoft.Test.AssertCondition" - }, { "$ref": "#/definitions/Microsoft.Ask" }, { "$ref": "#/definitions/Microsoft.AttachmentInput" }, - { - "$ref": "#/definitions/Microsoft.ChoiceInput" - }, - { - "$ref": "#/definitions/Microsoft.ConfirmInput" - }, - { - "$ref": "#/definitions/Microsoft.DateTimeInput" - }, - { - "$ref": "#/definitions/Microsoft.NumberInput" - }, - { - "$ref": "#/definitions/Microsoft.OAuthInput" - }, - { - "$ref": "#/definitions/Microsoft.TextInput" - }, { "$ref": "#/definitions/Microsoft.BeginDialog" }, @@ -3705,12 +3684,21 @@ { "$ref": "#/definitions/Microsoft.CancelDialog" }, + { + "$ref": "#/definitions/Microsoft.ChoiceInput" + }, + { + "$ref": "#/definitions/Microsoft.ConfirmInput" + }, { "$ref": "#/definitions/Microsoft.ContinueConversationLater" }, { "$ref": "#/definitions/Microsoft.ContinueLoop" }, + { + "$ref": "#/definitions/Microsoft.DateTimeInput" + }, { "$ref": "#/definitions/Microsoft.DebugBreak" }, @@ -3762,6 +3750,15 @@ { "$ref": "#/definitions/Microsoft.LogAction" }, + { + "$ref": "#/definitions/Microsoft.NumberInput" + }, + { + "$ref": "#/definitions/Microsoft.OAuthInput" + }, + { + "$ref": "#/definitions/Microsoft.QnAMakerDialog" + }, { "$ref": "#/definitions/Microsoft.RepeatDialog" }, @@ -3786,6 +3783,12 @@ { "$ref": "#/definitions/Microsoft.TelemetryTrackEvent" }, + { + "$ref": "#/definitions/Microsoft.Test.AssertCondition" + }, + { + "$ref": "#/definitions/Microsoft.TextInput" + }, { "$ref": "#/definitions/Microsoft.ThrowException" }, @@ -3805,10 +3808,7 @@ "$ref": "#/definitions/Testbot.Multiply" }, { - "$ref": "#/definitions/CustomAction.dialog" - }, - { - "$ref": "#/definitions/CustomAction2.dialog" + "type": "string" } ] }, @@ -3818,11 +3818,6 @@ "description": "Components which derive from EntityRecognizer.", "type": "object", "oneOf": [ - { - "type": "string", - "title": "Reference to Microsoft.IEntityRecognizer", - "description": "Reference to Microsoft.IEntityRecognizer .dialog file." - }, { "$ref": "#/definitions/Microsoft.AgeEntityRecognizer" }, @@ -3876,6 +3871,11 @@ }, { "$ref": "#/definitions/Microsoft.UrlEntityRecognizer" + }, + { + "type": "string", + "title": "Reference to Microsoft.IEntityRecognizer", + "description": "Reference to Microsoft.IEntityRecognizer .dialog file." } ] }, @@ -3884,14 +3884,14 @@ "description": "Components which dervie from the LanguageGenerator class", "$role": "interface", "oneOf": [ - { - "type": "string" - }, { "$ref": "#/definitions/Microsoft.ResourceMultiLanguageGenerator" }, { "$ref": "#/definitions/Microsoft.TemplateEngineLanguageGenerator" + }, + { + "type": "string" } ] }, @@ -3900,30 +3900,6 @@ "description": "Components which derive from Recognizer class", "$role": "interface", "oneOf": [ - { - "type": "string" - }, - { - "$ref": "#/definitions/Microsoft.LuisRecognizer" - }, - { - "$ref": "#/definitions/Microsoft.OrchestratorRecognizer" - }, - { - "$ref": "#/definitions/Microsoft.QnAMakerRecognizer" - }, - { - "$ref": "#/definitions/Microsoft.CrossTrainedRecognizerSet" - }, - { - "$ref": "#/definitions/Microsoft.MultiLanguageRecognizer" - }, - { - "$ref": "#/definitions/Microsoft.RecognizerSet" - }, - { - "$ref": "#/definitions/Microsoft.RegexRecognizer" - }, { "$ref": "#/definitions/Microsoft.AgeEntityRecognizer" }, @@ -3933,6 +3909,9 @@ { "$ref": "#/definitions/Microsoft.ConfirmationEntityRecognizer" }, + { + "$ref": "#/definitions/Microsoft.CrossTrainedRecognizerSet" + }, { "$ref": "#/definitions/Microsoft.CurrencyEntityRecognizer" }, @@ -3954,15 +3933,24 @@ { "$ref": "#/definitions/Microsoft.IpEntityRecognizer" }, + { + "$ref": "#/definitions/Microsoft.LuisRecognizer" + }, { "$ref": "#/definitions/Microsoft.MentionEntityRecognizer" }, + { + "$ref": "#/definitions/Microsoft.MultiLanguageRecognizer" + }, { "$ref": "#/definitions/Microsoft.NumberEntityRecognizer" }, { "$ref": "#/definitions/Microsoft.NumberRangeEntityRecognizer" }, + { + "$ref": "#/definitions/Microsoft.OrchestratorRecognizer" + }, { "$ref": "#/definitions/Microsoft.OrdinalEntityRecognizer" }, @@ -3972,14 +3960,26 @@ { "$ref": "#/definitions/Microsoft.PhoneNumberEntityRecognizer" }, + { + "$ref": "#/definitions/Microsoft.QnAMakerRecognizer" + }, + { + "$ref": "#/definitions/Microsoft.RecognizerSet" + }, { "$ref": "#/definitions/Microsoft.RegexEntityRecognizer" }, + { + "$ref": "#/definitions/Microsoft.RegexRecognizer" + }, { "$ref": "#/definitions/Microsoft.TemperatureEntityRecognizer" }, { "$ref": "#/definitions/Microsoft.UrlEntityRecognizer" + }, + { + "type": "string" } ] }, @@ -3989,10 +3989,10 @@ "$role": "interface", "oneOf": [ { - "type": "string" + "$ref": "#/definitions/Microsoft.TextTemplate" }, { - "$ref": "#/definitions/Microsoft.TextTemplate" + "type": "string" } ] }, @@ -4001,11 +4001,6 @@ "title": "Microsoft Triggers", "description": "Components which derive from OnCondition class.", "oneOf": [ - { - "type": "string", - "title": "Reference to Microsoft.ITrigger", - "description": "Reference to Microsoft.ITrigger .dialog file." - }, { "$ref": "#/definitions/Microsoft.OnActivity" }, @@ -4155,6 +4150,11 @@ }, { "$ref": "#/definitions/Teams.OnTeamUnarchived" + }, + { + "type": "string", + "title": "Reference to Microsoft.ITrigger", + "description": "Reference to Microsoft.ITrigger .dialog file." } ] }, @@ -4163,11 +4163,6 @@ "title": "Selectors", "description": "Components which derive from TriggerSelector class.", "oneOf": [ - { - "type": "string", - "title": "Reference to Microsoft.ITriggerSelector", - "description": "Reference to Microsoft.ITriggerSelector .dialog file." - }, { "$ref": "#/definitions/Microsoft.ConditionalSelector" }, @@ -4182,6 +4177,11 @@ }, { "$ref": "#/definitions/Microsoft.TrueSelector" + }, + { + "type": "string", + "title": "Reference to Microsoft.ITriggerSelector", + "description": "Reference to Microsoft.ITriggerSelector .dialog file." } ] }, @@ -8925,13 +8925,13 @@ "description": "Components which derive from HttpRequestMock class", "$role": "interface", "oneOf": [ + { + "$ref": "#/definitions/Microsoft.Test.HttpRequestSequenceMock" + }, { "type": "string", "title": "Reference to Microsoft.Test.IHttpRequestMock", "description": "Reference to Microsoft.Test.IHttpRequestMock .dialog file." - }, - { - "$ref": "#/definitions/Microsoft.Test.HttpRequestSequenceMock" } ] }, @@ -8945,11 +8945,6 @@ "description": "Components which derive from TestAction class", "$role": "interface", "oneOf": [ - { - "type": "string", - "title": "Reference to Microsoft.Test.ITestAction", - "description": "Reference to Microsoft.Test.ITestAction .dialog file." - }, { "$ref": "#/definitions/Microsoft.Test.AssertNoActivity" }, @@ -8985,6 +8980,11 @@ }, { "$ref": "#/definitions/Microsoft.Test.UserTyping" + }, + { + "type": "string", + "title": "Reference to Microsoft.Test.ITestAction", + "description": "Reference to Microsoft.Test.ITestAction .dialog file." } ] }, @@ -8993,13 +8993,13 @@ "description": "Components which derive from UserTokenMock class", "$role": "interface", "oneOf": [ + { + "$ref": "#/definitions/Microsoft.Test.UserTokenBasicMock" + }, { "type": "string", "title": "Reference to Microsoft.Test.IUserTokenMock", "description": "Reference to Microsoft.Test.IUserTokenMock .dialog file." - }, - { - "$ref": "#/definitions/Microsoft.Test.UserTokenBasicMock" } ] },