Skip to content

Commit c5cdeee

Browse files
author
Enrico Martelli
committed
Refactor StickerifyTest to use getTarget() for request URL assertions
1 parent 1479a27 commit c5cdeee

File tree

1 file changed

+42
-49
lines changed

1 file changed

+42
-49
lines changed

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

Lines changed: 42 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
import mockwebserver3.MockWebServer;
1414
import mockwebserver3.RecordedRequest;
1515
import mockwebserver3.junit5.StartStop;
16-
import org.junit.jupiter.api.BeforeEach;
1716
import org.junit.jupiter.api.Test;
1817

19-
import java.io.IOException;
2018
import java.net.URLEncoder;
2119

2220
@ClearTempFiles
@@ -25,22 +23,17 @@ class StickerifyTest {
2523
@StartStop
2624
private final MockWebServer server = new MockWebServer();
2725

28-
@BeforeEach
29-
void setup() throws IOException {
30-
server.start();
31-
}
32-
3326
@Test
3427
void startMessage() throws Exception {
3528
server.enqueue(MockResponses.START_MESSAGE);
3629

3730
startBot();
3831

3932
var getUpdates = server.takeRequest();
40-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
33+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
4134

4235
var sendMessage = server.takeRequest();
43-
assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath());
36+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
4437
assertResponseContainsMessage(sendMessage, Answer.HELP);
4538
}
4639

@@ -67,10 +60,10 @@ void helpMessage() throws Exception {
6760
startBot();
6861

6962
var getUpdates = server.takeRequest();
70-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
63+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
7164

7265
var sendMessage = server.takeRequest();
73-
assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath());
66+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
7467
assertResponseContainsMessage(sendMessage, Answer.HELP);
7568
}
7669

@@ -81,10 +74,10 @@ void privacyMessage() throws Exception {
8174
startBot();
8275

8376
var getUpdates = server.takeRequest();
84-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
77+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
8578

8679
var sendMessage = server.takeRequest();
87-
assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath());
80+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
8881
assertResponseContainsMessage(sendMessage, Answer.PRIVACY_POLICY);
8982
}
9083

@@ -95,10 +88,10 @@ void fileNotSupported() throws Exception {
9588
startBot();
9689

9790
var getUpdates = server.takeRequest();
98-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
91+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
9992

10093
var sendMessage = server.takeRequest();
101-
assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath());
94+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
10295
assertResponseContainsMessage(sendMessage, Answer.ERROR);
10396
}
10497

@@ -109,10 +102,10 @@ void fileTooBig() throws Exception {
109102
startBot();
110103

111104
var getUpdates = server.takeRequest();
112-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
105+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
113106

114107
var sendMessage = server.takeRequest();
115-
assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath());
108+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
116109
assertResponseContainsMessage(sendMessage, Answer.FILE_TOO_LARGE);
117110
}
118111

@@ -125,18 +118,18 @@ void fileAlreadyValid() throws Exception {
125118
startBot();
126119

127120
var getUpdates = server.takeRequest();
128-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
121+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
129122

130123
var getFile = server.takeRequest();
131-
assertEquals("/api/token/getFile", getFile.getUrl().encodedPath());
124+
assertEquals("/api/token/getFile", getFile.getTarget());
132125
assertNotNull(getFile.getBody());
133126
assertEquals("file_id=animated_sticker.tgs", getFile.getBody().utf8());
134127

135128
var download = server.takeRequest();
136-
assertEquals("/files/token/animated_sticker.tgs", download.getUrl().encodedPath());
129+
assertEquals("/files/token/animated_sticker.tgs", download.getTarget());
137130

138131
var sendMessage = server.takeRequest();
139-
assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath());
132+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
140133
assertResponseContainsMessage(sendMessage, Answer.FILE_ALREADY_VALID);
141134
}
142135

