From 3b8e3031cb09932018e9b78548e03f3f88664c4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Jun 2025 17:42:04 +0000 Subject: [PATCH 1/3] Update dependency com.squareup.okhttp3:mockwebserver3-junit5 to v5.0.0-alpha.17 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad7d17cf..795c541d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ junit = "org.junit.jupiter:junit-jupiter:5.13.2" junit-platform = "org.junit.platform:junit-platform-launcher:1.13.2" logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" } -mockwebserver = "com.squareup.okhttp3:mockwebserver3-junit5:5.0.0-alpha.16" +mockwebserver = "com.squareup.okhttp3:mockwebserver3-junit5:5.0.0-alpha.17" okio = "com.squareup.okio:okio:3.14.0" scrimage-core = { module = "com.sksamuel.scrimage:scrimage-core", version.ref = "scrimage" } scrimage-formats-extra = { module = "com.sksamuel.scrimage:scrimage-formats-extra", version.ref = "scrimage" } From 1479a270fed472d9c807099e69d89d12095b3820 Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Mon, 30 Jun 2025 22:16:54 +0200 Subject: [PATCH 2/3] update okio mockwebserver methods after their removal --- .../stickerify/bot/StickerifyTest.java | 139 ++++++++++-------- 1 file changed, 77 insertions(+), 62 deletions(-) diff --git a/src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java b/src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java index 287e69a4..2f76d85f 100644 --- a/src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java +++ b/src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java @@ -5,28 +5,29 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import com.github.stickerifier.stickerify.junit.ClearTempFiles; import com.github.stickerifier.stickerify.telegram.Answer; import com.pengrad.telegrambot.TelegramBot; import mockwebserver3.MockWebServer; import mockwebserver3.RecordedRequest; -import mockwebserver3.junit5.internal.MockWebServerExtension; +import mockwebserver3.junit5.StartStop; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; +import java.io.IOException; import java.net.URLEncoder; @ClearTempFiles -@ExtendWith(MockWebServerExtension.class) class StickerifyTest { - private MockWebServer server; + @StartStop + private final MockWebServer server = new MockWebServer(); @BeforeEach - void setup() { - server = new MockWebServer(); + void setup() throws IOException { + server.start(); } @Test @@ -36,10 +37,10 @@ void startMessage() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getPath()); + assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); assertResponseContainsMessage(sendMessage, Answer.HELP); } @@ -55,7 +56,8 @@ private void startBot() { private static void assertResponseContainsMessage(RecordedRequest request, Answer answer) { var message = URLEncoder.encode(answer.getText(), UTF_8); - assertThat(request.getBody().readUtf8(), containsString(message)); + assertNotNull(request.getBody()); + assertThat(request.getBody().utf8(), containsString(message)); } @Test @@ -65,10 +67,10 @@ void helpMessage() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getPath()); + assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); assertResponseContainsMessage(sendMessage, Answer.HELP); } @@ -79,10 +81,10 @@ void privacyMessage() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getPath()); + assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); assertResponseContainsMessage(sendMessage, Answer.PRIVACY_POLICY); } @@ -93,10 +95,10 @@ void fileNotSupported() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getPath()); + assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); assertResponseContainsMessage(sendMessage, Answer.ERROR); } @@ -107,10 +109,10 @@ void fileTooBig() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getPath()); + assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); assertResponseContainsMessage(sendMessage, Answer.FILE_TOO_LARGE); } @@ -123,17 +125,18 @@ void fileAlreadyValid() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getPath()); - assertEquals("file_id=animated_sticker.tgs", getFile.getBody().readUtf8()); + assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertNotNull(getFile.getBody()); + assertEquals("file_id=animated_sticker.tgs", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/animated_sticker.tgs", download.getPath()); + assertEquals("/files/token/animated_sticker.tgs", download.getUrl().encodedPath()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getPath()); + assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); assertResponseContainsMessage(sendMessage, Answer.FILE_ALREADY_VALID); } @@ -146,18 +149,20 @@ void convertedPng() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getPath()); - assertEquals("file_id=big.png", getFile.getBody().readUtf8()); + assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertNotNull(getFile.getBody()); + assertEquals("file_id=big.png", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/big.png", download.getPath()); + assertEquals("/files/token/big.png", download.getUrl().encodedPath()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getPath()); - assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText())); + assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertNotNull(sendDocument.getBody()); + assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @Test @@ -169,18 +174,20 @@ void convertedWebp() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getPath()); - assertEquals("file_id=static.webp", getFile.getBody().readUtf8()); + assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertNotNull(getFile.getBody()); + assertEquals("file_id=static.webp", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/static.webp", download.getPath()); + assertEquals("/files/token/static.webp", download.getUrl().encodedPath()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getPath()); - assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText())); + assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertNotNull(sendDocument.getBody()); + assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @Test @@ -192,18 +199,20 @@ void convertedMov() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getPath()); - assertEquals("file_id=long.mov", getFile.getBody().readUtf8()); + assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertNotNull(getFile.getBody()); + assertEquals("file_id=long.mov", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/long.mov", download.getPath()); + assertEquals("/files/token/long.mov", download.getUrl().encodedPath()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getPath()); - assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText())); + assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertNotNull(sendDocument.getBody()); + assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @Test @@ -215,18 +224,20 @@ void convertedWebm() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getPath()); - assertEquals("file_id=short_low_fps.webm", getFile.getBody().readUtf8()); + assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertNotNull(getFile.getBody()); + assertEquals("file_id=short_low_fps.webm", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/short_low_fps.webm", download.getPath()); + assertEquals("/files/token/short_low_fps.webm", download.getUrl().encodedPath()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getPath()); - assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText())); + assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertNotNull(sendDocument.getBody()); + assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @Test @@ -238,18 +249,20 @@ void convertedGif() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getPath()); - assertEquals("file_id=valid.gif", getFile.getBody().readUtf8()); + assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertNotNull(getFile.getBody()); + assertEquals("file_id=valid.gif", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/valid.gif", download.getPath()); + assertEquals("/files/token/valid.gif", download.getUrl().encodedPath()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getPath()); - assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText())); + assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertNotNull(sendDocument.getBody()); + assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @Test @@ -261,17 +274,18 @@ void documentNotSupported() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getPath()); - assertEquals("file_id=document.txt", getFile.getBody().readUtf8()); + assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertNotNull(getFile.getBody()); + assertEquals("file_id=document.txt", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/document.txt", download.getPath()); + assertEquals("/files/token/document.txt", download.getUrl().encodedPath()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getPath()); + assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); assertResponseContainsMessage(sendMessage, Answer.ERROR); } @@ -284,17 +298,18 @@ void corruptedVideo() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getPath()); + assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getPath()); - assertEquals("file_id=corrupted.mp4", getFile.getBody().readUtf8()); + assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertNotNull(getFile.getBody()); + assertEquals("file_id=corrupted.mp4", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/corrupted.mp4", download.getPath()); + assertEquals("/files/token/corrupted.mp4", download.getUrl().encodedPath()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getPath()); + assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); assertResponseContainsMessage(sendMessage, Answer.CORRUPTED); } } From c5cdeee3986817e184bcf629927a38af2c27932e Mon Sep 17 00:00:00 2001 From: Enrico Martelli Date: Fri, 4 Jul 2025 09:27:05 +0200 Subject: [PATCH 3/3] Refactor StickerifyTest to use getTarget() for request URL assertions --- .../stickerify/bot/StickerifyTest.java | 91 +++++++++---------- 1 file changed, 42 insertions(+), 49 deletions(-) diff --git a/src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java b/src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java index 2f76d85f..12f018e3 100644 --- a/src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java +++ b/src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java @@ -13,10 +13,8 @@ import mockwebserver3.MockWebServer; import mockwebserver3.RecordedRequest; import mockwebserver3.junit5.StartStop; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.io.IOException; import java.net.URLEncoder; @ClearTempFiles @@ -25,11 +23,6 @@ class StickerifyTest { @StartStop private final MockWebServer server = new MockWebServer(); - @BeforeEach - void setup() throws IOException { - server.start(); - } - @Test void startMessage() throws Exception { server.enqueue(MockResponses.START_MESSAGE); @@ -37,10 +30,10 @@ void startMessage() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); + assertEquals("/api/token/sendMessage", sendMessage.getTarget()); assertResponseContainsMessage(sendMessage, Answer.HELP); } @@ -67,10 +60,10 @@ void helpMessage() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); + assertEquals("/api/token/sendMessage", sendMessage.getTarget()); assertResponseContainsMessage(sendMessage, Answer.HELP); } @@ -81,10 +74,10 @@ void privacyMessage() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); + assertEquals("/api/token/sendMessage", sendMessage.getTarget()); assertResponseContainsMessage(sendMessage, Answer.PRIVACY_POLICY); } @@ -95,10 +88,10 @@ void fileNotSupported() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); + assertEquals("/api/token/sendMessage", sendMessage.getTarget()); assertResponseContainsMessage(sendMessage, Answer.ERROR); } @@ -109,10 +102,10 @@ void fileTooBig() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); + assertEquals("/api/token/sendMessage", sendMessage.getTarget()); assertResponseContainsMessage(sendMessage, Answer.FILE_TOO_LARGE); } @@ -125,18 +118,18 @@ void fileAlreadyValid() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertEquals("/api/token/getFile", getFile.getTarget()); assertNotNull(getFile.getBody()); assertEquals("file_id=animated_sticker.tgs", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/animated_sticker.tgs", download.getUrl().encodedPath()); + assertEquals("/files/token/animated_sticker.tgs", download.getTarget()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); + assertEquals("/api/token/sendMessage", sendMessage.getTarget()); assertResponseContainsMessage(sendMessage, Answer.FILE_ALREADY_VALID); } @@ -149,18 +142,18 @@ void convertedPng() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertEquals("/api/token/getFile", getFile.getTarget()); assertNotNull(getFile.getBody()); assertEquals("file_id=big.png", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/big.png", download.getUrl().encodedPath()); + assertEquals("/files/token/big.png", download.getTarget()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertEquals("/api/token/sendDocument", sendDocument.getTarget()); assertNotNull(sendDocument.getBody()); assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @@ -174,18 +167,18 @@ void convertedWebp() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertEquals("/api/token/getFile", getFile.getTarget()); assertNotNull(getFile.getBody()); assertEquals("file_id=static.webp", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/static.webp", download.getUrl().encodedPath()); + assertEquals("/files/token/static.webp", download.getTarget()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertEquals("/api/token/sendDocument", sendDocument.getTarget()); assertNotNull(sendDocument.getBody()); assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @@ -199,18 +192,18 @@ void convertedMov() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertEquals("/api/token/getFile", getFile.getTarget()); assertNotNull(getFile.getBody()); assertEquals("file_id=long.mov", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/long.mov", download.getUrl().encodedPath()); + assertEquals("/files/token/long.mov", download.getTarget()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertEquals("/api/token/sendDocument", sendDocument.getTarget()); assertNotNull(sendDocument.getBody()); assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @@ -224,18 +217,18 @@ void convertedWebm() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertEquals("/api/token/getFile", getFile.getTarget()); assertNotNull(getFile.getBody()); assertEquals("file_id=short_low_fps.webm", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/short_low_fps.webm", download.getUrl().encodedPath()); + assertEquals("/files/token/short_low_fps.webm", download.getTarget()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertEquals("/api/token/sendDocument", sendDocument.getTarget()); assertNotNull(sendDocument.getBody()); assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @@ -249,18 +242,18 @@ void convertedGif() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertEquals("/api/token/getFile", getFile.getTarget()); assertNotNull(getFile.getBody()); assertEquals("file_id=valid.gif", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/valid.gif", download.getUrl().encodedPath()); + assertEquals("/files/token/valid.gif", download.getTarget()); var sendDocument = server.takeRequest(); - assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath()); + assertEquals("/api/token/sendDocument", sendDocument.getTarget()); assertNotNull(sendDocument.getBody()); assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText())); } @@ -274,18 +267,18 @@ void documentNotSupported() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertEquals("/api/token/getFile", getFile.getTarget()); assertNotNull(getFile.getBody()); assertEquals("file_id=document.txt", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/document.txt", download.getUrl().encodedPath()); + assertEquals("/files/token/document.txt", download.getTarget()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); + assertEquals("/api/token/sendMessage", sendMessage.getTarget()); assertResponseContainsMessage(sendMessage, Answer.ERROR); } @@ -298,18 +291,18 @@ void corruptedVideo() throws Exception { startBot(); var getUpdates = server.takeRequest(); - assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath()); + assertEquals("/api/token/getUpdates", getUpdates.getTarget()); var getFile = server.takeRequest(); - assertEquals("/api/token/getFile", getFile.getUrl().encodedPath()); + assertEquals("/api/token/getFile", getFile.getTarget()); assertNotNull(getFile.getBody()); assertEquals("file_id=corrupted.mp4", getFile.getBody().utf8()); var download = server.takeRequest(); - assertEquals("/files/token/corrupted.mp4", download.getUrl().encodedPath()); + assertEquals("/files/token/corrupted.mp4", download.getTarget()); var sendMessage = server.takeRequest(); - assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath()); + assertEquals("/api/token/sendMessage", sendMessage.getTarget()); assertResponseContainsMessage(sendMessage, Answer.CORRUPTED); } }