From 0944005b02ede5c9700319161862bb15caecfbad Mon Sep 17 00:00:00 2001 From: aNNiMON Date: Tue, 31 Dec 2024 16:31:24 +0200 Subject: [PATCH] Add two types of downloadFileAsStream tests --- .../client/TestTelegramClientIntegration.java | 17 +++++++++- .../client/TestTelegramClientIntegration.java | 31 +++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/telegrambots-client-jetty-adapter/src/test/java/org/telegram/telegrambots/client/TestTelegramClientIntegration.java b/telegrambots-client-jetty-adapter/src/test/java/org/telegram/telegrambots/client/TestTelegramClientIntegration.java index aeb2988ed..5d69a2471 100644 --- a/telegrambots-client-jetty-adapter/src/test/java/org/telegram/telegrambots/client/TestTelegramClientIntegration.java +++ b/telegrambots-client-jetty-adapter/src/test/java/org/telegram/telegrambots/client/TestTelegramClientIntegration.java @@ -21,13 +21,14 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.Serializable; import java.nio.charset.StandardCharsets; import static org.junit.jupiter.api.Assertions.*; -public class TestTelegramClientIntegration { +class TestTelegramClientIntegration { private MockWebServer webServer; private static final String TOKEN = "testToken"; @@ -171,6 +172,20 @@ void testDownloadFileAsStream() throws Exception { } } + @Test + void testDownloadFileAsStreamFuture() { + client.downloadFileAsStreamAsync("someFile").thenAccept(is -> { + String text = null; + try { + text = new String(is.readAllBytes(), StandardCharsets.UTF_8); + } catch (IOException e) { + throw new RuntimeException(e); + } + assertNotNull(text); + assertFalse(text.isEmpty()); + }); + } + @Test void testSendMessageException() { SendMessage method = new SendMessage("someChatId", "someText"); diff --git a/telegrambots-client/src/test/java/org/telegram/telegrambots/client/TestTelegramClientIntegration.java b/telegrambots-client/src/test/java/org/telegram/telegrambots/client/TestTelegramClientIntegration.java index a45becc93..bfda6aa1e 100644 --- a/telegrambots-client/src/test/java/org/telegram/telegrambots/client/TestTelegramClientIntegration.java +++ b/telegrambots-client/src/test/java/org/telegram/telegrambots/client/TestTelegramClientIntegration.java @@ -29,11 +29,13 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.io.Serializable; +import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class TestTelegramClientIntegration { +class TestTelegramClientIntegration { private MockWebServer webServer; private static final String TOKEN = "testToken"; @@ -168,6 +170,29 @@ void testSendAnimation() throws TelegramApiException { assertEquals(responseMessage, parsedMessage); } + @Test + void testDownloadFileAsStream() throws Exception { + try (InputStream is = client.downloadFileAsStream("someFile")) { + String text = new String(is.readAllBytes(), StandardCharsets.UTF_8); + assertNotNull(text); + assertFalse(text.isEmpty()); + } + } + + @Test + void testDownloadFileAsStreamFuture() throws Exception { + client.downloadFileAsStreamAsync("someFile").thenAccept(is -> { + String text = null; + try { + text = new String(is.readAllBytes(), StandardCharsets.UTF_8); + } catch (IOException e) { + throw new RuntimeException(e); + } + assertNotNull(text); + assertFalse(text.isEmpty()); + }).get(); + } + @Test void testSendMessageException() { SendMessage method = new SendMessage("someChatId", "someText");