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

Commit 918b55c

Browse files
authored
Added a gaggle of missing joins in unit tests (#1099)
* Added a gaggle of missing joins in unit tests * Corrected some CompletableFuture exceptional returns in unit tests * More missing joins in unit tests.
1 parent 382f657 commit 918b55c

File tree

18 files changed

+63
-57
lines changed

18 files changed

+63
-57
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For more information jump to a section below.
1818

1919
| Branch | Description | Build Status | Coverage Status |
2020
|--------|-------------|--------------|-----------------|
21-
|Main | Preview 8 Builds | [![Build Status](https://travis-ci.org/Microsoft/botbuilder-java.svg?branch=main)](https://travis-ci.org/Microsoft/botbuilder-java) | [![Coverage Status](https://coveralls.io/repos/github/microsoft/botbuilder-java/badge.svg?branch=823847c676b7dbb0fa348a308297ae375f5141ef)](https://coveralls.io/github/microsoft/botbuilder-java?branch=823847c676b7dbb0fa348a308297ae375f5141ef) |
21+
|Main | Preview 8 Builds | [![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Java/BotBuilder-Java-4.0-daily?branchName=main)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=1202&branchName=main) | [![Coverage Status](https://coveralls.io/repos/github/microsoft/botbuilder-java/badge.svg?branch=823847c676b7dbb0fa348a308297ae375f5141ef)](https://coveralls.io/github/microsoft/botbuilder-java?branch=823847c676b7dbb0fa348a308297ae375f5141ef) |
2222

2323
## Getting Started
2424
To get started building bots using the SDK, see the [Azure Bot Service Documentation](https://docs.microsoft.com/en-us/azure/bot-service/?view=azure-bot-service-4.0).

libraries/bot-azure/src/test/java/com/microsoft/bot/azure/AzureQueueTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.microsoft.bot.builder.UserState;
1515
import com.microsoft.bot.builder.adapters.TestAdapter;
1616
import com.microsoft.bot.builder.adapters.TestFlow;
17+
import com.microsoft.bot.connector.Async;
1718
import com.microsoft.bot.dialogs.Dialog;
1819
import com.microsoft.bot.dialogs.DialogContext;
1920
import com.microsoft.bot.dialogs.DialogManager;
@@ -167,13 +168,13 @@ public CompletableFuture<DialogTurnResult> beginDialog(DialogContext dc, Object
167168
try {
168169
date = LocalDateTime.parse(dateString);
169170
} catch (DateTimeParseException ex) {
170-
throw new IllegalArgumentException("Date is invalid");
171+
return Async.completeExceptionally(new IllegalArgumentException("Date is invalid"));
171172
}
172173

173174
ZonedDateTime zonedDate = date.atZone(ZoneOffset.UTC);
174175
ZonedDateTime now = LocalDateTime.now().atZone(ZoneOffset.UTC);
175176
if (zonedDate.isBefore(now)) {
176-
throw new IllegalArgumentException("Date must be in the future");
177+
return Async.completeExceptionally(new IllegalArgumentException("Date must be in the future"));
177178
}
178179

179180
// create ContinuationActivity from the conversation reference.
@@ -185,7 +186,7 @@ public CompletableFuture<DialogTurnResult> beginDialog(DialogContext dc, Object
185186

186187
QueueStorage queueStorage = dc.getContext().getTurnState().get("QueueStorage");
187188
if (queueStorage == null) {
188-
throw new NullPointerException("Unable to locate QueueStorage in HostContext");
189+
return Async.completeExceptionally(new NullPointerException("Unable to locate QueueStorage in HostContext"));
189190
}
190191
return queueStorage.queueActivity(activity, visibility, ttl).thenCompose(receipt -> {
191192
// return the receipt as the result

libraries/bot-azure/src/test/java/com/microsoft/bot/azure/TranscriptStoreTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.microsoft.bot.builder.TranscriptStore;
1515
import com.microsoft.bot.builder.adapters.TestAdapter;
1616
import com.microsoft.bot.builder.adapters.TestFlow;
17+
import com.microsoft.bot.connector.Async;
1718
import com.microsoft.bot.schema.Activity;
1819
import com.microsoft.bot.schema.ActivityTypes;
1920
import com.microsoft.bot.schema.ChannelAccount;
@@ -536,7 +537,7 @@ private CompletableFuture<PagedResult<Activity>> getPagedResult(ConversationRefe
536537
}
537538

538539
if(pagedResult == null) {
539-
throw new TimeoutException("Unable to retrieve pagedResult in time");
540+
return Async.completeExceptionally(new TimeoutException("Unable to retrieve pagedResult in time"));
540541
}
541542

542543
return CompletableFuture.completedFuture(pagedResult);

libraries/bot-builder/src/test/java/com/microsoft/bot/builder/ActivityHandlerTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
package com.microsoft.bot.builder;
55

6+
import com.microsoft.bot.connector.Async;
67
import com.microsoft.bot.schema.*;
78
import org.junit.Assert;
89
import org.junit.Test;
@@ -467,23 +468,23 @@ public CompletableFuture<ResourceResponse[]> sendActivities(
467468
TurnContext context,
468469
List<Activity> activities
469470
) {
470-
throw new RuntimeException();
471+
return Async.completeExceptionally(new RuntimeException());
471472
}
472473

473474
@Override
474475
public CompletableFuture<ResourceResponse> updateActivity(
475476
TurnContext context,
476477
Activity activity
477478
) {
478-
throw new RuntimeException();
479+
return Async.completeExceptionally(new RuntimeException());
479480
}
480481

481482
@Override
482483
public CompletableFuture<Void> deleteActivity(
483484
TurnContext context,
484485
ConversationReference reference
485486
) {
486-
throw new RuntimeException();
487+
return Async.completeExceptionally(new RuntimeException());
487488
}
488489
}
489490

libraries/bot-builder/src/test/java/com/microsoft/bot/builder/BotStateTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public CompletableFuture<Void> delete(String[] keys) {
7373
Assert.assertEquals(1, readCount[0]);
7474
Assert.assertEquals(0, storeCount[0]);
7575

76-
propertyA.set(context, "there");
76+
propertyA.set(context, "there").join();
7777
Assert.assertEquals(0, storeCount[0]); // Set on property should not bump
7878

7979
userState.saveChanges(context).join();

libraries/bot-builder/src/test/java/com/microsoft/bot/builder/MessageFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ public void ValidateIMBackWithNoTest() {
545545
null
546546
);
547547

548-
turnContext.sendActivity(activity);
548+
turnContext.sendActivity(activity).join();
549549
}
550550
return CompletableFuture.completedFuture(null);
551551
};

libraries/bot-builder/src/test/java/com/microsoft/bot/builder/OnTurnErrorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void OnTurnError_Test() {
2929

3030
new TestFlow(adapter, (turnContext -> {
3131
if (StringUtils.equals(turnContext.getActivity().getText(), "foo")) {
32-
turnContext.sendActivity(turnContext.getActivity().getText());
32+
turnContext.sendActivity(turnContext.getActivity().getText()).join();
3333
}
3434

3535
if (

libraries/bot-builder/src/test/java/com/microsoft/bot/builder/SkillConversationIdFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void SkillConversationIdFactoryHappyPath() {
5151
skillConversationIdFactory.getSkillConversationReference(skillConversationId).join();
5252

5353
// Delete
54-
skillConversationIdFactory.deleteConversationReference(skillConversationId);
54+
skillConversationIdFactory.deleteConversationReference(skillConversationId).join();
5555

5656
// Retrieve again
5757
SkillConversationReference deletedConversationReference =

libraries/bot-builder/src/test/java/com/microsoft/bot/builder/TestAdapterTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.microsoft.bot.builder.adapters.TestAdapter;
77
import com.microsoft.bot.builder.adapters.TestFlow;
8+
import com.microsoft.bot.connector.Async;
89
import com.microsoft.bot.schema.ActionTypes;
910
import com.microsoft.bot.schema.Activity;
1011
import com.microsoft.bot.schema.ActivityTypes;
@@ -71,7 +72,7 @@ public void TestAdapter_ExceptionInBotOnReceive() {
7172
try {
7273

7374
new TestFlow(adapter, turnContext -> {
74-
throw new RuntimeException(uniqueExceptionId);
75+
return Async.completeExceptionally(new RuntimeException(uniqueExceptionId));
7576
}).test("foo", activity -> {
7677
Assert.assertNull(activity);
7778
}).startTest().join();

libraries/bot-builder/src/test/java/com/microsoft/bot/builder/TurnContextTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.microsoft.bot.builder.adapters.TestAdapter;
77
import com.microsoft.bot.builder.adapters.TestFlow;
8+
import com.microsoft.bot.connector.Async;
89
import com.microsoft.bot.connector.Attachments;
910
import com.microsoft.bot.connector.ConnectorClient;
1011
import com.microsoft.bot.connector.Conversations;
@@ -63,7 +64,7 @@ public void CacheValueUsingSetAndGet() {
6364

6465
case "TestResponded":
6566
if (turnContext.getResponded()) {
66-
throw new RuntimeException("Responded is true");
67+
return Async.completeExceptionally(new RuntimeException("Responded is true"));
6768
}
6869

6970
return turnContext.sendActivity(
@@ -419,7 +420,7 @@ public void DeleteOneActivityToAdapter() {
419420

420421
TurnContext c = new TurnContextImpl(a, TestMessage.Message());
421422

422-
c.deleteActivity("12345");
423+
c.deleteActivity("12345").join();
423424
Assert.assertTrue(activityDeleted[0]);
424425
}
425426

@@ -440,7 +441,7 @@ public void DeleteConversationReferenceToAdapter() {
440441
}
441442
};
442443

443-
c.deleteActivity(reference);
444+
c.deleteActivity(reference).join();
444445
Assert.assertTrue(activityDeleted[0]);
445446
}
446447

0 commit comments

Comments
 (0)