From f81602f5db259d33ff32974dd07983317f8fae8f Mon Sep 17 00:00:00 2001 From: Tueem Date: Mon, 17 Feb 2025 23:59:08 +0100 Subject: [PATCH] restructure and add discord4j test stub --- .../test/discord4j/AutoCompleteTest.java | 23 ++++ .../marinara/test/discord4j/ButtonTest.java | 27 ++++ .../test/discord4j/InteractionCheckTest.java | 47 +++++++ .../test/discord4j/SlashCommandTest.java | 53 +++++++ .../test/discord4j/TestAutocomplete.java | 23 ++++ .../marinara/test/discord4j/TestButton.java | 42 ++++++ .../test/discord4j/TestChoiceEnum.java | 20 +++ .../marinara/test/discord4j/TestCommand.java | 32 +++++ .../test/discord4j/TestInteractionCheck.java | 37 +++++ .../mocks/AutocompleteInteractionMock.java | 17 +++ .../mocks/ButtonInteractionMock.java | 25 ++++ .../test/discord4j/mocks/ChannelMock.java | 130 ++++++++++++++++++ .../test/discord4j/mocks/InteractionMock.java | 41 ++++++ .../mocks/SlashCommandInteractionMock.java | 16 +++ .../SlashCommandInteractionOptionMock.java | 25 ++++ .../test/discord4j/mocks/UserMock.java | 11 ++ .../test/{ => javacord}/AutoCompleteTest.java | 6 +- .../test/{ => javacord}/ButtonTest.java | 6 +- .../{ => javacord}/InteractionCheckTest.java | 8 +- .../test/{ => javacord}/SlashCommandTest.java | 4 +- .../test/{ => javacord}/TestAutocomplete.java | 2 +- .../test/{ => javacord}/TestButton.java | 4 +- .../test/{ => javacord}/TestChoiceEnum.java | 2 +- .../test/{ => javacord}/TestCommand.java | 2 +- .../{ => javacord}/TestInteractionCheck.java | 2 +- .../mocks/AutocompleteInteractionMock.java | 2 +- .../mocks/ButtonInteractionMock.java | 2 +- .../{ => javacord}/mocks/ChannelMock.java | 2 +- .../{ => javacord}/mocks/DiscordApiMock.java | 2 +- .../{ => javacord}/mocks/MessageMock.java | 2 +- .../test/{ => javacord}/mocks/ServerMock.java | 2 +- .../mocks/SlashCommandInteractionMock.java | 2 +- .../SlashCommandInteractionOptionMock.java | 2 +- .../test/{ => javacord}/mocks/UserMock.java | 2 +- 34 files changed, 596 insertions(+), 27 deletions(-) create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/AutoCompleteTest.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/ButtonTest.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/InteractionCheckTest.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestAutocomplete.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestButton.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestCommand.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestInteractionCheck.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/AutocompleteInteractionMock.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ButtonInteractionMock.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ChannelMock.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/InteractionMock.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionMock.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionOptionMock.java create mode 100644 wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/UserMock.java rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/AutoCompleteTest.java (79%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/ButtonTest.java (81%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/InteractionCheckTest.java (87%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/SlashCommandTest.java (91%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/TestAutocomplete.java (93%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/TestButton.java (91%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/TestChoiceEnum.java (89%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/TestCommand.java (95%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/TestInteractionCheck.java (95%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/AutocompleteInteractionMock.java (99%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/ButtonInteractionMock.java (98%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/ChannelMock.java (99%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/DiscordApiMock.java (99%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/MessageMock.java (99%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/ServerMock.java (99%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/SlashCommandInteractionMock.java (98%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/SlashCommandInteractionOptionMock.java (97%) rename wrapper/javacord/src/test/java/net/tomatentum/marinara/test/{ => javacord}/mocks/UserMock.java (99%) diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/AutoCompleteTest.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/AutoCompleteTest.java new file mode 100644 index 0000000..40cc7b0 --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/AutoCompleteTest.java @@ -0,0 +1,23 @@ +package net.tomatentum.marinara.test.discord4j; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +import net.tomatentum.marinara.Marinara; +import net.tomatentum.marinara.test.discord4j.mocks.AutocompleteInteractionMock; +import net.tomatentum.marinara.test.discord4j.mocks.DiscordApiMock; +import net.tomatentum.marinara.wrapper.LibraryWrapper; +import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper; + +public class AutoCompleteTest { + + @Test + public void testAutocomplete() { + LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock()); //null okay as we don't use the discord API in this test. + Marinara marinara = Marinara.load(wrapper); + marinara.getRegistry().addInteractions(new TestAutocomplete()); + wrapper.handleInteraction(new AutocompleteInteractionMock()); + assertTrue(AutocompleteInteractionMock.didAutocompleteRun); + } +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/ButtonTest.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/ButtonTest.java new file mode 100644 index 0000000..c8b013f --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/ButtonTest.java @@ -0,0 +1,27 @@ +package net.tomatentum.marinara.test.discord4j; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.TestInstance.Lifecycle; + +import net.tomatentum.marinara.Marinara; +import net.tomatentum.marinara.test.discord4j.mocks.ButtonInteractionMock; +import net.tomatentum.marinara.test.discord4j.mocks.DiscordApiMock; +import net.tomatentum.marinara.wrapper.LibraryWrapper; +import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper; + +@TestInstance(Lifecycle.PER_CLASS) +public class ButtonTest { + + @Test + public void testButtonExecution() { + LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock()); //null okay as we don't use the discord API in this test. + Marinara marinara = Marinara.load(wrapper); + marinara.getRegistry().addInteractions(new TestButton()); + wrapper.handleInteraction(new ButtonInteractionMock("test")); + assertTrue(TestButton.didRun); + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/InteractionCheckTest.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/InteractionCheckTest.java new file mode 100644 index 0000000..027dc4a --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/InteractionCheckTest.java @@ -0,0 +1,47 @@ +package net.tomatentum.marinara.test.discord4j; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.javacord.api.entity.permission.PermissionType; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.TestInstance.Lifecycle; + +import net.tomatentum.marinara.Marinara; +import net.tomatentum.marinara.test.discord4j.mocks.ButtonInteractionMock; +import net.tomatentum.marinara.test.discord4j.mocks.DiscordApiMock; +import net.tomatentum.marinara.test.discord4j.mocks.ServerMock; +import net.tomatentum.marinara.wrapper.LibraryWrapper; +import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper; +import net.tomatentum.marinara.wrapper.javacord.checks.PermissionCheck; + +@TestInstance(Lifecycle.PER_CLASS) +public class InteractionCheckTest { + + @Test + public void testInteractionCheck() { + LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock()); + Marinara marinara = Marinara.load(wrapper); + marinara.getCheckRegistry().addCheck(new TestInteractionCheck()); + marinara.getRegistry().addInteractions(new TestButton()); + wrapper.handleInteraction(new ButtonInteractionMock("test")); + assertTrue(TestInteractionCheck.preExecuted); + assertTrue(TestInteractionCheck.postExecuted); + } + + @Test + public void testPermissionCheck() { + LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock()); + Marinara marinara = Marinara.load(wrapper); + marinara.getCheckRegistry().addCheck(new PermissionCheck()); + marinara.getRegistry().addInteractions(new TestButton()); + wrapper.handleInteraction(new ButtonInteractionMock("permissionCheck")); + assertTrue(TestButton.didPermRun); + TestButton.didPermRun = false; + ServerMock.TESTPERMISSION = PermissionType.ATTACH_FILE; + wrapper.handleInteraction(new ButtonInteractionMock("permissionCheck")); + assertFalse(TestButton.didPermRun); + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java new file mode 100644 index 0000000..6cc294a --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java @@ -0,0 +1,53 @@ +package net.tomatentum.marinara.test.discord4j; + +import org.javacord.api.DiscordApi; +import org.javacord.api.DiscordApiBuilder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.TestInstance.Lifecycle; + +import net.tomatentum.marinara.Marinara; +import net.tomatentum.marinara.test.discord4j.mocks.SlashCommandInteractionMock; +import net.tomatentum.marinara.wrapper.LibraryWrapper; +import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper; +@TestInstance(Lifecycle.PER_CLASS) +public class SlashCommandTest { + + String DISCORD_TOKEN = System.getenv("DISCORD_TEST_TOKEN"); + DiscordApi api; + + @BeforeAll + void setUp() { + api = new DiscordApiBuilder() + .setToken(DISCORD_TOKEN) + .login().join(); + } + + @AfterAll + void tearDown() { + api.disconnect(); + api = null; + } + + @Test + void testSlashCommand() { + Marinara marinara = Marinara.load(new JavacordWrapper(api)); + marinara.getRegistry().addInteractions(new TestCommand()); + marinara.getRegistry().registerCommands(); + System.out.println("Success!"); + } + + @Test + void testSlashCommandExecution() { + LibraryWrapper wrapper = new JavacordWrapper(api); + Marinara marinara = Marinara.load(wrapper); + marinara.getRegistry().addInteractions(new TestCommand()); + + wrapper.handleInteraction(new SlashCommandInteractionMock()); + } + + + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestAutocomplete.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestAutocomplete.java new file mode 100644 index 0000000..391d67d --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestAutocomplete.java @@ -0,0 +1,23 @@ +package net.tomatentum.marinara.test.discord4j; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Collections; + +import org.javacord.api.interaction.AutocompleteInteraction; + +import net.tomatentum.marinara.interaction.InteractionHandler; +import net.tomatentum.marinara.interaction.annotation.AutoComplete; +import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand; + +public class TestAutocomplete implements InteractionHandler { + + @SlashCommand(name = "test") + @AutoComplete + public void autocomplete(AutocompleteInteraction context, String value) { + System.out.println("Success!"); + assertEquals(value, "test"); + context.respondWithChoices(Collections.emptyList()); + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestButton.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestButton.java new file mode 100644 index 0000000..d991392 --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestButton.java @@ -0,0 +1,42 @@ +package net.tomatentum.marinara.test.discord4j; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.javacord.api.entity.channel.TextChannel; +import org.javacord.api.entity.message.Message; +import org.javacord.api.entity.permission.PermissionType; +import org.javacord.api.entity.server.Server; +import org.javacord.api.entity.user.User; +import org.javacord.api.interaction.ButtonInteraction; + +import net.tomatentum.marinara.interaction.InteractionHandler; +import net.tomatentum.marinara.interaction.annotation.Button; +import net.tomatentum.marinara.test.discord4j.TestInteractionCheck.TestCheck; +import net.tomatentum.marinara.wrapper.javacord.checks.PermissionCheck.HasPermission; + +public class TestButton implements InteractionHandler { + + + public static boolean didRun = false; + @Button("test") + @TestCheck + public void exec(ButtonInteraction interaction, TextChannel channel, Message message, User member, Server server) { + assertNotNull(interaction); + assertNotNull(channel); + assertNotNull(message); + assertNotNull(member); + assertNotNull(server); + didRun = true; + System.out.println("Success!"); + } + + public static boolean didPermRun = false; + + @Button("permissionCheck") + @HasPermission({PermissionType.ADMINISTRATOR}) + public void exec(ButtonInteraction interaction) { + didPermRun = true; + System.out.println("It worked!"); + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java new file mode 100644 index 0000000..66ab699 --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java @@ -0,0 +1,20 @@ +package net.tomatentum.marinara.test.discord4j; + +import net.tomatentum.marinara.interaction.commands.ChoiceValueProvider; + +public enum TestChoiceEnum implements ChoiceValueProvider { + TestValue("testValue"), + FooBar("fooBar"), + Spongebob("spongebob"); + + private String value; + + private TestChoiceEnum(String value) { + this.value = value; + } + @Override + public String getChoiceValue() { + return value; + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestCommand.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestCommand.java new file mode 100644 index 0000000..95c439f --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestCommand.java @@ -0,0 +1,32 @@ +package net.tomatentum.marinara.test.discord4j; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.javacord.api.interaction.SlashCommandInteraction; + +import net.tomatentum.marinara.interaction.InteractionHandler; +import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand; +import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOption; +import net.tomatentum.marinara.interaction.commands.option.SlashCommandOptionType; + +public class TestCommand implements InteractionHandler { + @SlashCommand( + name = "test", + description = "testingen", + serverIds = { + 1037753048602255440L + }, + options = { + @SlashCommandOption( + name = "foo", + description = "foo bar is very fooby", + type = SlashCommandOptionType.STRING, + choiceEnum = TestChoiceEnum.class + ) + } + ) + public void exec(SlashCommandInteraction interaction, String test) { + assertEquals(test, "test"); + System.out.println("Success!"); + } +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestInteractionCheck.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestInteractionCheck.java new file mode 100644 index 0000000..fcb794d --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestInteractionCheck.java @@ -0,0 +1,37 @@ +package net.tomatentum.marinara.test.discord4j; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import net.tomatentum.marinara.checks.InteractionCheck; + +public class TestInteractionCheck implements InteractionCheck { + + public static boolean preExecuted = false; + public static boolean postExecuted = false; + + @Target({ElementType.METHOD}) + @Retention(RetentionPolicy.RUNTIME) + public static @interface TestCheck { + } + + @Override + public boolean preExec(Object context, TestCheck annotation) { + assertNotNull(annotation); + assertNotNull(context); + preExecuted = true; + return true; + } + + @Override + public void postExec(Object context, TestCheck annotation) { + assertNotNull(annotation); + assertNotNull(context); + postExecuted = true; + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/AutocompleteInteractionMock.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/AutocompleteInteractionMock.java new file mode 100644 index 0000000..226ba1d --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/AutocompleteInteractionMock.java @@ -0,0 +1,17 @@ +package net.tomatentum.marinara.test.discord4j.mocks; + +import discord4j.core.GatewayDiscordClient; +import discord4j.core.event.domain.interaction.ChatInputAutoCompleteEvent; +import discord4j.core.object.command.Interaction; +import discord4j.gateway.ShardInfo; + +public class AutocompleteInteractionMock extends ChatInputAutoCompleteEvent { + + public AutocompleteInteractionMock(GatewayDiscordClient gateway, ShardInfo shardInfo, Interaction interaction) { + super(gateway, shardInfo, interaction); + //TODO Auto-generated constructor stub + } + + public static boolean didAutocompleteRun = false; + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ButtonInteractionMock.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ButtonInteractionMock.java new file mode 100644 index 0000000..0583329 --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ButtonInteractionMock.java @@ -0,0 +1,25 @@ +package net.tomatentum.marinara.test.discord4j.mocks; + +import discord4j.core.event.domain.interaction.ButtonInteractionEvent; +import discord4j.core.object.command.Interaction; + +public class ButtonInteractionMock extends ButtonInteractionEvent { + + private String customId; + + public ButtonInteractionMock(String customId) { + super(null, null, null); + this.customId = customId; + } + + @Override + public String getCustomId() { + return customId; + } + + @Override + public Interaction getInteraction() { + return new InteractionMock(); + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ChannelMock.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ChannelMock.java new file mode 100644 index 0000000..ba491fe --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ChannelMock.java @@ -0,0 +1,130 @@ +package net.tomatentum.marinara.test.discord4j.mocks; + +import java.time.Instant; +import java.util.Optional; +import java.util.function.Consumer; + +import org.reactivestreams.Publisher; + +import discord4j.common.util.Snowflake; +import discord4j.core.GatewayDiscordClient; +import discord4j.core.object.entity.Message; +import discord4j.core.object.entity.channel.MessageChannel; +import discord4j.core.retriever.EntityRetrievalStrategy; +import discord4j.core.spec.MessageCreateSpec; +import discord4j.core.spec.legacy.LegacyMessageCreateSpec; +import discord4j.rest.entity.RestChannel; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +public class ChannelMock implements MessageChannel { + + @Override + public Type getType() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getType'"); + } + + @Override + public Mono delete(String reason) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'delete'"); + } + + @Override + public RestChannel getRestChannel() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getRestChannel'"); + } + + @Override + public Snowflake getId() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getId'"); + } + + @Override + public GatewayDiscordClient getClient() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getClient'"); + } + + @Override + public Optional getLastMessageId() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getLastMessageId'"); + } + + @Override + public Mono getLastMessage() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getLastMessage'"); + } + + @Override + public Mono getLastMessage(EntityRetrievalStrategy retrievalStrategy) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getLastMessage'"); + } + + @Override + public Optional getLastPinTimestamp() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getLastPinTimestamp'"); + } + + @Override + public Mono createMessage(Consumer spec) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'createMessage'"); + } + + @Override + public Mono createMessage(MessageCreateSpec spec) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'createMessage'"); + } + + @Override + public Mono type() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'type'"); + } + + @Override + public Flux typeUntil(Publisher until) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'typeUntil'"); + } + + @Override + public Flux getMessagesBefore(Snowflake messageId) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getMessagesBefore'"); + } + + @Override + public Flux getMessagesAfter(Snowflake messageId) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getMessagesAfter'"); + } + + @Override + public Mono getMessageById(Snowflake id) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getMessageById'"); + } + + @Override + public Mono getMessageById(Snowflake id, EntityRetrievalStrategy retrievalStrategy) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getMessageById'"); + } + + @Override + public Flux getPinnedMessages() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getPinnedMessages'"); + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/InteractionMock.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/InteractionMock.java new file mode 100644 index 0000000..4de0152 --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/InteractionMock.java @@ -0,0 +1,41 @@ +package net.tomatentum.marinara.test.discord4j.mocks; + +import java.util.Optional; + +import discord4j.core.object.command.Interaction; +import discord4j.core.object.entity.Guild; +import discord4j.core.object.entity.Message; +import discord4j.core.object.entity.User; +import discord4j.core.object.entity.channel.MessageChannel; +import reactor.core.publisher.Mono; + +public class InteractionMock extends Interaction + { + + public InteractionMock() { + super(null, null); + } + + @Override + public Optional getMessage() { + //return Optional.of(new MessageMock()); + return Optional.empty(); + } + + @Override + public Mono getChannel() { + return Mono.just(new ChannelMock()); + } + + @Override + public Mono getGuild() { + //return Mono.just(new ServerMock()); + return Mono.empty(); + } + + @Override + public User getUser() { + return new UserMock(); + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionMock.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionMock.java new file mode 100644 index 0000000..07ad550 --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionMock.java @@ -0,0 +1,16 @@ +package net.tomatentum.marinara.test.discord4j.mocks; + +import discord4j.core.event.domain.interaction.ChatInputInteractionEvent; + +public class SlashCommandInteractionMock extends ChatInputInteractionEvent { + + public SlashCommandInteractionMock() { + super(null, null, null); + } + + @Override + public String getCommandName() { + return "test"; + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionOptionMock.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionOptionMock.java new file mode 100644 index 0000000..2c67577 --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionOptionMock.java @@ -0,0 +1,25 @@ +package net.tomatentum.marinara.test.discord4j.mocks; + +import java.util.Optional; + +import discord4j.core.object.command.ApplicationCommandInteractionOption; +import discord4j.core.object.command.ApplicationCommandInteractionOptionValue; +import discord4j.core.object.command.ApplicationCommandOption.Type; + +public class SlashCommandInteractionOptionMock extends ApplicationCommandInteractionOption { + + public SlashCommandInteractionOptionMock() { + super(null, null, null, null); + } + + @Override + public String getName() { + return "foo"; + } + + @Override + public Optional getValue() { + return Optional.of(new ApplicationCommandInteractionOptionValue(null, null, Type.STRING.getValue(), "test", null)); + } + +} diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/UserMock.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/UserMock.java new file mode 100644 index 0000000..0d8851d --- /dev/null +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/UserMock.java @@ -0,0 +1,11 @@ +package net.tomatentum.marinara.test.discord4j.mocks; + +import discord4j.core.object.entity.User; + +public class UserMock extends User { + + public UserMock() { + super(null, null); + } + +} diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/AutoCompleteTest.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/AutoCompleteTest.java similarity index 79% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/AutoCompleteTest.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/AutoCompleteTest.java index 443c2b4..9c5fc32 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/AutoCompleteTest.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/AutoCompleteTest.java @@ -1,12 +1,12 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; import net.tomatentum.marinara.Marinara; -import net.tomatentum.marinara.test.mocks.AutocompleteInteractionMock; -import net.tomatentum.marinara.test.mocks.DiscordApiMock; +import net.tomatentum.marinara.test.javacord.mocks.AutocompleteInteractionMock; +import net.tomatentum.marinara.test.javacord.mocks.DiscordApiMock; import net.tomatentum.marinara.wrapper.LibraryWrapper; import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/ButtonTest.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/ButtonTest.java similarity index 81% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/ButtonTest.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/ButtonTest.java index db08352..1040ceb 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/ButtonTest.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/ButtonTest.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -7,8 +7,8 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; import net.tomatentum.marinara.Marinara; -import net.tomatentum.marinara.test.mocks.ButtonInteractionMock; -import net.tomatentum.marinara.test.mocks.DiscordApiMock; +import net.tomatentum.marinara.test.javacord.mocks.ButtonInteractionMock; +import net.tomatentum.marinara.test.javacord.mocks.DiscordApiMock; import net.tomatentum.marinara.wrapper.LibraryWrapper; import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/InteractionCheckTest.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/InteractionCheckTest.java similarity index 87% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/InteractionCheckTest.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/InteractionCheckTest.java index aed9f5a..be5d8e1 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/InteractionCheckTest.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/InteractionCheckTest.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -9,9 +9,9 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; import net.tomatentum.marinara.Marinara; -import net.tomatentum.marinara.test.mocks.ButtonInteractionMock; -import net.tomatentum.marinara.test.mocks.DiscordApiMock; -import net.tomatentum.marinara.test.mocks.ServerMock; +import net.tomatentum.marinara.test.javacord.mocks.ButtonInteractionMock; +import net.tomatentum.marinara.test.javacord.mocks.DiscordApiMock; +import net.tomatentum.marinara.test.javacord.mocks.ServerMock; import net.tomatentum.marinara.wrapper.LibraryWrapper; import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper; import net.tomatentum.marinara.wrapper.javacord.checks.PermissionCheck; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/SlashCommandTest.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/SlashCommandTest.java similarity index 91% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/SlashCommandTest.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/SlashCommandTest.java index f7a2c49..fa077af 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/SlashCommandTest.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/SlashCommandTest.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import org.javacord.api.DiscordApi; import org.javacord.api.DiscordApiBuilder; @@ -9,7 +9,7 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; import net.tomatentum.marinara.Marinara; -import net.tomatentum.marinara.test.mocks.SlashCommandInteractionMock; +import net.tomatentum.marinara.test.javacord.mocks.SlashCommandInteractionMock; import net.tomatentum.marinara.wrapper.LibraryWrapper; import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper; @TestInstance(Lifecycle.PER_CLASS) diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestAutocomplete.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestAutocomplete.java similarity index 93% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestAutocomplete.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestAutocomplete.java index c38f4a2..d9063bb 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestAutocomplete.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestAutocomplete.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestButton.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestButton.java similarity index 91% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestButton.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestButton.java index 23a7dbf..f838e5e 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestButton.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestButton.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -11,7 +11,7 @@ import org.javacord.api.interaction.ButtonInteraction; import net.tomatentum.marinara.interaction.InteractionHandler; import net.tomatentum.marinara.interaction.annotation.Button; -import net.tomatentum.marinara.test.TestInteractionCheck.TestCheck; +import net.tomatentum.marinara.test.javacord.TestInteractionCheck.TestCheck; import net.tomatentum.marinara.wrapper.javacord.checks.PermissionCheck.HasPermission; public class TestButton implements InteractionHandler { diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestChoiceEnum.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestChoiceEnum.java similarity index 89% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestChoiceEnum.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestChoiceEnum.java index 1c7fd0a..1423ef9 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestChoiceEnum.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestChoiceEnum.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import net.tomatentum.marinara.interaction.commands.ChoiceValueProvider; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestCommand.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestCommand.java similarity index 95% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestCommand.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestCommand.java index 2716fea..e7aca90 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestCommand.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestCommand.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestInteractionCheck.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestInteractionCheck.java similarity index 95% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestInteractionCheck.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestInteractionCheck.java index ed1339b..3e7ea48 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/TestInteractionCheck.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestInteractionCheck.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test; +package net.tomatentum.marinara.test.javacord; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/AutocompleteInteractionMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/AutocompleteInteractionMock.java similarity index 99% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/AutocompleteInteractionMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/AutocompleteInteractionMock.java index 29d64b9..20460f6 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/AutocompleteInteractionMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/AutocompleteInteractionMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import java.util.ArrayList; import java.util.EnumSet; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ButtonInteractionMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ButtonInteractionMock.java similarity index 98% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ButtonInteractionMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ButtonInteractionMock.java index 3e3e8fd..a80320e 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ButtonInteractionMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ButtonInteractionMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import java.util.EnumSet; import java.util.List; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ChannelMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ChannelMock.java similarity index 99% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ChannelMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ChannelMock.java index 472751e..6048b0c 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ChannelMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ChannelMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import java.util.Collection; import java.util.List; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/DiscordApiMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/DiscordApiMock.java similarity index 99% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/DiscordApiMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/DiscordApiMock.java index d0e952f..ccc26b0 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/DiscordApiMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/DiscordApiMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import java.time.Duration; import java.util.Collection; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/MessageMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/MessageMock.java similarity index 99% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/MessageMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/MessageMock.java index 248fffd..186bce2 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/MessageMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/MessageMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import java.time.Instant; import java.util.Collection; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ServerMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ServerMock.java similarity index 99% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ServerMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ServerMock.java index 275c8ab..f07f85a 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/ServerMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ServerMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/SlashCommandInteractionMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/SlashCommandInteractionMock.java similarity index 98% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/SlashCommandInteractionMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/SlashCommandInteractionMock.java index 1f04e89..8a66a77 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/SlashCommandInteractionMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/SlashCommandInteractionMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import java.util.Arrays; import java.util.EnumSet; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/SlashCommandInteractionOptionMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/SlashCommandInteractionOptionMock.java similarity index 97% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/SlashCommandInteractionOptionMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/SlashCommandInteractionOptionMock.java index b102a21..478427b 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/SlashCommandInteractionOptionMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/SlashCommandInteractionOptionMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import java.util.Collections; import java.util.List; diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/UserMock.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/UserMock.java similarity index 99% rename from wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/UserMock.java rename to wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/UserMock.java index 7258b04..6511209 100644 --- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/mocks/UserMock.java +++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/UserMock.java @@ -1,4 +1,4 @@ -package net.tomatentum.marinara.test.mocks; +package net.tomatentum.marinara.test.javacord.mocks; import java.awt.Color; import java.time.Instant;