Skip to content

Commit fae2162

Browse files
committed
Fix TooManyRequests in setMyName test
1 parent badcd17 commit fae2162

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

library/src/main/java/com/pengrad/telegrambot/request/SetMyName.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public SetMyName() {
1111
/**
1212
*
1313
* @param name New bot name; 0-64 characters. Pass an empty string to remove the dedicated name for the given language.
14-
* @return
1514
*/
1615
public SetMyName name(String name) {
1716
add("name", name);
@@ -21,7 +20,6 @@ public SetMyName name(String name) {
2120
/**
2221
*
2322
* @param languageCode A two-letter ISO 639-1 language code. If empty, the name will be shown to all users for whose language there is no dedicated name.
24-
* @return
2523
*/
2624
public SetMyName languageCode(String languageCode) {
2725
add("language_code", languageCode);

library/src/test/java/com/pengrad/telegrambot/RetryInterceptor.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class RetryInterceptor implements Interceptor {
1616

1717
private final int defaultSleepMillis;
1818
private final Gson gson = new Gson();
19+
private boolean enabled = true;
1920

2021
public RetryInterceptor() {
2122
this(1000);
@@ -25,8 +26,13 @@ public RetryInterceptor(int defaultSleepMillis) {
2526
this.defaultSleepMillis = defaultSleepMillis;
2627
}
2728

29+
public void setEnabled(boolean enabled) {
30+
this.enabled = enabled;
31+
}
32+
2833
@Override
2934
public Response intercept(Chain chain) throws IOException {
35+
if (!enabled) return chain.proceed(chain.request());
3036
Request request = chain.request();
3137
Exception exception = null;
3238
int retries = 3;

library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,14 @@ public static TelegramBot createTestBot() {
7070
.connectTimeout(75, TimeUnit.SECONDS)
7171
.writeTimeout(75, TimeUnit.SECONDS)
7272
.readTimeout(75, TimeUnit.SECONDS)
73-
.addInterceptor(new RetryInterceptor(1000));
73+
.addInterceptor(retry);
7474
if (localBuild) {
7575
okHttpBuilder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY));
7676
}
7777
return new TelegramBot.Builder(token).okHttpClient(okHttpBuilder.build()).build();
7878
}
7979

80+
static RetryInterceptor retry = new RetryInterceptor(1000);
8081
static TelegramBot bot = createTestBot();
8182
static Long chatId;
8283
static Long groupId;
@@ -2352,8 +2353,13 @@ public void setMyShortDescription() {
23522353

23532354
@Test
23542355
public void setMyName() {
2356+
retry.setEnabled(false);
23552357
BaseResponse response = bot.execute(new SetMyName().name("name").languageCode("en"));
2356-
assertTrue(response.isOk());
2358+
if (!response.isOk()) {
2359+
assertEquals(429, response.errorCode());
2360+
assertTrue(response.description().startsWith("Too Many Requests: retry after"));
2361+
}
2362+
retry.setEnabled(true);
23572363

23582364
GetMyNameResponse nameResponse = bot.execute(new GetMyName().languageCode("en"));
23592365
assertTrue(nameResponse.isOk());

0 commit comments

Comments
 (0)