Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Updated Dialog Manager to work with skills #2343

Merged
merged 14 commits into from
Jul 9, 2020
Merged

Updated Dialog Manager to work with skills #2343

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
15405e9
updated dialog manager to support skills
chon219 Jun 14, 2020
b35f906
reordered properties of dialog manager
chon219 Jun 14, 2020
dabb2a6
make dialog manager's dialogs property public
chon219 Jun 14, 2020
d358689
added tests for dialog manager
chon219 Jun 14, 2020
1cb8e18
code style change
chon219 Jun 18, 2020
5ea5fd4
added test to get/set root dialog of dialog manager
chon219 Jun 18, 2020
c3dcb19
move sendStateSnapshotTrace() to dialog manager
chon219 Jun 19, 2020
9b264f9
added test for state trace in dialog manager
chon219 Jul 2, 2020
5a8c310
added skill extensions to inject skill client and conversation id fac…
chon219 Jul 2, 2020
02763b3
updated test of beginSkill to use extensions
chon219 Jul 2, 2020
1b3abca
use static functions instead of extensions
chon219 Jul 7, 2020
26088e9
Merge branch 'master' into zim/dialog-manager
chon219 Jul 7, 2020
a7cdb3f
Merge branch 'master' into zim/dialog-manager
chon219 Jul 8, 2020
426da58
Merge branch 'master' into zim/dialog-manager
stevengum Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 50 additions & 5 deletions libraries/botbuilder-dialogs/tests/dialogManager.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const SKILL_BOT_ID = '00000000-0000-0000-0000-00000000000SKILL';
let _eocSent;
let _dmTurnResult;

function createTestFlow(dialog, testCase = FlowTestCase.RootBotOnly) {
function createTestFlow(dialog, testCase = FlowTestCase.RootBotOnly, enabledTrace = false) {
const conversationId = 'testFlowConversationId';
const storage = new MemoryStorage();
const convoState = new ConversationState(storage);
Expand All @@ -68,7 +68,8 @@ function createTestFlow(dialog, testCase = FlowTestCase.RootBotOnly) {
conversation: {
isGroup: false,
conversationType: conversationId,
id: conversationId },
id: conversationId
},
};

const dm = new DialogManager(dialog);
Expand All @@ -81,7 +82,7 @@ function createTestFlow(dialog, testCase = FlowTestCase.RootBotOnly) {
const claimsIdentity = new ClaimsIdentity();
claimsIdentity.addClaim({ type: 'ver', value: '2.0' }); // AuthenticationConstants.VersionClaim
claimsIdentity.addClaim({ type: 'aud', value: SKILL_BOT_ID }); // AuthenticationConstants.AudienceClaim
claimsIdentity.addClaim({ type: 'azp', value: PARENT_BOT_ID }); // AuthenticationConstants.AuthorizedParty
claimsIdentity.addClaim({ type: 'azp', value: PARENT_BOT_ID }); // AuthenticationConstants.AuthorizedParty
context.turnState.set(context.adapter.BotIdentityKey, claimsIdentity);

if (testCase === FlowTestCase.RootBotConsumingSkill) {
Expand Down Expand Up @@ -109,7 +110,7 @@ function createTestFlow(dialog, testCase = FlowTestCase.RootBotOnly) {
});

_dmTurnResult = await dm.onTurn(context);
}, convRef);
}, convRef, enabledTrace);
adapter.use(new AutoSaveStateMiddleware(userState, convoState));

return adapter;
Expand Down Expand Up @@ -170,7 +171,7 @@ describe('DialogManager', function() {
.assertReply('Hello SomeName, nice to meet you!')
.startTest();
strictEqual(_dmTurnResult.turnResult.status, DialogTurnStatus.complete);

strictEqual(dialog.endReason, DialogReason.endCalled);
if (shouldSendEoc) {
ok(_eocSent, 'Skills should send EndConversation to channel');
Expand Down Expand Up @@ -227,6 +228,50 @@ describe('DialogManager', function() {
strictEqual(_dmTurnResult.turnResult.status, DialogTurnStatus.empty);
});

it('Trace skill state', async () => {
stevengum marked this conversation as resolved.
Show resolved Hide resolved
const dialog = new SimpleComponentDialog();
const testFlow = createTestFlow(dialog, FlowTestCase.LeafSkill, true);
await testFlow.send('Hi')
.assertReply(reply => {
strictEqual(reply.type, ActivityTypes.Trace);
})
.assertReply('Hello, what is your name?')
.assertReply(reply => {
strictEqual(reply.type, ActivityTypes.Trace);
strictEqual(reply.label, 'Skill State');
})
.send('SomeName')
.assertReply('Hello SomeName, nice to meet you!')
.assertReply(reply => {
strictEqual(reply.type, ActivityTypes.Trace);
strictEqual(reply.label, 'Skill State');
})
.assertReply(reply => {
strictEqual(reply.type, ActivityTypes.Trace);
})
.startTest();
strictEqual(_dmTurnResult.turnResult.status, DialogTurnStatus.complete);
});

it('Trace bot state', async () => {
const dialog = new SimpleComponentDialog();
const testFlow = createTestFlow(dialog, FlowTestCase.RootBotOnly, true);
await testFlow.send('Hi')
.assertReply('Hello, what is your name?')
.assertReply(reply => {
strictEqual(reply.type, ActivityTypes.Trace);
strictEqual(reply.label, 'Bot State');
})
.send('SomeName')
.assertReply('Hello SomeName, nice to meet you!')
.assertReply(reply => {
strictEqual(reply.type, ActivityTypes.Trace);
strictEqual(reply.label, 'Bot State');
})
.startTest();
strictEqual(_dmTurnResult.turnResult.status, DialogTurnStatus.complete);
});

it('Gets or sets root dialog', () => {
const dm = new DialogManager();
const rootDialog = new SimpleComponentDialog();
Expand Down