Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit e5164bf

Browse files
LeeParrishMSFTLeeParrishMSFT
authored
Added missing skills tests, fixed locale issues (#1054)
1 parent 2d4ef62 commit e5164bf

6 files changed

Lines changed: 167 additions & 128 deletions

File tree

‎libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,6 +1499,7 @@ public CompletableFuture<String> getOAuthSignInLink(TurnContext context, AppCred
14991499
setBot(activity.getRecipient());
15001500
setChannelId(activity.getChannelId());
15011501
setConversation(activity.getConversation());
1502+
setLocale(activity.getLocale());
15021503
setServiceUrl(activity.getServiceUrl());
15031504
setUser(activity.getFrom());
15041505
}

‎libraries/bot-builder/src/test/java/com/microsoft/bot/builder/adapters/TestAdapter.java‎

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class TestAdapter extends BotAdapter implements UserTokenProvider {
2323
private final Queue<Activity> botReplies = new LinkedList<>();
2424
private int nextId = 0;
2525
private ConversationReference conversationReference;
26-
private String locale;
26+
private String locale = "en-us";
2727
private boolean sendTraceActivity = false;
2828
private Map<ExchangableTokenKey, String> exchangableToken = new HashMap<ExchangableTokenKey, String>();
2929

@@ -93,64 +93,62 @@ public TestAdapter(String channelId) {
9393

9494
public TestAdapter(String channelId, boolean sendTraceActivity) {
9595
this.sendTraceActivity = sendTraceActivity;
96-
setConversationReference(new ConversationReference() {
96+
97+
ConversationReference conversationReference = new ConversationReference();
98+
conversationReference.setChannelId(channelId);
99+
conversationReference.setServiceUrl("https://test.com");
100+
conversationReference.setUser(new ChannelAccount() {
97101
{
98-
setChannelId(channelId);
99-
setServiceUrl("https://test.com");
100-
setUser(new ChannelAccount() {
101-
{
102-
setId("user1");
103-
setName("User1");
104-
}
105-
});
106-
setBot(new ChannelAccount() {
107-
{
108-
setId("bot");
109-
setName("Bot");
110-
}
111-
});
112-
setConversation(new ConversationAccount() {
113-
{
114-
setIsGroup(false);
115-
setConversationType("convo1");
116-
setId("Conversation1");
117-
}
118-
});
119-
setLocale(this.getLocale());
102+
setId("user1");
103+
setName("User1");
104+
}
105+
});
106+
conversationReference.setBot(new ChannelAccount() {
107+
{
108+
setId("bot");
109+
setName("Bot");
110+
}
111+
});
112+
conversationReference.setConversation(new ConversationAccount() {
113+
{
114+
setIsGroup(false);
115+
setConversationType("convo1");
116+
setId("Conversation1");
120117
}
121118
});
119+
conversationReference.setLocale(this.getLocale());
120+
121+
setConversationReference(conversationReference);
122122
}
123123

124124
public TestAdapter(ConversationReference reference) {
125125
if (reference != null) {
126126
setConversationReference(reference);
127127
} else {
128-
setConversationReference(new ConversationReference() {
128+
ConversationReference conversationReference = new ConversationReference();
129+
conversationReference.setChannelId(Channels.TEST);
130+
conversationReference.setServiceUrl("https://test.com");
131+
conversationReference.setUser(new ChannelAccount() {
129132
{
130-
setChannelId(Channels.TEST);
131-
setServiceUrl("https://test.com");
132-
setUser(new ChannelAccount() {
133-
{
134-
setId("user1");
135-
setName("User1");
136-
}
137-
});
138-
setBot(new ChannelAccount() {
139-
{
140-
setId("bot");
141-
setName("Bot");
142-
}
143-
});
144-
setConversation(new ConversationAccount() {
145-
{
146-
setIsGroup(false);
147-
setConversationType("convo1");
148-
setId("Conversation1");
149-
}
150-
});
151-
setLocale(this.getLocale());
133+
setId("user1");
134+
setName("User1");
135+
}
136+
});
137+
conversationReference.setBot(new ChannelAccount() {
138+
{
139+
setId("bot");
140+
setName("Bot");
141+
}
142+
});
143+
conversationReference.setConversation(new ConversationAccount() {
144+
{
145+
setIsGroup(false);
146+
setConversationType("convo1");
147+
setId("Conversation1");
152148
}
153149
});
150+
conversationReference.setLocale(this.getLocale());
151+
setConversationReference(conversationReference);
154152
}
155153
}
156154

@@ -359,6 +357,7 @@ public Activity makeActivity(String withText) {
359357
setText(withText);
360358
}
361359
};
360+
activity.setLocale(getLocale() != null ? getLocale() : "en-us");
362361

363362
return activity;
364363
}

‎libraries/bot-dialogs/src/main/java/com/microsoft/bot/dialogs/Dialog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ && sendEoCToParent(turnContext)) {
359359
: EndOfConversationCodes.USER_CANCELLED;
360360
Activity activity = new Activity(ActivityTypes.END_OF_CONVERSATION);
361361
activity.setValue(result.getResult());
362-
activity.setLocalTimeZone(turnContext.getActivity().getLocale());
362+
activity.setLocale(turnContext.getActivity().getLocale());
363363
activity.setCode(code);
364364
return turnContext.sendActivity(activity).thenApply(finalResult -> null);
365365
}

‎libraries/bot-dialogs/src/main/java/com/microsoft/bot/dialogs/prompts/ConfirmPrompt.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
public class ConfirmPrompt extends Prompt<Boolean> {
3333

3434
/**
35-
* A dictionary of Default Choices based on {@link GetSupportedCultures} . Can
35+
* A map of Default Choices based on {@link GetSupportedCultures} . Can
3636
* be replaced by user using the constructor that contains choiceDefaults.
3737
*/
3838
private Map<String, Triplet<Choice, Choice, ChoiceFactoryOptions>> choiceDefaults;

0 commit comments

Comments
 (0)