diff --git a/.travis.yml b/.travis.yml index 99ab05b..5848c68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: java -before_script: cd telebot -script: mvn test +script: gradle test jdk: - oraclejdk8 - oraclejdk7 diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3b5eaf1 --- /dev/null +++ b/build.gradle @@ -0,0 +1,30 @@ +apply plugin: 'java' +apply plugin: 'maven' + +group = 'com.github.exh3y' + +version = '0.0.5' + +repositories { + mavenCentral() +} + +dependencies { + compile 'com.mashape.unirest:unirest-java:1.4.7' + testCompile 'junit:junit:4.12' +} + +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives sourcesJar + archives javadocJar +} \ No newline at end of file diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..4d5a7a5 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'telebot' diff --git a/telebot/src/main/java/exh3y/telebot/TeleBot.java b/src/main/java/exh3y/telebot/TeleBot.java similarity index 89% rename from telebot/src/main/java/exh3y/telebot/TeleBot.java rename to src/main/java/exh3y/telebot/TeleBot.java index ae70d4a..e3096dc 100644 --- a/telebot/src/main/java/exh3y/telebot/TeleBot.java +++ b/src/main/java/exh3y/telebot/TeleBot.java @@ -23,16 +23,17 @@ public class TeleBot extends Thread { - private final String endpoint; - private final String token; - private final String botName; + private final String endpoint; + private final String token; + private final String botName; - private long pollingIntervall = 1000; + private long pollingIntervall = 1000; - private HashMap actionConnector; - private TelegramActionHandler defaultAction = null; + private HashMap actionConnector; + private TelegramActionHandler defaultAction = null; + private TelegramActionHandler controllerAction = null; - private ArrayList responseHandlers; + private ArrayList responseHandlers; /** *

@@ -50,7 +51,7 @@ public TeleBot(String endpoint, String token) { this.endpoint = endpoint; this.token = token; - String botName = "unknown"; + String botName = null; try { botName = getMe().getBody().getObject().getJSONObject("result").getString("username"); } catch (JSONException | UnirestException e) { @@ -147,8 +148,20 @@ public void unregisterResponseHandler(TelegramResponseHandler handler) { responseHandlers.remove(handler); } - private HttpResponse sendRawRequest(String method, - HashMap parameters) throws UnirestException, InvalidRequestException { + /** + * Registers a single action to be executed on every received message. + * + * @param handler + * The handler to register + * @since 0.0.5 + */ + public void registerControllerAction(TelegramActionHandler handler) { + + controllerAction = handler; + } + + private HttpResponse sendRawRequest(String method, HashMap parameters) + throws UnirestException, InvalidRequestException { HttpResponse response = Unirest.post(endpoint + token + "/" + method).fields(parameters).asJson(); JSONObject jsonResponse = new JSONObject(response.getBody().toString()); @@ -184,8 +197,8 @@ private HttpResponse sendRawRequest(String method, * @since 0.0.4 */ public HttpResponse sendMessage(int chatId, String text, String parseMode, boolean disableWebPagePreview, - boolean disableNotification, int replyToMessageID, - ReplyMarkup replyMarkup) throws UnirestException, InvalidRequestException { + boolean disableNotification, int replyToMessageID, ReplyMarkup replyMarkup) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -229,8 +242,8 @@ public HttpResponse sendMessage(int chatId, String text, String parseM * Thrown if the request was not successful * @since 0.0.1 */ - public HttpResponse sendMessage(int chatId, - String text) throws UnirestException, InvalidRequestException { + public HttpResponse sendMessage(int chatId, String text) + throws UnirestException, InvalidRequestException { return sendMessage(chatId, text, null, false, false, -1, null); } @@ -253,8 +266,8 @@ public HttpResponse sendMessage(int chatId, * @see https:// * core.telegram.org/bots/api#forwardmessage */ - public HttpResponse forwardMessage(int chatId, int fromChatId, boolean disableNotification, - int messageId) throws UnirestException, InvalidRequestException { + public HttpResponse forwardMessage(int chatId, int fromChatId, boolean disableNotification, int messageId) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -287,8 +300,8 @@ public HttpResponse forwardMessage(int chatId, int fromChatId, boolean * Thrown if the request was not successful */ public HttpResponse editMessageText(int chatId, int messageId, String text, String parseMode, - boolean disableWebPagePreview, - InlineKeyboardMarkup replyMarkup) throws UnirestException, InvalidRequestException { + boolean disableWebPagePreview, InlineKeyboardMarkup replyMarkup) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -361,8 +374,8 @@ public HttpResponse editMessageCaption(int chatId, int messageId, Stri * @see * https://core.telegram.org/bots/api#editmessagereplymarkup */ - public HttpResponse editMessageReplyMarkup(int chatId, int messageId, - InlineKeyboardMarkup replyMarkup) throws UnirestException, InvalidRequestException { + public HttpResponse editMessageReplyMarkup(int chatId, int messageId, InlineKeyboardMarkup replyMarkup) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -432,8 +445,8 @@ public HttpResponse sendLocation(int chatId, float latitude, float lon * @see https:// * core.telegram.org/bots/api#sendchataction */ - public HttpResponse sendChatAction(int chatId, - String action) throws UnirestException, InvalidRequestException { + public HttpResponse sendChatAction(int chatId, String action) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -463,8 +476,8 @@ public HttpResponse sendChatAction(int chatId, * @since 0.0.5 */ public HttpResponse sendSontact(int chatId, String phoneNumber, String firstName, String lastName, - boolean disableNotification, int replyToMessageId, - ReplyMarkup replyMarkup) throws UnirestException, InvalidRequestException { + boolean disableNotification, int replyToMessageId, ReplyMarkup replyMarkup) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -517,8 +530,8 @@ public HttpResponse sendSontact(int chatId, String phoneNumber, String * telegram.org/bots/api#sendvenue */ public HttpResponse sendVenue(int chatId, float latitude, float longitude, String title, String address, - String foursquareId, boolean disableNotification, int replyToMessageId, - ReplyMarkup replyMarkup) throws UnirestException, InvalidRequestException { + String foursquareId, boolean disableNotification, int replyToMessageId, ReplyMarkup replyMarkup) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -560,8 +573,8 @@ public HttpResponse sendVenue(int chatId, float latitude, float longit * @see https:// * core.telegram.org/bots/api#kickchatmember */ - public HttpResponse kickChatMember(int chatId, - int userId) throws UnirestException, InvalidRequestException { + public HttpResponse kickChatMember(int chatId, int userId) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -584,8 +597,8 @@ public HttpResponse kickChatMember(int chatId, * @see https:/ * /core.telegram.org/bots/api#unbanchatmember */ - public HttpResponse unbanChatMember(int chatId, - int userId) throws UnirestException, InvalidRequestException { + public HttpResponse unbanChatMember(int chatId, int userId) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("chat_id", chatId); @@ -610,8 +623,8 @@ public HttpResponse unbanChatMember(int chatId, * @see * https://core.telegram.org/bots/api#answercallbackquery */ - public HttpResponse answerCallbackQuery(String callbackQueryId, String text, - boolean showAlert) throws UnirestException, InvalidRequestException { + public HttpResponse answerCallbackQuery(String callbackQueryId, String text, boolean showAlert) + throws UnirestException, InvalidRequestException { HashMap parameters = new HashMap<>(); parameters.put("callback_query_id", callbackQueryId); @@ -706,7 +719,9 @@ public void run() { // Iterate over the messages in the last update JSONObject responseObject = jsonResponse.getJSONObject(i); - + if (controllerAction != null) { + controllerAction.onCommandReceive(-1, responseObject); + } if (responseObject.has("message")) { TelegramMessage message = new TelegramMessage(responseObject.getJSONObject("message")); int chatId = message.getChatId(); diff --git a/telebot/src/main/java/exh3y/telebot/actions/TelegramActionHandler.java b/src/main/java/exh3y/telebot/actions/TelegramActionHandler.java similarity index 84% rename from telebot/src/main/java/exh3y/telebot/actions/TelegramActionHandler.java rename to src/main/java/exh3y/telebot/actions/TelegramActionHandler.java index 14fbb07..6d3bad5 100644 --- a/telebot/src/main/java/exh3y/telebot/actions/TelegramActionHandler.java +++ b/src/main/java/exh3y/telebot/actions/TelegramActionHandler.java @@ -12,7 +12,9 @@ public interface TelegramActionHandler { /** * The main method containing the action to execute. * - * @param responseObject + * @param chatId + * The chat's id + * @param message * The 'message' part of the response object * @since 0.0.1 */ diff --git a/telebot/src/main/java/exh3y/telebot/actions/TelegramResponseHandler.java b/src/main/java/exh3y/telebot/actions/TelegramResponseHandler.java similarity index 100% rename from telebot/src/main/java/exh3y/telebot/actions/TelegramResponseHandler.java rename to src/main/java/exh3y/telebot/actions/TelegramResponseHandler.java diff --git a/telebot/src/main/java/exh3y/telebot/data/InlineKeyboardButton.java b/src/main/java/exh3y/telebot/data/InlineKeyboardButton.java similarity index 100% rename from telebot/src/main/java/exh3y/telebot/data/InlineKeyboardButton.java rename to src/main/java/exh3y/telebot/data/InlineKeyboardButton.java diff --git a/telebot/src/main/java/exh3y/telebot/data/TelegramMessage.java b/src/main/java/exh3y/telebot/data/TelegramMessage.java similarity index 100% rename from telebot/src/main/java/exh3y/telebot/data/TelegramMessage.java rename to src/main/java/exh3y/telebot/data/TelegramMessage.java diff --git a/telebot/src/main/java/exh3y/telebot/data/keyboards/ForceReply.java b/src/main/java/exh3y/telebot/data/keyboards/ForceReply.java similarity index 100% rename from telebot/src/main/java/exh3y/telebot/data/keyboards/ForceReply.java rename to src/main/java/exh3y/telebot/data/keyboards/ForceReply.java diff --git a/telebot/src/main/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkup.java b/src/main/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkup.java similarity index 97% rename from telebot/src/main/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkup.java rename to src/main/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkup.java index 25b8f63..83ff5f5 100644 --- a/telebot/src/main/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkup.java +++ b/src/main/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkup.java @@ -7,7 +7,7 @@ public class InlineKeyboardMarkup extends ReplyMarkup { - private InlineKeyboardButton[][] keyboard; + public InlineKeyboardButton[][] keyboard; /** * Creates a new InlineKeyboardMarkup diff --git a/telebot/src/main/java/exh3y/telebot/data/keyboards/ReplyKeyboardHide.java b/src/main/java/exh3y/telebot/data/keyboards/ReplyKeyboardHide.java similarity index 100% rename from telebot/src/main/java/exh3y/telebot/data/keyboards/ReplyKeyboardHide.java rename to src/main/java/exh3y/telebot/data/keyboards/ReplyKeyboardHide.java diff --git a/telebot/src/main/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkup.java b/src/main/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkup.java similarity index 100% rename from telebot/src/main/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkup.java rename to src/main/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkup.java diff --git a/telebot/src/main/java/exh3y/telebot/data/keyboards/ReplyMarkup.java b/src/main/java/exh3y/telebot/data/keyboards/ReplyMarkup.java similarity index 100% rename from telebot/src/main/java/exh3y/telebot/data/keyboards/ReplyMarkup.java rename to src/main/java/exh3y/telebot/data/keyboards/ReplyMarkup.java diff --git a/telebot/src/main/java/exh3y/telebot/exceptions/InvalidRequestException.java b/src/main/java/exh3y/telebot/exceptions/InvalidRequestException.java similarity index 98% rename from telebot/src/main/java/exh3y/telebot/exceptions/InvalidRequestException.java rename to src/main/java/exh3y/telebot/exceptions/InvalidRequestException.java index bb584f5..6d6dc7c 100644 --- a/telebot/src/main/java/exh3y/telebot/exceptions/InvalidRequestException.java +++ b/src/main/java/exh3y/telebot/exceptions/InvalidRequestException.java @@ -5,6 +5,7 @@ public class InvalidRequestException extends Exception { private static final long serialVersionUID = 8467133742599156579L; public InvalidRequestException() { + } public InvalidRequestException(String message) { diff --git a/src/test/java/exh3y/telebot/TeleBotTest.java b/src/test/java/exh3y/telebot/TeleBotTest.java new file mode 100644 index 0000000..18b0107 --- /dev/null +++ b/src/test/java/exh3y/telebot/TeleBotTest.java @@ -0,0 +1,86 @@ +package exh3y.telebot; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import javax.naming.directory.InvalidAttributesException; + +import org.json.JSONObject; +import org.junit.Test; + +import exh3y.telebot.actions.TelegramActionHandler; +import exh3y.telebot.actions.TelegramResponseHandler; + +public class TeleBotTest implements TelegramActionHandler, TelegramResponseHandler { + + @Test + public void testTeleBotCreation() { + + String apiKey = System.getenv("TelegramApiKey"); + if (apiKey == null) { + apiKey = "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"; + } + + TeleBot bot = new TeleBot(apiKey); + + // Create an invalid bot + new TeleBot("123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"); + } + + @Test + public void testCommandRegistration() { + + String apiKey = System.getenv("TelegramApiKey"); + if (apiKey == null) { + apiKey = "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"; + } + + TeleBot bot = new TeleBot(apiKey); + + try { + bot.registerCommandAction("/test", this); + bot.unregisterCommandAction("/test"); + bot.unregisterCommandAction("/anothercommand"); + bot.registerDefaultTextAction(this); + bot.registerResponseHandler(this); + bot.unregisterResponseHandler(this); + bot.registerControllerAction(this); + } catch (InvalidAttributesException e) { + assertFalse(true); + } + } + + @Test + public void testInvalidCommandRegistration() { + + String apiKey = System.getenv("TelegramApiKey"); + if (apiKey == null) { + apiKey = "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"; + } + + TeleBot bot = new TeleBot(apiKey); + + try { + bot.registerCommandAction("/test", this); + bot.registerCommandAction("/test", this); + } catch (InvalidAttributesException e) { + assertTrue(true); + return; + } + + assertFalse(true); + } + + @Override + public void onCommandReceive(int chatId, JSONObject message) { + + return; + } + + @Override + public void onReceive(JSONObject response) { + + return; + } + +} diff --git a/src/test/java/exh3y/telebot/data/InlineKeyboardButtonTest.java b/src/test/java/exh3y/telebot/data/InlineKeyboardButtonTest.java new file mode 100644 index 0000000..939000c --- /dev/null +++ b/src/test/java/exh3y/telebot/data/InlineKeyboardButtonTest.java @@ -0,0 +1,34 @@ +package exh3y.telebot.data; + +import static org.junit.Assert.*; + +import org.json.JSONObject; +import org.junit.Test; + +public class InlineKeyboardButtonTest { + + @Test + public void testInlineKeyboardButtonCreation() { + + InlineKeyboardButton callbackButton = new InlineKeyboardButton("Some button", null, "data to be sent", null); + InlineKeyboardButton urlButton = new InlineKeyboardButton("Another button", "http://www.example.com", null, + null); + InlineKeyboardButton switchInlineButton = new InlineKeyboardButton("Chat button", null, null, + "let me help you"); + + InlineKeyboardButton defaultButton = new InlineKeyboardButton("Default button"); + + JSONObject callback = new JSONObject(callbackButton.toJSONString()); + assertTrue(callbackButton.getCallbackData().equals(callback.getString("callback_data"))); + + JSONObject url = new JSONObject(urlButton.toJSONString()); + assertTrue(urlButton.getUrl().equals(url.getString("url"))); + + JSONObject switchInline = new JSONObject(switchInlineButton.toJSONString()); + assertTrue(switchInlineButton.getSwitchInlineQuery().equals(switchInline.getString("switch_inline_query"))); + + JSONObject button = new JSONObject(defaultButton.toJSONString()); + assertTrue(defaultButton.getText().equals(button.getString("text"))); + } + +} diff --git a/telebot/src/test/java/exh3y/telebot/data/TelegramMessageTest.java b/src/test/java/exh3y/telebot/data/TelegramMessageTest.java similarity index 70% rename from telebot/src/test/java/exh3y/telebot/data/TelegramMessageTest.java rename to src/test/java/exh3y/telebot/data/TelegramMessageTest.java index 787c68a..ad14a8f 100644 --- a/telebot/src/test/java/exh3y/telebot/data/TelegramMessageTest.java +++ b/src/test/java/exh3y/telebot/data/TelegramMessageTest.java @@ -11,16 +11,28 @@ public class TelegramMessageTest { + private TelegramMessage createTestMessage(JSONObject json) { + + if (json == null) { + json = new JSONObject( + "{\"message_id\":42,\"from\":{\"id\":547885,\"first_name\":\"Some\",\"last_name\":\"User\",\"username\":\"testuser\"},\"chat\":{\"id\":1337,\"first_name\":\"Some\",\"last_name\":\"User\",\"username\":\"testuser\",\"type\":\"private\"},\"date\":1450006107,\"text\":\"This is a test message.\"}"); + } + return new TelegramMessage(json); + + } + @Test public void testMessageCreation() { JSONObject json = new JSONObject( "{\"message_id\":42,\"from\":{\"id\":547885,\"first_name\":\"Some\",\"last_name\":\"User\",\"username\":\"testuser\"},\"chat\":{\"id\":1337,\"first_name\":\"Some\",\"last_name\":\"User\",\"username\":\"testuser\",\"type\":\"private\"},\"date\":1450006107,\"text\":\"This is a test message.\"}"); - TelegramMessage telemessage = new TelegramMessage(json); + + TelegramMessage telemessage = createTestMessage(json); assertTrue(telemessage.getText().equals("This is a test message.")); assertTrue(telemessage.getChatId() == 1337); - + assertTrue(telemessage.getMessageId() == 42); + assertTrue(telemessage.getChatType().equals("private")); } @Test @@ -51,7 +63,7 @@ public void testMessageToCommandArray() { for (int i = 0; i < 10; i++) { - TelegramMessage message = new TelegramMessage(stringGenerator.randomJSONMessage(commandString)); + TelegramMessage message = createTestMessage(stringGenerator.randomJSONMessage(commandString)); String[] commands = message.toCommandArray(); diff --git a/telebot/src/test/java/exh3y/telebot/data/keyboards/ForceReplyTest.java b/src/test/java/exh3y/telebot/data/keyboards/ForceReplyTest.java similarity index 51% rename from telebot/src/test/java/exh3y/telebot/data/keyboards/ForceReplyTest.java rename to src/test/java/exh3y/telebot/data/keyboards/ForceReplyTest.java index 72e865b..6806dfa 100644 --- a/telebot/src/test/java/exh3y/telebot/data/keyboards/ForceReplyTest.java +++ b/src/test/java/exh3y/telebot/data/keyboards/ForceReplyTest.java @@ -9,17 +9,22 @@ public class ForceReplyTest { @Test public void testKeyboardCreation() { - + new ForceReply(false); } - + @Test public void testToJSONString() { - - ForceReply keyboard = new ForceReply(true); - - JSONObject json = new JSONObject(keyboard.toJSONString()); + + ForceReply selectiveKeyboard = new ForceReply(true); + + JSONObject json = new JSONObject(selectiveKeyboard.toJSONString()); assertTrue(json.getBoolean("selective")); + + ForceReply nonSelectiveKeyboard = new ForceReply(false); + + json = new JSONObject(nonSelectiveKeyboard.toJSONString()); + assertFalse(json.optBoolean("selective", false)); } - + } diff --git a/src/test/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkupTest.java b/src/test/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkupTest.java new file mode 100644 index 0000000..a563713 --- /dev/null +++ b/src/test/java/exh3y/telebot/data/keyboards/InlineKeyboardMarkupTest.java @@ -0,0 +1,75 @@ +package exh3y.telebot.data.keyboards; + +import static org.junit.Assert.assertTrue; + +import java.util.Random; + +import org.json.JSONObject; +import org.junit.Test; + +import exh3y.telebot.data.InlineKeyboardButton; +import exh3y.telebot.testutil.StringGenerator; + +public class InlineKeyboardMarkupTest { + + @Test + public void testInlineKeyboardMarkupCreation() { + + StringGenerator gen = new StringGenerator(); + Random rand = new Random(); + + int lenght1 = rand.nextInt(10) + 1; + int lenght2 = rand.nextInt(10) + 1; + + String[][] keyboard = new String[lenght1][lenght2]; + InlineKeyboardButton[][] buttons = new InlineKeyboardButton[lenght1][lenght2]; + + for (int i = 0; i < keyboard.length; i++) { + + for (int j = 0; j < keyboard[i].length; j++) { + + String text = gen.randomString(rand.nextInt(20) + 1, true); + keyboard[i][j] = text; + buttons[i][j] = new InlineKeyboardButton(text); + + } + + } + + InlineKeyboardMarkup keyboardMarkup = new InlineKeyboardMarkup(keyboard); + // TODO: Check if generated markup contains all buttons + + InlineKeyboardMarkup buttonMarkup = new InlineKeyboardMarkup(buttons); + assertTrue(buttonMarkup.keyboard.equals(buttons)); + } + + @Test + public void testToJsonString() { + + StringGenerator gen = new StringGenerator(); + Random rand = new Random(); + + int lenght1 = rand.nextInt(10) + 1; + int lenght2 = rand.nextInt(10) + 1; + + InlineKeyboardButton[][] buttons = new InlineKeyboardButton[lenght1][lenght2]; + + for (int i = 0; i < buttons.length; i++) { + + for (int j = 0; j < buttons[i].length; j++) { + + String text = gen.randomString(rand.nextInt(20) + 1, true); + buttons[i][j] = new InlineKeyboardButton(text); + + } + + } + + InlineKeyboardMarkup buttonMarkup = new InlineKeyboardMarkup(buttons); + JSONObject json = new JSONObject(buttonMarkup.toJSONString()); + + //TODO: Check if json object holds the correct information + + } + +} diff --git a/telebot/src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardHideTest.java b/src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardHideTest.java similarity index 100% rename from telebot/src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardHideTest.java rename to src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardHideTest.java diff --git a/telebot/src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkupTest.java b/src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkupTest.java similarity index 84% rename from telebot/src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkupTest.java rename to src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkupTest.java index 45bc99e..f26c992 100644 --- a/telebot/src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkupTest.java +++ b/src/test/java/exh3y/telebot/data/keyboards/ReplyKeyboardMarkupTest.java @@ -57,19 +57,20 @@ public void testToJSONString() { } - ReplyKeyboardMarkup markup = new ReplyKeyboardMarkup(keyboard); + boolean[][] testValues = { { true, false, false }, { false, true, false }, { false, false, true } }; + + for (int i = 0; i < testValues.length; i++) { + ReplyKeyboardMarkup markup = new ReplyKeyboardMarkup(keyboard, testValues[i][0], testValues[i][1], + testValues[i][2]); - try { JSONObject object = new JSONObject(markup.toJSONString()); JSONArray objectArray = object.getJSONArray("keyboard"); JSONArray actualArray = new JSONArray(keyboard); assertTrue(objectArray.toString().equals(actualArray.toString())); - - } catch (Exception e) { - assertTrue(false); } + } } diff --git a/src/test/java/exh3y/telebot/exceptions/InvalidRequestExceptionTest.java b/src/test/java/exh3y/telebot/exceptions/InvalidRequestExceptionTest.java new file mode 100644 index 0000000..7b70aaf --- /dev/null +++ b/src/test/java/exh3y/telebot/exceptions/InvalidRequestExceptionTest.java @@ -0,0 +1,32 @@ +package exh3y.telebot.exceptions; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class InvalidRequestExceptionTest { + + @Test + public void testInvalidRequestException() { + + try { + + throw new InvalidRequestException(); + } catch (InvalidRequestException e) { + + assertTrue(true); + } + + String message = "This is a message!"; + + try { + + throw new InvalidRequestException(message); + } catch (InvalidRequestException e) { + + assertTrue(e.getMessage().equals(message)); + } + + } + +} diff --git a/telebot/src/test/java/exh3y/telebot/testutil/StringGenerator.java b/src/test/java/exh3y/telebot/testutil/StringGenerator.java similarity index 100% rename from telebot/src/test/java/exh3y/telebot/testutil/StringGenerator.java rename to src/test/java/exh3y/telebot/testutil/StringGenerator.java diff --git a/telebot/pom.xml b/telebot/pom.xml deleted file mode 100644 index e75d082..0000000 --- a/telebot/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - - exh3y - telebot - 0.0.5 - jar - - TeleBot - https://github.com/EXH3Y/TeleBot - - - UTF-8 - 1.7 - 1.7 - - - - - junit - junit - 4.12 - test - - - com.mashape.unirest - unirest-java - 1.4.7 - - - A simple library to create telegram bots. - - https://github.com/EXH3Y/TeleBot/issues - GitHub Issues - - diff --git a/telebot/src/test/java/exh3y/telebot/TeleBotTest.java b/telebot/src/test/java/exh3y/telebot/TeleBotTest.java deleted file mode 100644 index 2f1f968..0000000 --- a/telebot/src/test/java/exh3y/telebot/TeleBotTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package exh3y.telebot; - -import static org.junit.Assert.assertTrue; - -import org.json.JSONObject; -import org.junit.Test; - -import exh3y.telebot.actions.TelegramActionHandler; - -public class TeleBotTest implements TelegramActionHandler { - - @Test - public void testTeleBotCreation() { - - TeleBot bot = new TeleBot("123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"); - try { - bot.registerCommandAction("/test", this); - bot.unregisterCommandAction("/test"); - bot.registerDefaultTextAction(this); - } catch (Exception e) { - assertTrue(false); - } - } - - @Override - public void onCommandReceive(int chatId, JSONObject message) { - - return; - } - -}