Исправил ошибки, дописал тесты на Bot.java

Author: AlexanderBazarov

.idea/misc.xml

@@ -102,6 +102,12 @@ public void editMessageReplyMarkup(long chatId, int messageId, InlineKeyboardMar
         editMessageReplyMarkup.setChatId(chatId);
         editMessageReplyMarkup.setMessageId(messageId);
         editMessageReplyMarkup.setReplyMarkup(replyKeyboard);
+
+        try {
+            execute(editMessageReplyMarkup);
+        } catch (TelegramApiException e) {
+            this.logger.error(e.getMessage());
+        }
     }
 
     @Override
@@ -125,6 +131,12 @@ public void sendPhoto(long chatId, String caption, byte[] photo) {
 
         InputFile file = new InputFile(new ByteArrayInputStream(photo), getImageFileNameWithExtension(photo));
         sendPhoto.setPhoto(file);
+
+        try {
+            execute(sendPhoto);
+        } catch (TelegramApiException e) {
+            this.logger.error(e.getMessage());
+        }
     }
 
     @Override
@@ -133,6 +145,12 @@ public void answerCallbackQuery(String callbackQueryId, String text, boolean sho
         answerCallbackQuery.setCallbackQueryId(callbackQueryId);
         answerCallbackQuery.setText(text);
         answerCallbackQuery.setShowAlert(showAlert);
+
+        try {
+            execute(answerCallbackQuery);
+        } catch (TelegramApiException e) {
+            this.logger.error(e.getMessage());
+        }
     }
 
     public void banChatMember(long chatId, long userId, int duration) {
@@ -148,7 +166,7 @@ public void banChatMember(long chatId, long userId, int duration) {
         try {
             execute(banChatMember);
         } catch (TelegramApiException e) {
-            System.err.println(e.getMessage());
+            this.logger.error(e.getMessage());
         }
 
     }

src/main/java/ru/untitled_devs/core/client/Bot.java

@@ -1,6 +1,6 @@
 package ru.untitled_devs.core.routers.handlers;
 
-import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
+import org.telegram.telegrambots.meta.api.objects.Message;
 import org.telegram.telegrambots.meta.api.objects.Update;
 import ru.untitled_devs.core.fsm.State;
 import ru.untitled_devs.core.fsm.context.FSMContext;
@@ -11,13 +11,13 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-public class CallbackQueryHandler implements Handler{
+public class CallbackQueryHandler implements Handler {
 
     private final List<Filter> filters = new ArrayList<>();
-    private final BiConsumer<CallbackQuery, FSMContext> action;
+    private final BiConsumer<Message, FSMContext> action;
     private final State state;
 
-    public CallbackQueryHandler(BiConsumer<CallbackQuery, FSMContext> action, State state, Filter... filters) {
+    public CallbackQueryHandler(BiConsumer<Message, FSMContext> action, State state, Filter... filters) {
         this.filters.addAll(Arrays.asList(filters));
         this.action = action;
         this.state = state;
@@ -35,11 +35,11 @@ public boolean canHandle(Update update, FSMContext ctx) {
 
     @Override
     public void handleUpdate(Update update, FSMContext ctx) {
-        action.accept(update.getCallbackQuery(), ctx);
+        action.accept(update.getMessage(), ctx);
     }
 
-    @Override
     public void addFilter(Filter filter) {
         this.filters.add(filter);
     }
+
 }

src/main/java/ru/untitled_devs/core/routers/handlers/CallbackQueryHandler.java

@@ -1,22 +1,29 @@
 package ru.untitleddevs.core.client;
 
-import org.apache.commons.logging.Log;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.telegram.telegrambots.meta.api.methods.AnswerCallbackQuery;
 import org.telegram.telegrambots.meta.api.methods.groupadministration.BanChatMember;
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.methods.send.SendPhoto;
+import org.telegram.telegrambots.meta.api.methods.updatingmessages.DeleteMessage;
+import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageReplyMarkup;
+import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageText;
 import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
 import org.telegram.telegrambots.meta.api.objects.Message;
 import org.telegram.telegrambots.meta.api.objects.Update;
 import org.telegram.telegrambots.meta.api.objects.User;
+import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
 import ru.untitled_devs.core.client.Bot;
 import ru.untitled_devs.core.fsm.context.FSMContext;
 import ru.untitled_devs.core.fsm.storage.StorageKey;
 import ru.untitled_devs.core.fsm.storage.Storage;
 import ru.untitled_devs.core.routers.Router;
 
+import java.util.Base64;
+
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
@@ -26,13 +33,12 @@ class BotTest {
     private Bot bot;
     private Storage storage;
     private Router router;
-    private Logger logger;
 
     @BeforeEach
     void setUp() {
         storage = mock(Storage.class);
         router = mock(Router.class);
-        logger = mock(Logger.class);
+        Logger logger = mock(Logger.class);
         bot = new Bot("testToken", "testUsername", storage, logger);
         bot.addRouter(router);
     }
@@ -50,6 +56,21 @@ void sendMessageSuccessfullySendsMessage() throws TelegramApiException {
         verify(bot, times(1)).execute(any(SendMessage.class));
     }
 
+    @Test
+    void sendMessageSuccessfullySendsMessageWithMarkup() throws TelegramApiException {
+        bot = spy(bot);
+        doReturn(null).when(bot).execute(any(SendMessage.class));
+
+        InlineKeyboardMarkup markup = new InlineKeyboardMarkup();
+
+        assertDoesNotThrow(
+                () -> bot.sendMessage(12345L, "Hello, World!", markup),
+                "sendMessage should not throw any exception when execute(...) returns null"
+        );
+
+        verify(bot, times(1)).execute(any(SendMessage.class));
+    }
+
     @Test
     void sendMessageHandlesTelegramApiException() throws TelegramApiException {
         bot = spy(bot);
@@ -89,6 +110,78 @@ void banChatMemberHandlesTelegramApiException() throws TelegramApiException {
         verify(bot, times(1)).execute(any(BanChatMember.class));
     }
 
+    @Test
+    void seditMessageSuccessfullyEditMessageText() throws TelegramApiException {
+        bot = spy(bot);
+        doReturn(null).when(bot).execute(any(EditMessageText.class));
+
+        assertDoesNotThrow(
+                () -> bot.editMessageText(12345L, 12415125,"Hello, World!"),
+                "sendMessage should not throw any exception when execute(...) returns null"
+        );
+
+        verify(bot, times(1)).execute(any(EditMessageText.class));
+    }
+
+    @Test
+    void EditMessageMarkupSuccessfullyEditMessageMarkup() throws TelegramApiException {
+        bot = spy(bot);
+        doReturn(null).when(bot).execute(any(EditMessageReplyMarkup.class));
+
+        InlineKeyboardMarkup markup = new InlineKeyboardMarkup();
+
+        assertDoesNotThrow(
+                () -> bot.editMessageReplyMarkup(12345L, 12415125, markup),
+                "sendMessage should not throw any exception when execute(...) returns null"
+        );
+
+        verify(bot, times(1)).execute(any(EditMessageReplyMarkup.class));
+    }
+
+    @Test
+    void deleteMessageSuccessfullyDeletesMessage() throws TelegramApiException {
+        bot = spy(bot);
+        doReturn(null).when(bot).execute(any(DeleteMessage.class));
+
+        assertDoesNotThrow(
+                () -> bot.deleteMessage(12345L, 12415125),
+                "sendMessage should not throw any exception when execute(...) returns null"
+        );
+
+        verify(bot, times(1)).execute(any(DeleteMessage.class));
+    }
+
+    @Test
+    void sendPhotoSuccessfullySendsPhoto() throws TelegramApiException {
+        bot = spy(bot);
+        doReturn(null).when(bot).execute(any(SendPhoto.class));
+
+        byte[] photo = Base64.getDecoder().decode(
+                "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVQI12NgYAAAAAMAASsJTYQAAAAASUVORK5CYII="
+        );
+
+        assertDoesNotThrow(
+                () -> bot.sendPhoto(12345L, "12415125", photo),
+                "sendMessage should not throw any exception when execute(...) returns null"
+        );
+
+        verify(bot, times(1)).execute(any(SendPhoto.class));
+    }
+
+    @Test
+    void answerCallbackQuerySuccessfullyAnswersCallback() throws TelegramApiException {
+        bot = spy(bot);
+        doReturn(null).when(bot).execute(any(AnswerCallbackQuery.class));
+
+        assertDoesNotThrow(
+                () -> bot.answerCallbackQuery("21323", "12415125", false),
+                "sendMessage should not throw any exception when execute(...) returns null"
+        );
+
+        verify(bot, times(1)).execute(any(AnswerCallbackQuery.class));
+    }
+
+
     @Test
     void onUpdateMessageReceivedRoutesUpdateToAllRouters() {
         Update update = mock(Update.class);