From 0713cb62f8abf99252ce9e07c06e40c96f04f3b0 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 13 May 2016 11:26:18 +0300 Subject: fix merge --- src/test/java/com/juick/tests/ApiTests.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/juick') 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); -- cgit v1.2.3