More mocking, fixed draft-test

Author: Zabuzard

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

@@ -2,6 +2,7 @@
 
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.User;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -12,6 +13,7 @@
 import org.togetherjava.tjbot.jda.JdaTester;
 
 import java.time.Instant;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -46,6 +48,8 @@ private void triggerRoutine() {
     void sendsPendingReminder() {
         // GIVEN a pending reminder
         Instant remindAt = Instant.now();
+        String reminderContent = "foo";
+        User author = jdaTester.getMemberSpy().getUser();
         rawReminders.insertReminder("foo", remindAt);
 
         // WHEN running the routine
@@ -55,9 +59,14 @@ void sendsPendingReminder() {
         assertTrue(rawReminders.readReminders().isEmpty());
 
         MessageEmbed lastMessage = getLastMessageFrom(jdaTester.getTextChannelSpy());
-        assertEquals("foo", lastMessage.getDescription());
-        assertEquals(remindAt, lastMessage.getTimestamp().toInstant());
-        // TODO Use actual name of the test user
-        assertEquals("name", lastMessage.getAuthor().getName());
+        assertEquals(reminderContent, lastMessage.getDescription());
+        assertSimilar(remindAt, lastMessage.getTimestamp().toInstant());
+        assertEquals(author.getAsTag(), lastMessage.getAuthor().getName());
+    }
+
+    private static void assertSimilar(@NotNull Instant expected, @NotNull Instant actual) {
+        // NOTE For some reason, the instant ends up in the database slightly wrong already (about
+        // half a second), seems to be an issue with jOOQ
+        assertEquals(expected.toEpochMilli(), actual.toEpochMilli(), TimeUnit.SECONDS.toMillis(1));
     }
 }

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

@@ -37,6 +37,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
@@ -123,6 +124,7 @@ public JdaTester() {
         doReturn(APPLICATION_ID).when(selfUser).getApplicationIdLong();
         doReturn(selfUser).when(jda).getSelfUser();
         when(jda.getGuildChannelById(anyLong())).thenReturn(textChannel);
+        when(jda.getTextChannelById(anyLong())).thenReturn(textChannel);
         when(jda.getPrivateChannelById(anyLong())).thenReturn(privateChannel);
         when(jda.getGuildById(anyLong())).thenReturn(guild);
         when(jda.getEntityBuilder()).thenReturn(entityBuilder);
@@ -147,13 +149,19 @@ public JdaTester() {
         auditableRestAction = (AuditableRestActionImpl<Void>) mock(AuditableRestActionImpl.class);
         doNothing().when(auditableRestAction).queue();
 
-        doNothing().when(messageAction).queue();
-
         doReturn(everyoneRole).when(guild).getPublicRole();
         doReturn(selfMember).when(guild).getMember(selfUser);
         doReturn(member).when(guild).getMember(not(eq(selfUser)));
 
+        RestAction<User> userAction = createSucceededActionMock(member.getUser());
+        when(jda.retrieveUserById(anyLong())).thenReturn(userAction);
+
         doReturn(null).when(textChannel).retrieveMessageById(any());
+        doReturn(messageAction).when(textChannel).sendMessageEmbeds(any(), any());
+        doReturn(messageAction).when(textChannel).sendMessageEmbeds(any());
+
+        doNothing().when(messageAction).queue();
+        when(messageAction.content(any())).thenReturn(messageAction);
     }
 
     /**
@@ -319,11 +327,25 @@ public JdaTester() {
             successConsumer.accept(t);
             return null;
         };
+        Answer<RestAction<?>> mapExecution = invocation -> {
+            Function<? super T, ?> mapFunction = invocation.getArgument(0);
+            Object result = mapFunction.apply(t);
+            return createSucceededActionMock(result);
+        };
+        Answer<RestAction<?>> flatMapExecution = invocation -> {
+            Function<? super T, RestAction<?>> flatMapFunction = invocation.getArgument(0);
+            return flatMapFunction.apply(t);
+        };
 
         doNothing().when(action).queue();
 
         doAnswer(successExecution).when(action).queue(any());
         doAnswer(successExecution).when(action).queue(any(), any());
+        when(action.onErrorMap(any())).thenReturn(action);
+        when(action.onErrorMap(any(), any())).thenReturn(action);
+
+        doAnswer(mapExecution).when(action).map(any());
+        doAnswer(flatMapExecution).when(action).flatMap(any());
 
         return action;
     }