fixes after rebase

Author: Zabuzard

application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindRoutineTest.java

@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.jda.JdaTester;
@@ -65,10 +66,12 @@ private void triggerRoutine() {
     }
 
     private @NotNull TextChannel createAndSetupUnknownChannel() {
-        int unknownChannelId = 2;
+        long unknownChannelId = 2;
 
         TextChannel channel = jdaTester.createTextChannelSpy(unknownChannelId);
-        when(jdaTester.getJdaMock().getTextChannelById(unknownChannelId)).thenReturn(null);
+        when(jdaTester.getJdaMock()
+            .getChannelById(ArgumentMatchers.<Class<MessageChannel>>any(), eq(unknownChannelId)))
+                .thenReturn(null);
 
         return channel;
     }

application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java

@@ -133,6 +133,8 @@ public JdaTester() {
         doReturn(selfUser).when(jda).getSelfUser();
         when(jda.getGuildChannelById(anyLong())).thenReturn(textChannel);
         when(jda.getTextChannelById(anyLong())).thenReturn(textChannel);
+        when(jda.getChannelById(ArgumentMatchers.<Class<MessageChannel>>any(), anyLong()))
+            .thenReturn(textChannel);
         when(jda.getPrivateChannelById(anyLong())).thenReturn(privateChannel);
         when(jda.getGuildById(anyLong())).thenReturn(guild);
         when(jda.getEntityBuilder()).thenReturn(entityBuilder);