@@ -149,18 +142,18 @@ void convertedPng() throws Exception {
149142
startBot();
150143

151144
var getUpdates = server.takeRequest();
152-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
145+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
153146

154147
var getFile = server.takeRequest();
155-
assertEquals("/api/token/getFile", getFile.getUrl().encodedPath());
148+
assertEquals("/api/token/getFile", getFile.getTarget());
156149
assertNotNull(getFile.getBody());
157150
assertEquals("file_id=big.png", getFile.getBody().utf8());
158151

159152
var download = server.takeRequest();
160-
assertEquals("/files/token/big.png", download.getUrl().encodedPath());
153+
assertEquals("/files/token/big.png", download.getTarget());
161154

162155
var sendDocument = server.takeRequest();
163-
assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath());
156+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
164157
assertNotNull(sendDocument.getBody());
165158
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
166159
}
@@ -174,18 +167,18 @@ void convertedWebp() throws Exception {
174167
startBot();
175168

176169
var getUpdates = server.takeRequest();
177-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
170+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
178171

179172
var getFile = server.takeRequest();
180-
assertEquals("/api/token/getFile", getFile.getUrl().encodedPath());
173+
assertEquals("/api/token/getFile", getFile.getTarget());
181174
assertNotNull(getFile.getBody());
182175
assertEquals("file_id=static.webp", getFile.getBody().utf8());
183176

184177
var download = server.takeRequest();
185-
assertEquals("/files/token/static.webp", download.getUrl().encodedPath());
178+
assertEquals("/files/token/static.webp", download.getTarget());
186179

187180
var sendDocument = server.takeRequest();
188-
assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath());
181+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
189182
assertNotNull(sendDocument.getBody());
190183
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
191184
}
@@ -199,18 +192,18 @@ void convertedMov() throws Exception {
199192
startBot();
200193

201194
var getUpdates = server.takeRequest();
202-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
195+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
203196

204197
var getFile = server.takeRequest();
205-
assertEquals("/api/token/getFile", getFile.getUrl().encodedPath());
198+
assertEquals("/api/token/getFile", getFile.getTarget());
206199
assertNotNull(getFile.getBody());
207200
assertEquals("file_id=long.mov", getFile.getBody().utf8());
208201

209202
var download = server.takeRequest();
210-
assertEquals("/files/token/long.mov", download.getUrl().encodedPath());
203+
assertEquals("/files/token/long.mov", download.getTarget());
211204

212205
var sendDocument = server.takeRequest();
213-
assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath());
206+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
214207
assertNotNull(sendDocument.getBody());
215208
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
216209
}
@@ -224,18 +217,18 @@ void convertedWebm() throws Exception {
224217
startBot();
225218

226219
var getUpdates = server.takeRequest();
227-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
220+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
228221

229222
var getFile = server.takeRequest();
230-
assertEquals("/api/token/getFile", getFile.getUrl().encodedPath());
223+
assertEquals("/api/token/getFile", getFile.getTarget());
231224
assertNotNull(getFile.getBody());
232225
assertEquals("file_id=short_low_fps.webm", getFile.getBody().utf8());
233226

234227
var download = server.takeRequest();
235-
assertEquals("/files/token/short_low_fps.webm", download.getUrl().encodedPath());
228+
assertEquals("/files/token/short_low_fps.webm", download.getTarget());
236229

237230
var sendDocument = server.takeRequest();
238-
assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath());
231+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
239232
assertNotNull(sendDocument.getBody());
240233
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
241234
}
@@ -249,18 +242,18 @@ void convertedGif() throws Exception {
249242
startBot();
250243

251244
var getUpdates = server.takeRequest();
252-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
245+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
253246

254247
var getFile = server.takeRequest();
255-
assertEquals("/api/token/getFile", getFile.getUrl().encodedPath());
248+
assertEquals("/api/token/getFile", getFile.getTarget());
256249
assertNotNull(getFile.getBody());
257250
assertEquals("file_id=valid.gif", getFile.getBody().utf8());
258251

259252
var download = server.takeRequest();
260-
assertEquals("/files/token/valid.gif", download.getUrl().encodedPath());
253+
assertEquals("/files/token/valid.gif", download.getTarget());
261254

262255
var sendDocument = server.takeRequest();
263-
assertEquals("/api/token/sendDocument", sendDocument.getUrl().encodedPath());
256+
assertEquals("/api/token/sendDocument", sendDocument.getTarget());
264257
assertNotNull(sendDocument.getBody());
265258
assertThat(sendDocument.getBody().utf8(), containsString(Answer.FILE_READY.getText()));
266259
}
@@ -274,18 +267,18 @@ void documentNotSupported() throws Exception {
274267
startBot();
275268

276269
var getUpdates = server.takeRequest();
277-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
270+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
278271

279272
var getFile = server.takeRequest();
280-
assertEquals("/api/token/getFile", getFile.getUrl().encodedPath());
273+
assertEquals("/api/token/getFile", getFile.getTarget());
281274
assertNotNull(getFile.getBody());
282275
assertEquals("file_id=document.txt", getFile.getBody().utf8());
283276

284277
var download = server.takeRequest();
285-
assertEquals("/files/token/document.txt", download.getUrl().encodedPath());
278+
assertEquals("/files/token/document.txt", download.getTarget());
286279

287280
var sendMessage = server.takeRequest();
288-
assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath());
281+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
289282
assertResponseContainsMessage(sendMessage, Answer.ERROR);
290283
}
291284

@@ -298,18 +291,18 @@ void corruptedVideo() throws Exception {
298291
startBot();
299292

300293
var getUpdates = server.takeRequest();
301-
assertEquals("/api/token/getUpdates", getUpdates.getUrl().encodedPath());
294+
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
302295

303296
var getFile = server.takeRequest();
304-
assertEquals("/api/token/getFile", getFile.getUrl().encodedPath());
297+
assertEquals("/api/token/getFile", getFile.getTarget());
305298
assertNotNull(getFile.getBody());
306299
assertEquals("file_id=corrupted.mp4", getFile.getBody().utf8());
307300

308301
var download = server.takeRequest();
309-
assertEquals("/files/token/corrupted.mp4", download.getUrl().encodedPath());
302+
assertEquals("/files/token/corrupted.mp4", download.getTarget());
310303

311304
var sendMessage = server.takeRequest();
312-
assertEquals("/api/token/sendMessage", sendMessage.getUrl().encodedPath());
305+
assertEquals("/api/token/sendMessage", sendMessage.getTarget());
313306
assertResponseContainsMessage(sendMessage, Answer.CORRUPTED);
314307
}
315308
}

0 commit comments

Comments
 (0)