aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/com
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-01-14 13:16:40 +0300
committerGravatar Vitaly Takmazov2016-01-14 13:16:40 +0300
commit5c207f65b0cafbaa0cbdae72a5a485cf7aa62556 (patch)
tree60c303f317236c2caab896173fafdaff1eebb115 /src/test/java/com
parent38013dd67292fa186e3a07d098bc9a484ea2bd0f (diff)
parentee86970fcae9878af0adcad00cf5333647b8babf (diff)
Merge branch 'develop' of ssh://den.jabber.ru:2205/var/lib/git/com.juick.api into develop
Diffstat (limited to 'src/test/java/com')
-rw-r--r--src/test/java/com/juick/tests/JsonTests.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/java/com/juick/tests/JsonTests.java b/src/test/java/com/juick/tests/JsonTests.java
index c99432a6..35854171 100644
--- a/src/test/java/com/juick/tests/JsonTests.java
+++ b/src/test/java/com/juick/tests/JsonTests.java
@@ -14,6 +14,7 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
public class JsonTests {
@@ -40,10 +41,10 @@ public class JsonTests {
@Test
public void CompareSerializers() {
- ArrayList<Integer> mids = MessagesQueries.getMyFeed(sql, 3694, 2799786);
+ List<Integer> mids = MessagesQueries.getMyFeed(sql, 3694, 2799786);
MessageSerializer messageSerializer = new MessageSerializer();
if (mids != null && !mids.isEmpty()) {
- ArrayList<com.juick.Message> msgs = MessagesQueries.getMessages(sql, mids);
+ List<com.juick.Message> msgs = MessagesQueries.getMessages(sql, mids);
if (msgs != null && !msgs.isEmpty()) {
String json = messageSerializer.serializeList(msgs);
try {