Fix tests

Author: pengrad

library/src/main/java/com/pengrad/telegrambot/model/request/ForceReply.java

@@ -10,7 +10,7 @@ public class ForceReply extends Keyboard implements Serializable {
     private final static long serialVersionUID = 0L;
 
     private final boolean force_reply = true;
-    private String input_field_placeholder = "";
+    private String input_field_placeholder;
     private boolean selective = false;
 
     public ForceReply() {
@@ -21,12 +21,13 @@ public ForceReply(boolean selective) {
         this.selective = selective;
     }
 
-    // API v5.3 - added field input_field_placeholder
-    public ForceReply(boolean selective, String input_field_placeholder) {
-        this.selective = selective;
-        this.input_field_placeholder = input_field_placeholder;
+    public ForceReply inputFieldPlaceholder(String inputFieldPlaceholder) {
+        this.input_field_placeholder = inputFieldPlaceholder;
+        return this;
     }
-    public ForceReply(String input_field_placeholder) {
-        this.input_field_placeholder = input_field_placeholder;
+
+    public ForceReply selective(boolean selective) {
+        this.selective = selective;
+        return this;
     }
 }

library/src/main/java/com/pengrad/telegrambot/model/request/ReplyKeyboardMarkup.java

@@ -18,17 +18,6 @@ public class ReplyKeyboardMarkup extends Keyboard implements Serializable {
     private String input_field_placeholder;
     private boolean selective;
 
-    public ReplyKeyboardMarkup(String[][] keyboard, boolean resize_keyboard, boolean one_time_keyboard, boolean selective) {
-        this.keyboard = new ArrayList<>();
-        this.resize_keyboard = resize_keyboard;
-        this.one_time_keyboard = one_time_keyboard;
-        this.selective = selective;
-        for (String[] line : keyboard) {
-            addRow(line);
-        }
-    }
-
-    // API v5.3 - added input_field_placeholder
     public ReplyKeyboardMarkup(String[][] keyboard, boolean resize_keyboard, boolean one_time_keyboard, String input_field_placeholder, boolean selective) {
         this.keyboard = new ArrayList<>();
         this.resize_keyboard = resize_keyboard;
@@ -40,6 +29,10 @@ public ReplyKeyboardMarkup(String[][] keyboard, boolean resize_keyboard, boolean
         }
     }
 
+    public ReplyKeyboardMarkup(String[][] keyboard, boolean resize_keyboard, boolean one_time_keyboard, boolean selective) {
+        this(keyboard, resize_keyboard, one_time_keyboard, null, selective);
+    }
+
     public ReplyKeyboardMarkup(String[]... keyboard) {
         this(keyboard, false, false, false);
     }

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

@@ -593,7 +593,7 @@ public void getChatMemberCount() {
 
     @Test
     public void getUserProfilePhotos() {
-        int offset = 1;
+        int offset = 0;
         GetUserProfilePhotosResponse response = bot.execute(new GetUserProfilePhotos(chatId).limit(100).offset(offset));
         UserProfilePhotos photos = response.photos();
         assertEquals(photos.totalCount() - offset, photos.photos().length);
@@ -609,7 +609,9 @@ public void getUserProfilePhotos() {
 
     @Test
     public void sendMessage() {
-        SendResponse sendResponse = bot.execute(new SendMessage(chatId, "reply this message").replyMarkup(new ForceReply()));
+        SendResponse sendResponse = bot.execute(new SendMessage(chatId, "reply this message").replyMarkup(
+                new ForceReply().inputFieldPlaceholder("input-placeholder").selective(true)
+        ));
         MessageTest.checkTextMessage(sendResponse.message());
         assertNotNull(sendResponse.message().from());
 
@@ -629,6 +631,7 @@ public void sendMessage() {
                         new KeyboardButton("location").requestLocation(true))
                         .oneTimeKeyboard(true)
                         .resizeKeyboard(true)
+                        .inputFieldPlaceholder("input-placeholder")
                         .selective(true)));
         MessageTest.checkTextMessage(sendResponse.message());
 
@@ -859,8 +862,8 @@ public void sendDocument() {
         String caption = "caption <b>bold</b>", fileName = "my doc.zip";
         ParseMode parseMode = ParseMode.HTML;
         message = bot.execute(
-                new SendDocument(chatId, docFile).fileName(fileName).thumb(thumbFile).caption(caption).parseMode(parseMode)
-                        .disableContentTypeDetection(true))
+                        new SendDocument(chatId, docFile).fileName(fileName).thumb(thumbFile).caption(caption).parseMode(parseMode)
+                                .disableContentTypeDetection(true))
                 .message();
         MessageTest.checkMessage(message);
         DocumentTest.check(message.document());
@@ -932,9 +935,9 @@ public void sendVideo() {
         String caption = "caption <b>bold</b>";
         int duration = 100;
         message = bot.execute(
-                new SendVideo(chatId, videoBytes).thumb(thumbBytes)
-                        .caption(caption).parseMode(ParseMode.HTML)
-                        .duration(duration).height(1).width(2).supportsStreaming(true))
+                        new SendVideo(chatId, videoBytes).thumb(thumbBytes)
+                                .caption(caption).parseMode(ParseMode.HTML)
+                                .duration(duration).height(1).width(2).supportsStreaming(true))
                 .message();
         MessageTest.checkMessage(message);
         assertEquals(caption.replace("<b>", "").replace("</b>", ""), message.caption());