Skip to content

Commit 58fff0c

Browse files
renovate[bot]rob93cEnrico Martelli
authored
Update dependency com.squareup.okhttp3:mockwebserver3-junit5 to v5.0.0-alpha.17 (#368)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Roberto Cella <[email protected]> Co-authored-by: Enrico Martelli <[email protected]>
1 parent 07338ef commit 58fff0c

File tree

2 files changed

+75
-67
lines changed

2 files changed

+75
-67
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ junit = "org.junit.jupiter:junit-jupiter:5.13.2"
1414
junit-platform = "org.junit.platform:junit-platform-launcher:1.13.2"
1515
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
1616
logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" }
17-
mockwebserver = "com.squareup.okhttp3:mockwebserver3-junit5:5.0.0-alpha.16"
17+
mockwebserver = "com.squareup.okhttp3:mockwebserver3-junit5:5.0.0-alpha.17"
1818
okio = "com.squareup.okio:okio:3.14.0"
1919
scrimage-core = { module = "com.sksamuel.scrimage:scrimage-core", version.ref = "scrimage" }
2020
scrimage-formats-extra = { module = "com.sksamuel.scrimage:scrimage-formats-extra", version.ref = "scrimage" }

‎src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java‎

Lines changed: 74 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,23 @@
55
import static org.hamcrest.MatcherAssert.assertThat;
66
import static org.hamcrest.Matchers.containsString;
77
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
import static org.junit.jupiter.api.Assertions.assertNotNull;
89

910
import com.github.stickerifier.stickerify.junit.ClearTempFiles;
1011
import com.github.stickerifier.stickerify.telegram.Answer;
1112
import com.pengrad.telegrambot.TelegramBot;
1213
import mockwebserver3.MockWebServer;
1314
import mockwebserver3.RecordedRequest;
14-
import mockwebserver3.junit5.internal.MockWebServerExtension;
15-
import org.junit.jupiter.api.BeforeEach;
15+
import mockwebserver3.junit5.StartStop;
1616
import org.junit.jupiter.api.Test;
17-
import org.junit.jupiter.api.extension.ExtendWith;
1817

1918
import java.net.URLEncoder;
2019

2120
@ClearTempFiles
22-
@ExtendWith(MockWebServerExtension.class)
2321
class StickerifyTest {
2422

25-
private MockWebServer server;
26-
27-
@BeforeEach
28-
void setup() {
29-
server = new MockWebServer();
30-
}
23+
@StartStop
24+
private final MockWebServer server = new MockWebServer();
3125

3226
@Test
3327
void startMessage() throws Exception {
@@ -36,10 +30,10 @@ void startMessage() throws Exception {
3630
startBot();
3731

3832
var getUpdates = server.takeRequest();
39-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
33+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
4034

4135
var sendMessage = server.takeRequest();
42-
assertEquals("/api/token/sendMessage", sendMessage.getPath());
36+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
4337
assertResponseContainsMessage(sendMessage, Answer.HELP);
4438
}
4539

@@ -55,7 +49,8 @@ private void startBot() {
5549

5650
private static void assertResponseContainsMessage(RecordedRequest request, Answer answer) {
5751
var message = URLEncoder.encode(answer.getText(), UTF_8);
58-
assertThat(request.getBody().readUtf8(), containsString(message));
52+
assertNotNull(request.getBody());
53+
assertThat(request.getBody().utf8(), containsString(message));
5954
}
6055

6156
@Test
@@ -65,10 +60,10 @@ void helpMessage() throws Exception {
6560
startBot();
6661

6762
var getUpdates = server.takeRequest();
68-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
63+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
6964

7065
var sendMessage = server.takeRequest();
71-
assertEquals("/api/token/sendMessage", sendMessage.getPath());
66+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
7267
assertResponseContainsMessage(sendMessage, Answer.HELP);
7368
}
7469

@@ -79,10 +74,10 @@ void privacyMessage() throws Exception {
7974
startBot();
8075

8176
var getUpdates = server.takeRequest();
82-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
77+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
8378

8479
var sendMessage = server.takeRequest();
85-
assertEquals("/api/token/sendMessage", sendMessage.getPath());
80+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
8681
assertResponseContainsMessage(sendMessage, Answer.PRIVACY_POLICY);
8782
}
8883

@@ -93,10 +88,10 @@ void fileNotSupported() throws Exception {
9388
startBot();
9489

9590
var getUpdates = server.takeRequest();
96-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
91+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
9792

9893
var sendMessage = server.takeRequest();
99-
assertEquals("/api/token/sendMessage", sendMessage.getPath());
94+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
10095
assertResponseContainsMessage(sendMessage, Answer.ERROR);
10196
}
10297

@@ -107,10 +102,10 @@ void fileTooBig() throws Exception {
107102
startBot();
108103

109104
var getUpdates = server.takeRequest();
110-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
105+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
111106

112107
var sendMessage = server.takeRequest();
113-
assertEquals("/api/token/sendMessage", sendMessage.getPath());
108+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
114109
assertResponseContainsMessage(sendMessage, Answer.FILE_TOO_LARGE);
115110
}
116111

@@ -123,17 +118,18 @@ void fileAlreadyValid() throws Exception {
123118
startBot();
124119

125120
var getUpdates = server.takeRequest();
126-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
121+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
127122

128123
var getFile = server.takeRequest();
129-
assertEquals("/api/token/getFile", getFile.getPath());
130-
assertEquals("file_id=animated_sticker.tgs", getFile.getBody().readUtf8());
124+
assertEquals("/api/token/getFile", getFile.getTarget());
125+
assertNotNull(getFile.getBody());
126+
assertEquals("file_id=animated_sticker.tgs", getFile.getBody().utf8());
131127

132128
var download = server.takeRequest();
133-
assertEquals("/files/token/animated_sticker.tgs", download.getPath());
129+
assertEquals("/files/token/animated_sticker.tgs", download.getTarget());
134130

135131
var sendMessage = server.takeRequest();
136-
assertEquals("/api/token/sendMessage", sendMessage.getPath());
132+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
137133
assertResponseContainsMessage(sendMessage, Answer.FILE_ALREADY_VALID);
138134
}
139135

@@ -146,18 +142,20 @@ void convertedPng() throws Exception {
146142
startBot();
147143

148144
var getUpdates = server.takeRequest();
149-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
145+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
150146

151147
var getFile = server.takeRequest();
152-
assertEquals("/api/token/getFile", getFile.getPath());
153-
assertEquals("file_id=big.png", getFile.getBody().readUtf8());
148+
assertEquals("/api/token/getFile", getFile.getTarget());
149+
assertNotNull(getFile.getBody());
150+
assertEquals("file_id=big.png", getFile.getBody().utf8());
154151

155152
var download = server.takeRequest();
156-
assertEquals("/files/token/big.png", download.getPath());
153+
assertEquals("/files/token/big.png", download.getTarget());
157154

158155
var sendDocument = server.takeRequest();
159-
assertEquals("/api/token/sendDocument", sendDocument.getPath());
160-
assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText()));
156+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
157+
assertNotNull(sendDocument.getBody());
158+
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
161159
}
162160

163161
@Test
@@ -169,18 +167,20 @@ void convertedWebp() throws Exception {
169167
startBot();
170168

171169
var getUpdates = server.takeRequest();
172-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
170+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
173171

174172
var getFile = server.takeRequest();
175-
assertEquals("/api/token/getFile", getFile.getPath());
176-
assertEquals("file_id=static.webp", getFile.getBody().readUtf8());
173+
assertEquals("/api/token/getFile", getFile.getTarget());
174+
assertNotNull(getFile.getBody());
175+
assertEquals("file_id=static.webp", getFile.getBody().utf8());
177176

178177
var download = server.takeRequest();
179-
assertEquals("/files/token/static.webp", download.getPath());
178+
assertEquals("/files/token/static.webp", download.getTarget());
180179

181180
var sendDocument = server.takeRequest();
182-
assertEquals("/api/token/sendDocument", sendDocument.getPath());
183-
assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText()));
181+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
182+
assertNotNull(sendDocument.getBody());
183+
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
184184
}
185185

