Skip to content

Commit d0273c6

Browse files
committed
Fix tests
1 parent 9febea5 commit d0273c6

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.pengrad.telegrambot.model;
22

33
import java.io.Serializable;
4+
import java.util.Objects;
45

56
public class VoiceChatScheduled implements Serializable {
67

@@ -15,13 +16,14 @@ public Integer startDate() {
1516
@Override
1617
public boolean equals(Object o) {
1718
if (this == o) return true;
18-
19-
return o != null && getClass() == o.getClass();
19+
if (o == null || getClass() != o.getClass()) return false;
20+
VoiceChatScheduled that = (VoiceChatScheduled) o;
21+
return Objects.equals(start_date, that.start_date);
2022
}
2123

2224
@Override
2325
public int hashCode() {
24-
return 1;
26+
return Objects.hash(start_date);
2527
}
2628

2729
@Override
@@ -30,5 +32,4 @@ public String toString() {
3032
"start_date=" + start_date +
3133
'}';
3234
}
33-
3435
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void answerShippingQuery() {
5252
String shippingQueryId = shippingQuery.id();
5353
assertFalse(shippingQueryId.isEmpty());
5454
UserTest.checkUser(shippingQuery.from(), true);
55-
assertEquals(Integer.valueOf(12345), shippingQuery.from().id());
55+
assertEquals(Long.valueOf(12345), shippingQuery.from().id());
5656
assertEquals("my_payload", shippingQuery.invoicePayload());
5757

5858
ShippingAddress address = shippingQuery.shippingAddress();
@@ -99,7 +99,7 @@ public void answerPreCheckoutQuery() {
9999
String preCheckoutQueryId = preCheckoutQuery.id();
100100
assertEquals("112233", preCheckoutQueryId);
101101
UserTest.checkUser(preCheckoutQuery.from(), true);
102-
assertEquals(Integer.valueOf(12345), preCheckoutQuery.from().id());
102+
assertEquals(Long.valueOf(12345), preCheckoutQuery.from().id());
103103
assertEquals("USD", preCheckoutQuery.currency());
104104
assertEquals(Integer.valueOf(200), preCheckoutQuery.totalAmount());
105105
assertEquals("my_payload", preCheckoutQuery.invoicePayload());
@@ -141,7 +141,7 @@ public void testSuccessfulPayment() {
141141
assertEquals(Integer.valueOf(14442), message.messageId());
142142
UserTest.checkUser(message.from(), true);
143143
ChatTest.checkChat(message.chat());
144-
assertEquals(Integer.valueOf(12345), message.from().id());
144+
assertEquals(Long.valueOf(12345), message.from().id());
145145
assertEquals(Long.valueOf(12345), message.chat().id());
146146

147147
assertNotNull(payment);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public void answerInline() {
378378
String inlineQueryId = inlineQuery.id();
379379
assertFalse(inlineQueryId.isEmpty());
380380
UserTest.checkUser(inlineQuery.from(), true);
381-
assertEquals(Integer.valueOf(12345), inlineQuery.from().id());
381+
assertEquals(Long.valueOf(12345), inlineQuery.from().id());
382382
assertEquals("if", inlineQuery.query());
383383
assertEquals("offset", inlineQuery.offset());
384384
assertNull(inlineQuery.location());
@@ -462,7 +462,7 @@ public void chosenInlineResult() {
462462
assertNotNull(inlineResult);
463463
assertFalse(inlineResult.resultId().isEmpty());
464464
UserTest.checkUser(inlineResult.from(), true);
465-
assertEquals(Integer.valueOf(12345), inlineResult.from().id());
465+
assertEquals(Long.valueOf(12345), inlineResult.from().id());
466466
assertEquals("hi", inlineResult.query());
467467
assertEquals("1", inlineResult.resultId());
468468
assertNull(inlineResult.inlineMessageId());
@@ -1734,7 +1734,7 @@ public void pollAnswer() {
17341734
assertNotNull(pollAnswer);
17351735
assertFalse(pollAnswer.pollId().isEmpty());
17361736
UserTest.checkUser(pollAnswer.user(), true);
1737-
assertEquals(Integer.valueOf(12345), pollAnswer.user().id());
1737+
assertEquals(Long.valueOf(12345), pollAnswer.user().id());
17381738
assertArrayEquals(new Integer[]{0, 2}, pollAnswer.optionIds());
17391739
}
17401740

0 commit comments

Comments
 (0)