Skip to content

Commit 9e062c3

Browse files
committed
Fix tests
1 parent 721571e commit 9e062c3

File tree

6 files changed

+40
-8
lines changed

6 files changed

+40
-8
lines changed

library/src/main/java/com/pengrad/telegrambot/model/ForumTopicClosed.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,15 @@
44

55
public class ForumTopicClosed implements Serializable {
66
private final static long serialVersionUID = 0L;
7+
8+
@Override
9+
public boolean equals(Object o) {
10+
if (this == o) return true;
11+
return o != null && getClass() == o.getClass();
12+
}
13+
14+
@Override
15+
public int hashCode() {
16+
return 1;
17+
}
718
}

library/src/main/java/com/pengrad/telegrambot/model/ForumTopicReopened.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,15 @@
44

55
public class ForumTopicReopened implements Serializable {
66
private final static long serialVersionUID = 0L;
7+
8+
@Override
9+
public boolean equals(Object o) {
10+
if (this == o) return true;
11+
return o != null && getClass() == o.getClass();
12+
}
13+
14+
@Override
15+
public int hashCode() {
16+
return 1;
17+
}
718
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ public void testEquals() throws ReflectiveOperationException {
8181

8282
if (c == Message.class) {
8383
verifierApi.withIgnoredFields("video_chat_started");
84+
verifierApi.withIgnoredFields("forum_topic_closed");
85+
verifierApi.withIgnoredFields("forum_topic_reopened");
8486
}
8587

8688
verifierApi.verify();

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ public void promoteChatMember() {
305305
.canPinMessages(false)
306306
.canManageChat(false)
307307
.canManageVoiceChats(false)
308+
.canManageVideoChats(false)
309+
.canManageTopics(false)
308310
.canPromoteMembers(true));
309311
assertTrue(response.isOk());
310312
}
@@ -522,7 +524,7 @@ public void getChat() throws MalformedURLException, URISyntaxException {
522524

523525
chat = bot.execute(new GetChat(chatId)).chat();
524526
assertNotNull(chat.firstName());
525-
assertNotNull(chat.lastName());
527+
assertNull(chat.lastName());
526528
assertEquals("yo", chat.bio());
527529
assertTrue(chat.hasPrivateForwards());
528530

@@ -580,6 +582,7 @@ public void getChatMember() {
580582
assertFalse(chatMember.canSendMediaMessages());
581583
assertFalse(chatMember.canSendOtherMessages());
582584
assertFalse(chatMember.canAddWebPagePreviews());
585+
assertTrue(chatMember.canManageTopics());
583586
}
584587

585588
@Test
@@ -691,7 +694,7 @@ public void forwardMessage() {
691694
assertEquals(Chat.Type.channel, chat.type());
692695
assertNull(message.forwardSenderName());
693696

694-
message = bot.execute(new ForwardMessage(chatId, groupId, 352)).message();
697+
message = bot.execute(new ForwardMessage(chatId, groupId, 352).messageThreadId(0)).message();
695698
assertEquals(MessageEntity.Type.text_mention, message.entities()[0].type());
696699
assertNotNull(message.entities()[0].user());
697700
assertNotNull(message.forwardSenderName());
@@ -700,6 +703,7 @@ public void forwardMessage() {
700703
@Test
701704
public void copyMessage() {
702705
MessageIdResponse response = bot.execute(new CopyMessage(chatId, chatId, forwardMessageId)
706+
.messageThreadId(0)
703707
.caption("new **caption**")
704708
.parseMode(ParseMode.MarkdownV2)
705709
.captionEntities(new MessageEntity(MessageEntity.Type.bold, 0, 1))
@@ -1209,7 +1213,7 @@ public void setChatAdministratorCustomTitle() {
12091213

12101214
@Test
12111215
public void setChatPermissions() {
1212-
for (boolean bool : new boolean[]{true, false}) {
1216+
for (boolean bool : new boolean[]{false, true}) {
12131217
ChatPermissions setPerms = new ChatPermissions();
12141218
setPerms.canSendMessages(bool);
12151219
setPerms.canSendMediaMessages(bool);
@@ -1219,6 +1223,7 @@ public void setChatPermissions() {
12191223
setPerms.canChangeInfo(bool);
12201224
setPerms.canInviteUsers(bool);
12211225
setPerms.canPinMessages(bool);
1226+
setPerms.canManageTopics(bool);
12221227
BaseResponse response = bot.execute(new SetChatPermissions(groupId, setPerms));
12231228
assertTrue(response.isOk());
12241229

@@ -1233,6 +1238,7 @@ public void setChatPermissions() {
12331238
assertFalse(permissions.canChangeInfo());
12341239
assertTrue(permissions.canInviteUsers());
12351240
assertFalse(permissions.canPinMessages());
1241+
assertFalse(permissions.canManageTopics());
12361242
} else {
12371243
assertFalse(permissions.canSendMessages());
12381244
assertFalse(permissions.canSendMediaMessages());
@@ -1242,6 +1248,7 @@ public void setChatPermissions() {
12421248
assertFalse(permissions.canChangeInfo());
12431249
assertFalse(permissions.canInviteUsers());
12441250
assertFalse(permissions.canPinMessages());
1251+
assertFalse(permissions.canManageTopics());
12451252
}
12461253
}
12471254
}
@@ -1492,7 +1499,7 @@ public void sendMediaGroup() {
14921499
new InputMediaVideo(videoFile),
14931500
new InputMediaVideo(videoBytes).caption("my video <b>bold</b>").parseMode(ParseMode.HTML)
14941501
.duration(10).width(11).height(12).supportsStreaming(true)
1495-
));
1502+
).messageThreadId(0));
14961503
assertTrue(response.isOk());
14971504
assertEquals(6, response.messages().length);
14981505

@@ -1768,7 +1775,7 @@ public void sendPollWithKeyboard() {
17681775
public void stopPoll() {
17691776
String question = "Question ?";
17701777
String[] answers = {"Answer 1", "Answer 2"};
1771-
SendResponse sendResponse = bot.execute(new SendPoll(groupId, question, answers));
1778+
SendResponse sendResponse = bot.execute(new SendPoll(groupId, question, answers).messageThreadId(0));
17721779
Integer messageId = sendResponse.message().messageId();
17731780

17741781
PollResponse response = bot.execute(new StopPoll(groupId, messageId));

library/src/test/java/com/pengrad/telegrambot/checks/MessageTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import com.pengrad.telegrambot.model.Message;
44

5-
import static org.junit.Assert.assertNotNull;
6-
import static org.junit.Assert.assertNull;
5+
import static org.junit.Assert.*;
76

87
/**
98
* stas
@@ -33,5 +32,7 @@ public static void checkTextMessage(Message message) {
3332
assertNull(message.pinnedMessage());
3433
assertNull(message.successfulPayment());
3534
assertNull(message.connectedWebsite());
35+
assertNull(message.messageThreadId());
36+
assertFalse(message.isTopicMessage());
3637
}
3738
}

library/src/test/java/com/pengrad/telegrambot/checks/UserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void checkUser(User user, boolean full) {
2121
assertNotNull(user.firstName());
2222
assertNotNull(user.username());
2323
if (full) {
24-
assertNotNull(user.lastName());
24+
// assertNotNull(user.lastName());
2525
assertNotNull(user.languageCode());
2626
}
2727
}

0 commit comments

Comments
 (0)