[PORT]Make language policy in MultiLanguageRecognizer align with the policy in UseLanguagePolicy

libraries/botbuilder-dialogs-adaptive-testing/src/testRunner.ts

@@ -6,7 +6,7 @@
  * Licensed under the MIT License.
  */
 import { TestAdapter } from 'botbuilder-core';
-import { AdaptiveDialogComponentRegistration } from 'botbuilder-dialogs-adaptive';
+import { AdaptiveDialogComponentRegistration, LanguagePolicy } from 'botbuilder-dialogs-adaptive';
 import { ResourceExplorer } from 'botbuilder-dialogs-declarative';
 import { AdaptiveDialogTestComponentRegistration } from './adaptiveDialogTestComponentRegistration';
 import { TestScript } from './testScript';
@@ -36,10 +36,10 @@ export class TestRunner {
      * @param testName Test name.
      * @returns A Promise that represents the work queued to execute.
      */
-    public async runTestScript(testName: string): Promise<any> {
+    public async runTestScript(testName: string, languagePolicy?: LanguagePolicy): Promise<any> {
         const script = this.resourceExplorer.loadType(`${testName}.test.dialog`) as TestScript;
         script.description = script.description || testName;
         this.testAdapter.activeQueue.splice(0, this.testAdapter.activeQueue.length);
-        await script.execute(this.resourceExplorer, testName, this.testAdapter);
+        await script.execute(this.resourceExplorer, testName, this.testAdapter, languagePolicy);
     }
 }

libraries/botbuilder-dialogs-adaptive-testing/src/testScript.ts

@@ -8,7 +8,7 @@
 
 import { MemoryStorage, UserState, ConversationState, TestAdapter } from 'botbuilder-core';
 import { DialogManager } from 'botbuilder-dialogs';
-import { DialogExpression, LanguageGeneratorExtensions, ResourceExtensions } from 'botbuilder-dialogs-adaptive';
+import { DialogExpression, LanguageGeneratorExtensions, LanguagePolicy, ResourceExtensions } from 'botbuilder-dialogs-adaptive';
 import { ResourceExplorer } from 'botbuilder-dialogs-declarative';
 import { TestAction } from './testAction';
 import { UserTokenMock } from './userTokenMocks';
@@ -51,11 +51,13 @@ export class TestScript {
      * Starts the execution of the test sequence.
      * @param testName Name of the test
      * @param testAdapter (Optional) Test adapter
+     * @param languagePolicy (Optional) Language policy.
      */
     public async execute(
         resourceExplorer: ResourceExplorer,
         testName?: string,
-        testAdapter?: TestAdapter
+        testAdapter?: TestAdapter,
+        languagePolicy?: LanguagePolicy
     ): Promise<void> {
         if (!testAdapter) {
             testAdapter = new TestAdapter(TestAdapter.createConversation(testName));
@@ -70,6 +72,10 @@ export class TestScript {
         ResourceExtensions.useResourceExplorer(bot, resourceExplorer);
         LanguageGeneratorExtensions.useLanguageGeneration(bot);
 
+        if (languagePolicy) {
+            LanguageGeneratorExtensions.useLanguagePolicy(bot, languagePolicy);
+        }
+
         this.userTokenMocks.forEach((userTokenMock) => {
             userTokenMock.setup(testAdapter);
         });

libraries/botbuilder-dialogs-adaptive-testing/tests/multiLanguageRecognizer.test.js

@@ -1,3 +1,4 @@
+const { LanguagePolicy } = require('botbuilder-dialogs-adaptive');
 const path = require('path');
 const { TestRunner } = require('../lib');
 
@@ -24,4 +25,9 @@ describe('MultiLanguageRecognizerTests', function() {
     it('EnUsFallback_AcitivtyLocaleCasing', async () => {
         await testRunner.runTestScript('MultiLanguageRecognizerTest_EnUsFallback_ActivityLocaleCasing');
     });
+
+    it('LanguagePolicy', async () => {
+        const languagePolicy = new LanguagePolicy('en-gb');
+        await testRunner.runTestScript('MultiLanguageRecognizerTest_LanguagePolicy', languagePolicy);
+    });
 });

libraries/botbuilder-dialogs-adaptive-testing/tests/resources/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_LanguagePolicy.test.dialog

@@ -0,0 +1,123 @@
+{
+    "$schema": "../../../../schemas/sdk.schema",
+    "$kind": "Microsoft.Test.Script",
+    "dialog": {
+        "$kind": "Microsoft.AdaptiveDialog",
+        "recognizer": {
+            "$kind": "Microsoft.MultiLanguageRecognizer",
+            "recognizers": {
+                "en-us": {
+                    "$kind": "Microsoft.RegexRecognizer",
+                    "intents": [
+                        {
+                            "intent": "Greeting",
+                            "pattern": "(?i)howdy"
+                        },
+                        {
+                            "intent": "Goodbye",
+                            "pattern": "(?i)bye"
+                        }
+                    ]
+                },
+                "en-gb": {
+                    "$kind": "Microsoft.RegexRecognizer",
+                    "intents": [
+                        {
+                            "intent": "Greeting",
+                            "pattern": "(?i)hiya"
+                        },
+                        {
+                            "intent": "Goodbye",
+                            "pattern": "(?i)cheerio"
+                        }
+                    ]
+                },
+                "en": {
+                    "$kind": "Microsoft.RegexRecognizer",
+                    "intents": [
+                        {
+                            "intent": "Greeting",
+                            "pattern": "(?i)hello"
+                        },
+                        {
+                            "intent": "Goodbye",
+                            "pattern": "(?i)goodbye"
+                        }
+                    ]
+                },
+                "": {
+                    "$kind": "Microsoft.RegexRecognizer",
+                    "intents": [
+                        {
+                            "intent": "Greeting",
+                            "pattern": "(?i)salve"
+                        },
+                        {
+                            "intent": "Goodbye",
+                            "pattern": "(?i)vale dicere"
+                        }
+                    ]
+                }
+            }
+        },
+        "triggers": [
+            {
+                "$kind": "Microsoft.OnIntent",
+                "intent": "Greeting",
+                "actions": [
+                    {
+                        "$kind": "Microsoft.SendActivity",
+                        "activity": "greeting intent"
+                    }
+                ]
+            },
+            {
+                "$kind": "Microsoft.OnIntent",
+                "intent": "Goodbye",
+                "actions": [
+                    {
+                        "$kind": "Microsoft.SendActivity",
+                        "activity": "goodbye intent"
+                    }
+                ]
+            },
+            {
+                "$kind": "Microsoft.OnUnknownIntent",
+                "actions": [
+                    {
+                        "$kind": "Microsoft.SendActivity",
+                        "activity": "default rule"
+                    }
+                ]
+            }
+        ],
+        "defaultResultProperty": "dialog.result"
+    },
+    "locale": "",
+    "script": [
+        {
+            "$kind": "Microsoft.Test.UserSays",
+            "text": "hiya"
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "greeting intent"
+        },
+        {
+            "$kind": "Microsoft.Test.UserSays",
+            "text": "howdy"
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "default rule"
+        },
+        {
+            "$kind": "Microsoft.Test.UserSays",
+            "text": "cheerio"
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "goodbye intent"
+        }
+    ]
+}

libraries/botbuilder-dialogs-adaptive/src/recognizers/multiLanguageRecognizer.ts

@@ -10,9 +10,10 @@ import { RecognizerResult, Activity } from 'botbuilder-core';
 import { DialogContext } from 'botbuilder-dialogs';
 import { Recognizer } from './recognizer';
 import { LanguagePolicy } from '../languagePolicy';
+import { languagePolicyKey } from '../languageGeneratorExtensions';
 
 export class MultiLanguageRecognizer extends Recognizer {
-    public languagePolicy: LanguagePolicy = new LanguagePolicy();
+    public languagePolicy: LanguagePolicy;
 
     public recognizers: { [locale: string]: Recognizer };
 
@@ -22,15 +23,23 @@ export class MultiLanguageRecognizer extends Recognizer {
         telemetryProperties?: { [key: string]: string },
         telemetryMetrics?: { [key: string]: number }
     ): Promise<RecognizerResult> {
+        let languagepolicy = this.languagePolicy;
+        if (!languagepolicy) {
+            languagepolicy = dialogContext.services.get(languagePolicyKey);
+            if (!languagepolicy) {
+                languagepolicy = new LanguagePolicy();
+            }
+        }
+
         const locale = activity.locale || '';
         const policy: string[] = [];
-        if (this.languagePolicy.has(locale)) {
-            this.languagePolicy.get(locale).forEach((u: string): number => policy.push(u));
+        if (languagepolicy.has(locale)) {
+            languagepolicy.get(locale).forEach((u: string): number => policy.push(u));
         }
 
-        if (locale !== '' && this.languagePolicy.has('')) {
+        if (locale !== '' && languagepolicy.has('')) {
             // we now explictly add defaultPolicy instead of coding that into target's policy
-            this.languagePolicy.get('').forEach((u: string): number => policy.push(u));
+            languagepolicy.get('').forEach((u: string): number => policy.push(u));
         }
 
         for (let i = 0; i < policy.length; i++) {