Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-03-27 14:23:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-8] upgrading to new JDA alpha version 19

Browse Source 
cleaning up imports
This commit is contained in:
Sheldan
2022-09-18 15:51:49 +02:00
parent 102209aaca
commit 4e1f9e0018
216 changed files with 682 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImplTest.java
View File

@@ -7,7 +7,7 @@ import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiec
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.service.ChannelService;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

4
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImplImplTest.java
View File

@@ -7,8 +7,8 @@ import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiec
import dev.sheldan.abstracto.core.command.service.CommandService;
import dev.sheldan.abstracto.core.models.database.AEmote;
import dev.sheldan.abstracto.core.service.EmoteService;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,7 +38,7 @@ public class AEmoteParameterHandlerImplImplTest extends AbstractParameterHandler
private CommandParameterIterators iterators;
@Mock
private Emote emote;
private RichCustomEmoji emote;
@Mock
private Message message;

15
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImplTest.java
View File

@@ -4,9 +4,10 @@ import dev.sheldan.abstracto.core.command.Command;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.execution.ParameterPieceType;
import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,7 +30,7 @@ public class EmoteParameterHandlerImplTest extends AbstractParameterHandlerTest
private CommandParameterIterators iterators;
@Mock
private Emote emote;
private RichCustomEmoji emote;
@Mock
private Message message;
@@ -52,7 +53,7 @@ public class EmoteParameterHandlerImplTest extends AbstractParameterHandlerTest
@Test
public void testSuccessfulCondition() {
when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING);
Assert.assertTrue(testUnit.handles(Emote.class, unparsedCommandParameterPiece));
Assert.assertTrue(testUnit.handles(CustomEmoji.class, unparsedCommandParameterPiece));
}
@Test
@@ -64,7 +65,7 @@ public class EmoteParameterHandlerImplTest extends AbstractParameterHandlerTest
public void testProperEmoteMention() {
oneEmoteInIterator();
String input = getEmoteMention();
Emote parsed = (Emote) testUnit.handle(getPieceWithValue(input), iterators, parameter, null, command);
CustomEmoji parsed = (CustomEmoji) testUnit.handle(getPieceWithValue(input), iterators, parameter, null, command);
Assert.assertEquals(parsed, emote);
}
@@ -72,7 +73,7 @@ public class EmoteParameterHandlerImplTest extends AbstractParameterHandlerTest
public void testEmoteById() {
setupMessage();
String input = EMOTE_ID.toString();
Emote parsed = (Emote) testUnit.handle(getPieceWithValue(input), null, parameter, message, command);
CustomEmoji parsed = (CustomEmoji) testUnit.handle(getPieceWithValue(input), null, parameter, message, command);
Assert.assertEquals(parsed, emote);
}
@@ -86,13 +87,13 @@ public class EmoteParameterHandlerImplTest extends AbstractParameterHandlerTest
}
private void oneEmoteInIterator() {
List<Emote> emotes = Arrays.asList(emote);
List<CustomEmoji> emotes = Arrays.asList(emote);
when(iterators.getEmoteIterator()).thenReturn(emotes.iterator());
}
private void setupMessage() {
when(message.getGuild()).thenReturn(guild);
when(guild.getEmoteById(EMOTE_ID)).thenReturn(emote);
when(guild.getEmojiById(EMOTE_ID)).thenReturn(emote);
}
}

4
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImplImplTest.java
View File

@@ -8,8 +8,8 @@ import dev.sheldan.abstracto.core.command.service.CommandService;
import dev.sheldan.abstracto.core.models.FullEmote;
import dev.sheldan.abstracto.core.models.database.AEmote;
import dev.sheldan.abstracto.core.service.EmoteService;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,7 +38,7 @@ public class FullEmoteParameterHandlerImplImplTest extends AbstractParameterHand
private CommandParameterIterators iterators;
@Mock
private Emote emote;
private RichCustomEmoji emote;
@Mock
private Message message;

4
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImplTest.java
View File

@@ -7,7 +7,7 @@ import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiec
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.requests.RestAction;
import net.dv8tion.jda.api.requests.restaction.CacheRestAction;
import net.dv8tion.jda.internal.utils.concurrent.task.GatewayTask;
import org.junit.Assert;
import org.junit.Test;
@@ -126,7 +126,7 @@ public class MemberParameterHandlerImplTest extends AbstractParameterHandlerTest
private void setupMessage() {
when(message.getGuild()).thenReturn(guild);
RestAction<Member> restAction = Mockito.mock(RestAction.class);
CacheRestAction<Member> restAction = Mockito.mock(CacheRestAction.class);
when(restAction.submit()).thenReturn(CompletableFuture.completedFuture(member));
when(guild.retrieveMemberById(USER_ID)).thenReturn(restAction);
}

2
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/TextChannelParameterHandlerImplTest.java
View File

@@ -7,7 +7,7 @@ import dev.sheldan.abstracto.core.command.execution.ParameterPieceType;
import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

1
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/service/CommandInServerServiceBeanTest.java
View File

@@ -11,7 +11,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import static org.mockito.Mockito.when;

1
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/service/AllowedMentionServiceBeanTest.java
View File

@@ -14,7 +14,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.List;
import java.util.Optional;
import java.util.Set;

1
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/service/management/DefaultFeatureModeManagementBeanTest.java
View File

@@ -14,7 +14,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.util.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;