186186
@Test
@@ -192,18 +192,20 @@ void convertedMov() throws Exception {
192192
startBot();
193193

194194
var getUpdates = server.takeRequest();
195-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
195+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
196196

197197
var getFile = server.takeRequest();
198-
assertEquals("/api/token/getFile", getFile.getPath());
199-
assertEquals("file_id=long.mov", getFile.getBody().readUtf8());
198+
assertEquals("/api/token/getFile", getFile.getTarget());
199+
assertNotNull(getFile.getBody());
200+
assertEquals("file_id=long.mov", getFile.getBody().utf8());
200201

201202
var download = server.takeRequest();
202-
assertEquals("/files/token/long.mov", download.getPath());
203+
assertEquals("/files/token/long.mov", download.getTarget());
203204

204205
var sendDocument = server.takeRequest();
205-
assertEquals("/api/token/sendDocument", sendDocument.getPath());
206-
assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText()));
206+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
207+
assertNotNull(sendDocument.getBody());
208+
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
207209
}
208210

209211
@Test
@@ -215,18 +217,20 @@ void convertedWebm() throws Exception {
215217
startBot();
216218

217219
var getUpdates = server.takeRequest();
218-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
220+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
219221

220222
var getFile = server.takeRequest();
221-
assertEquals("/api/token/getFile", getFile.getPath());
222-
assertEquals("file_id=short_low_fps.webm", getFile.getBody().readUtf8());
223+
assertEquals("/api/token/getFile", getFile.getTarget());
224+
assertNotNull(getFile.getBody());
225+
assertEquals("file_id=short_low_fps.webm", getFile.getBody().utf8());
223226

224227
var download = server.takeRequest();
225-
assertEquals("/files/token/short_low_fps.webm", download.getPath());
228+
assertEquals("/files/token/short_low_fps.webm", download.getTarget());
226229

227230
var sendDocument = server.takeRequest();
228-
assertEquals("/api/token/sendDocument", sendDocument.getPath());
229-
assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText()));
231+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
232+
assertNotNull(sendDocument.getBody());
233+
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
230234
}
231235

