Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-01 08:39:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add channel type checking to MinecraftToDiscordChatMessageTest

Browse Source
This commit is contained in:
Vankka 2023-10-29 22:43:17 +02:00
parent 9195a91eb3
commit ad769cb251
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/src/test/java/com/discordsrv/common/messageforwarding/game/MinecraftToDiscordChatMessageTest.java
View File

@ -1,5 +1,8 @@
package com.discordsrv.common.messageforwarding.game; package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.event.bus.EventBus; import com.discordsrv.api.event.bus.EventBus;
import com.discordsrv.api.event.bus.Subscribe; import com.discordsrv.api.event.bus.Subscribe;
@ -35,7 +38,7 @@ public class MinecraftToDiscordChatMessageTest {
EventBus bus = discordSRV.eventBus(); EventBus bus = discordSRV.eventBus();
String testMessage = UUID.randomUUID().toString(); String testMessage = UUID.randomUUID().toString();
CompletableFuture<Integer> future = new CompletableFuture<>(); CompletableFuture<Boolean> future = new CompletableFuture<>();
Listener listener = new Listener(testMessage, future); Listener listener = new Listener(testMessage, future);
bus.subscribe(listener); bus.subscribe(listener);
@ -87,13 +90,13 @@ public class MinecraftToDiscordChatMessageTest {
)); ));
try { try {
Integer amount = future.get(40, TimeUnit.SECONDS); Boolean success = future.get(40, TimeUnit.SECONDS);
if (amount == null) { if (success == null) {
Assertions.fail("Null amount returned by listener"); Assertions.fail("Null amount returned by listener");
return; return;
} }
Assertions.assertEquals(2, amount, "Amount of messages received from listener"); Assertions.assertTrue(success, "Correct amount of messages received in the right channel types from listener");
} catch (ExecutionException e) { } catch (ExecutionException e) {
Assertions.fail(e.getCause()); Assertions.fail(e.getCause());
} catch (TimeoutException e) { } catch (TimeoutException e) {
@ -107,23 +110,30 @@ public class MinecraftToDiscordChatMessageTest {
public static class Listener { public static class Listener {
private final String lookFor; private final String lookFor;
private final CompletableFuture<Integer> success; private final CompletableFuture<Boolean> success;
public Listener(String lookFor, CompletableFuture<Integer> success) { public Listener(String lookFor, CompletableFuture<Boolean> success) {
this.lookFor = lookFor; this.lookFor = lookFor;
this.success = success; this.success = success;
} }
@Subscribe @Subscribe
public void onForwarded(GameChatMessageForwardedEvent event) { public void onForwarded(GameChatMessageForwardedEvent event) {
int count = 0; int text = 0;
int thread = 0;
for (ReceivedDiscordMessage message : event.getDiscordMessage().getMessages()) { for (ReceivedDiscordMessage message : event.getDiscordMessage().getMessages()) {
String content = message.getContent(); String content = message.getContent();
if (content != null && content.contains(lookFor)) { if (content != null && content.contains(lookFor)) {
count++; DiscordMessageChannel channel = message.getChannel();
if (channel instanceof DiscordTextChannel) {
text++;
} else if (channel instanceof DiscordThreadChannel) {
thread++;
} }
} }
success.complete(count); }
success.complete(text == 1 && thread == 1);
} }
} }
} }