aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-05-13 11:26:18 +0300
committerGravatar Vitaly Takmazov2016-05-13 11:26:18 +0300
commit0713cb62f8abf99252ce9e07c06e40c96f04f3b0 (patch)
treeee324d0871a3e31fd0fee410aef5932fd31c425e
parentec3225703e8b1b3455ab8b38f746c8e539cde241 (diff)
fix merge
-rw-r--r--build.gradle3
-rw-r--r--src/test/java/com/juick/tests/ApiTests.java5
2 files changed, 5 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle
index 84617e95..1cffaf68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,10 @@ dependencies {
compile "org.springframework:spring-jdbc:4.2.6.RELEASE"
providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
compile 'javax.inject:javax.inject:1'
+ compile 'com.github.pengrad:java-telegram-bot-api:2.0.1'
+ compile 'com.neovisionaries:nv-websocket-client:1.27'
runtime 'mysql:mysql-connector-java:5.1.39'
+ testCompile 'junit:junit:4.12'
testRuntime 'com.h2database:h2:1.4.190'
}
compileJava.options.encoding = 'UTF-8'
diff --git a/src/test/java/com/juick/tests/ApiTests.java b/src/test/java/com/juick/tests/ApiTests.java
index 7b0264c0..5bd90509 100644
--- a/src/test/java/com/juick/tests/ApiTests.java
+++ b/src/test/java/com/juick/tests/ApiTests.java
@@ -7,8 +7,7 @@ import com.juick.server.MessagesQueries;
import com.juick.server.SubscriptionsQueries;
import com.juick.server.TagQueries;
import com.juick.server.UserQueries;
-import junit.framework.Assert;
-import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -92,7 +91,7 @@ public class ApiTests {
}
- @Test
+ @Test
public void messageTests() {
int user_id = UserQueries.createUser(jdbc, "me", "secret");
User user = UserQueries.getUserByUID(jdbc, user_id);