232236
@Test
@@ -238,18 +242,20 @@ void convertedGif() throws Exception {
238242
startBot();
239243

240244
var getUpdates = server.takeRequest();
241-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
245+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
242246

243247
var getFile = server.takeRequest();
244-
assertEquals("/api/token/getFile", getFile.getPath());
245-
assertEquals("file_id=valid.gif", getFile.getBody().readUtf8());
248+
assertEquals("/api/token/getFile", getFile.getTarget());
249+
assertNotNull(getFile.getBody());
250+
assertEquals("file_id=valid.gif", getFile.getBody().utf8());
246251

247252
var download = server.takeRequest();
248-
assertEquals("/files/token/valid.gif", download.getPath());
253+
assertEquals("/files/token/valid.gif", download.getTarget());
249254

250255
var sendDocument = server.takeRequest();
251-
assertEquals("/api/token/sendDocument", sendDocument.getPath());
252-
assertThat(sendDocument.getBody().readUtf8(), containsString(Answer.FILE_READY.getText()));
256+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
257+
assertNotNull(sendDocument.getBody());
258+
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
253259
}
254260

255261
@Test
@@ -261,17 +267,18 @@ void documentNotSupported() throws Exception {
261267
startBot();
262268

263269
var getUpdates = server.takeRequest();
264-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
270+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
265271

266272
var getFile = server.takeRequest();
267-
assertEquals("/api/token/getFile", getFile.getPath());
268-
assertEquals("file_id=document.txt", getFile.getBody().readUtf8());
273+
assertEquals("/api/token/getFile", getFile.getTarget());
274+
assertNotNull(getFile.getBody());
275+
assertEquals("file_id=document.txt", getFile.getBody().utf8());
269276

270277
var download = server.takeRequest();
271-
assertEquals("/files/token/document.txt", download.getPath());
278+
assertEquals("/files/token/document.txt", download.getTarget());
272279

273280
var sendMessage = server.takeRequest();
274-
assertEquals("/api/token/sendMessage", sendMessage.getPath());
281+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
275282
assertResponseContainsMessage(sendMessage, Answer.ERROR);
276283
}
277284

@@ -284,17 +291,18 @@ void corruptedVideo() throws Exception {
284291
startBot();
285292

286293
var getUpdates = server.takeRequest();
287-
assertEquals("/api/token/getUpdates", getUpdates.getPath());
294+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
288295

289296
var getFile = server.takeRequest();
290-
assertEquals("/api/token/getFile", getFile.getPath());
291-
assertEquals("file_id=corrupted.mp4", getFile.getBody().readUtf8());
297+
assertEquals("/api/token/getFile", getFile.getTarget());
298+
assertNotNull(getFile.getBody());
299+
assertEquals("file_id=corrupted.mp4", getFile.getBody().utf8());
292300

293301
var download = server.takeRequest();
294-
assertEquals("/files/token/corrupted.mp4", download.getPath());
302+
assertEquals("/files/token/corrupted.mp4", download.getTarget());
295303

296304
var sendMessage = server.takeRequest();
297-
assertEquals("/api/token/sendMessage", sendMessage.getPath());
305+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
298306
assertResponseContainsMessage(sendMessage, Answer.CORRUPTED);
299307
}
300308
}

0 commit comments

Comments
 (0)