Skip to content

Commit a85e7c5

Browse files
MartelliEnricoMartelliEnrico
committed
Simplify usage a bit
1 parent 3c62b1d commit a85e7c5

File tree

2 files changed

+27
-28
lines changed

2 files changed

+27
-28
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.github.stickerifier.stickerify.bot;
22

3+
import com.github.stickerifier.stickerify.ResourceHelper;
34
import mockwebserver3.MockResponse;
45
import okio.Buffer;
56
import okio.Okio;
67

7-
import java.io.File;
8-
98
public final class MockResponses {
109

1110
static final MockResponse EMPTY_UPDATES = new MockResponse.Builder().body("""
@@ -320,7 +319,7 @@ public final class MockResponses {
320319
}
321320
""").build();
322321

323-
static MockResponse fileInfo(String id) {
322+
static MockResponse fileInfo(String fileName) {
324323
return new MockResponse.Builder().body("""
325324
{
326325
ok: true,
@@ -329,10 +328,11 @@ static MockResponse fileInfo(String id) {
329328
file_path: "%1$s"
330329
}
331330
}
332-
""".formatted(id)).build();
331+
""".formatted(fileName)).build();
333332
}
334333

335-
static MockResponse fileDownload(File file) throws Exception {
334+
static MockResponse fileDownload(String fileName) throws Exception {
335+
var file = ResourceHelper.loadResource(fileName);
336336
try (var buffer = new Buffer(); var source = Okio.source(file)) {
337337
buffer.writeAll(source);
338338
return new MockResponse.Builder().body(buffer).build();

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.stickerifier.stickerify.bot;
22

3-
import static com.github.stickerifier.stickerify.ResourceHelper.loadResource;
43
import static java.nio.charset.StandardCharsets.UTF_8;
54
import static org.hamcrest.MatcherAssert.assertThat;
65
import static org.hamcrest.Matchers.containsString;
@@ -31,7 +30,7 @@ class StickerifyTest {
3130
void startMessage() throws Exception {
3231
server.enqueue(MockResponses.START_MESSAGE);
3332

34-
try (var _ = startBot()) {
33+
try (var _ = runBot()) {
3534
var getUpdates = server.takeRequest();
3635
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
3736

@@ -41,7 +40,7 @@ void startMessage() throws Exception {
4140
}
4241
}
4342

44-
private Stickerify startBot() {
43+
private Stickerify runBot() {
4544
((QueueDispatcher)server.getDispatcher()).setFailFast(MockResponses.EMPTY_UPDATES);
4645

4746
var bot = new TelegramBot.Builder("token")
@@ -63,7 +62,7 @@ private static void assertResponseContainsMessage(RecordedRequest request, Answe
6362
void helpMessage() throws Exception {
6463
server.enqueue(MockResponses.HELP_MESSAGE);
6564

66-
try (var _ = startBot()) {
65+
try (var _ = runBot()) {
6766
var getUpdates = server.takeRequest();
6867
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
6968

@@ -77,7 +76,7 @@ void helpMessage() throws Exception {
7776
void privacyMessage() throws Exception {
7877
server.enqueue(MockResponses.PRIVACY_MESSAGE);
7978

80-
try (var _ = startBot()) {
79+
try (var _ = runBot()) {
8180
var getUpdates = server.takeRequest();
8281
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
8382

@@ -91,7 +90,7 @@ void privacyMessage() throws Exception {
9190
void fileNotSupported() throws Exception {
9291
server.enqueue(MockResponses.FILE_NOT_SUPPORTED);
9392

94-
try (var _ = startBot()) {
93+
try (var _ = runBot()) {
9594
var getUpdates = server.takeRequest();
9695
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
9796

@@ -105,7 +104,7 @@ void fileNotSupported() throws Exception {
105104
void fileTooBig() throws Exception {
106105
server.enqueue(MockResponses.FILE_TOO_BIG);
107106

108-
try (var _ = startBot()) {
107+
try (var _ = runBot()) {
109108
var getUpdates = server.takeRequest();
110109
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
111110

@@ -119,9 +118,9 @@ void fileTooBig() throws Exception {
119118
void fileAlreadyValid() throws Exception {
120119
server.enqueue(MockResponses.ANIMATED_STICKER);
121120
server.enqueue(MockResponses.fileInfo("animated_sticker.tgs"));
122-
server.enqueue(MockResponses.fileDownload(loadResource("animated_sticker.tgs")));
121+
server.enqueue(MockResponses.fileDownload("animated_sticker.tgs"));
123122

124-
try (var _ = startBot()) {
123+
try (var _ = runBot()) {
125124
var getUpdates = server.takeRequest();
126125
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
127126

@@ -143,9 +142,9 @@ void fileAlreadyValid() throws Exception {
143142
void convertedPng() throws Exception {
144143
server.enqueue(MockResponses.PNG_FILE);
145144
server.enqueue(MockResponses.fileInfo("big.png"));
146-
server.enqueue(MockResponses.fileDownload(loadResource("big.png")));
145+
server.enqueue(MockResponses.fileDownload("big.png"));
147146

148-
try (var _ = startBot()) {
147+
try (var _ = runBot()) {
149148
var getUpdates = server.takeRequest();
150149
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
151150

@@ -168,9 +167,9 @@ void convertedPng() throws Exception {
168167
void convertedWebp() throws Exception {
169168
server.enqueue(MockResponses.WEBP_FILE);
170169
server.enqueue(MockResponses.fileInfo("static.webp"));
171-
server.enqueue(MockResponses.fileDownload(loadResource("static.webp")));
170+
server.enqueue(MockResponses.fileDownload("static.webp"));
172171

173-
try (var _ = startBot()) {
172+
try (var _ = runBot()) {
174173
var getUpdates = server.takeRequest();
175174
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
176175

@@ -193,9 +192,9 @@ void convertedWebp() throws Exception {
193192
void convertedMov() throws Exception {
194193
server.enqueue(MockResponses.MOV_FILE);
195194
server.enqueue(MockResponses.fileInfo("long.mov"));
196-
server.enqueue(MockResponses.fileDownload(loadResource("long.mov")));
195+
server.enqueue(MockResponses.fileDownload("long.mov"));
197196

198-
try (var _ = startBot()) {
197+
try (var _ = runBot()) {
199198
var getUpdates = server.takeRequest();
200199
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
201200

@@ -218,9 +217,9 @@ void convertedMov() throws Exception {
218217
void convertedWebm() throws Exception {
219218
server.enqueue(MockResponses.WEBM_FILE);
220219
server.enqueue(MockResponses.fileInfo("short_low_fps.webm"));
221-
server.enqueue(MockResponses.fileDownload(loadResource("short_low_fps.webm")));
220+
server.enqueue(MockResponses.fileDownload("short_low_fps.webm"));
222221

223-
try (var _ = startBot()) {
222+
try (var _ = runBot()) {
224223
var getUpdates = server.takeRequest();
225224
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
226225

@@ -243,9 +242,9 @@ void convertedWebm() throws Exception {
243242
void convertedGif() throws Exception {
244243
server.enqueue(MockResponses.GIF_FILE);
245244
server.enqueue(MockResponses.fileInfo("valid.gif"));
246-
server.enqueue(MockResponses.fileDownload(loadResource("valid.gif")));
245+
server.enqueue(MockResponses.fileDownload("valid.gif"));
247246

248-
try (var _ = startBot()) {
247+
try (var _ = runBot()) {
249248
var getUpdates = server.takeRequest();
250249
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
251250

@@ -268,9 +267,9 @@ void convertedGif() throws Exception {
268267
void documentNotSupported() throws Exception {
269268
server.enqueue(MockResponses.DOCUMENT);
270269
server.enqueue(MockResponses.fileInfo("document.txt"));
271-
server.enqueue(MockResponses.fileDownload(loadResource("document.txt")));
270+
server.enqueue(MockResponses.fileDownload("document.txt"));
272271

273-
try (var _ = startBot()) {
272+
try (var _ = runBot()) {
274273
var getUpdates = server.takeRequest();
275274
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
276275

@@ -292,9 +291,9 @@ void documentNotSupported() throws Exception {
292291
void corruptedVideo() throws Exception {
293292
server.enqueue(MockResponses.CORRUPTED_FILE);
294293
server.enqueue(MockResponses.fileInfo("corrupted.mp4"));
295-
server.enqueue(MockResponses.fileDownload(loadResource("corrupted.mp4")));
294+
server.enqueue(MockResponses.fileDownload("corrupted.mp4"));
296295

297-
try (var _ = startBot()) {
296+
try (var _ = runBot()) {
298297
var getUpdates = server.takeRequest();
299298
assertEquals("/api/token/getUpdates", getUpdates.getTarget());
300299

0 commit comments

Comments
 (0)