Update tests

Author: pengrad

src/main/java/com/pengrad/telegrambot/model/CallbackQuery.java

@@ -11,6 +11,7 @@ public class CallbackQuery {
     private Message message;
     private String inline_message_id;
     private String data;
+    private String game_short_name;
 
     public String id() {
         return id;
@@ -32,20 +33,24 @@ public String data() {
         return data;
     }
 
+    public String gameShortName() {
+        return game_short_name;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
         CallbackQuery that = (CallbackQuery) o;
 
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (from != null ? !from.equals(that.from) : that.from != null) return false;
+        if (!id.equals(that.id)) return false;
+        if (!from.equals(that.from)) return false;
         if (message != null ? !message.equals(that.message) : that.message != null) return false;
         if (inline_message_id != null ? !inline_message_id.equals(that.inline_message_id) : that.inline_message_id != null)
             return false;
-        return data != null ? data.equals(that.data) : that.data == null;
-
+        if (data != null ? !data.equals(that.data) : that.data != null) return false;
+        return game_short_name != null ? game_short_name.equals(that.game_short_name) : that.game_short_name == null;
     }
 
     @Override
@@ -61,6 +66,7 @@ public String toString() {
                 ", message=" + message +
                 ", inline_message_id='" + inline_message_id + '\'' +
                 ", data='" + data + '\'' +
+                ", game_short_name='" + game_short_name + '\'' +
                 '}';
     }
 }

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

@@ -1,9 +1,6 @@
 package com.pengrad.telegrambot;
 
-import com.pengrad.telegrambot.model.ChatMember;
-import com.pengrad.telegrambot.model.InlineQuery;
-import com.pengrad.telegrambot.model.Message;
-import com.pengrad.telegrambot.model.Update;
+import com.pengrad.telegrambot.model.*;
 import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
 import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
 import com.pengrad.telegrambot.model.request.InlineQueryResult;
@@ -68,7 +65,7 @@ public void getMe() {
 
     @Test
     public void getUpdates() {
-        GetUpdatesResponse response = bot.execute(new GetUpdates().offset(279823236).timeout(25));
+        GetUpdatesResponse response = bot.execute(new GetUpdates().offset(279823304).timeout(25));
         System.out.println(response);
     }
 
@@ -96,10 +93,15 @@ public void answerInline() {
 
         String inlineQueryId = lastInlineQuery.id();
 
-        InlineKeyboardMarkup keyboardMarkup = new InlineKeyboardMarkup(new InlineKeyboardButton[]{new InlineKeyboardButton("inline ok").callbackData("callback ok"), new InlineKeyboardButton("inline cancel").callbackData("callback cancel")});
+        InlineKeyboardMarkup keyboardMarkup = new InlineKeyboardMarkup(
+                new InlineKeyboardButton[]{
+                        new InlineKeyboardButton("inline game").callbackGame("pengrad_test_game"),
+                        new InlineKeyboardButton("inline ok").callbackData("callback ok")
+
+                });
+
         InlineQueryResult r1 = new InlineQueryResultArticle("1", "title", "message").replyMarkup(keyboardMarkup);
-        InlineQueryResult r2 = new InlineQueryResultArticle("2", "2 title", "2 message").replyMarkup(keyboardMarkup);
-        bot.execute(new AnswerInlineQuery(inlineQueryId, r1, r2));
+        bot.execute(new AnswerInlineQuery(inlineQueryId, r1));
     }
 
     private InlineQuery getLastInlineQuery() {
@@ -116,7 +118,26 @@ private InlineQuery getLastInlineQuery() {
 
     @Test
     public void answerCallback() {
-        bot.execute(new AnswerCallbackQuery("220392309269028729").text("answer callback"));
+        CallbackQuery callbackQuery = getLastCallbackQuery();
+        if (callbackQuery == null) return;
+
+        System.out.println(callbackQuery);
+
+        bot.execute(new AnswerCallbackQuery(callbackQuery.id())
+                .text("answer callback")
+                .url("https://telegram.me/pengrad_test_bot?start=callback"));
+    }
+
+    private CallbackQuery getLastCallbackQuery() {
+        GetUpdatesResponse updatesResponse = bot.execute(new GetUpdates());
+        List<Update> updates = updatesResponse.updates();
+        Collections.reverse(updates);
+        for (Update update : updates) {
+            if (update.callbackQuery() != null) {
+                return update.callbackQuery();
+            }
+        }
+        return null;
     }
 
     @Test