1 files changed, 20 insertions, 2 deletions
diff --git a/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java b/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
index 64de9424..738a1250 100644
--- a/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
+++ b/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
@@ -17,17 +17,22 @@
 
 package com.juick.service;
 
+import com.juick.Message;
+import com.juick.User;
 import com.juick.configuration.RepositoryConfiguration;
 import com.juick.server.helpers.AnonymousUser;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
 import javax.inject.Inject;
+import java.time.ZoneId;
 import java.util.List;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
 
 /**
  * Created by aalexeev on 11/25/16.
@@ -43,10 +48,14 @@ public class MessageServiceTest extends AbstractJUnit4SpringContextTests {
 
     int ugnichId, freefdId, mid;
 
-    @Test
-    public void getMyFeed() {
+    @Before
+    public void createUgniches() {
         ugnichId = userService.createUser("ugnich", "secret");
         freefdId = userService.createUser("freefd", "secret");
+    }
+
+    @Test
+    public void getMyFeed() {
         mid = messagesService.createMessage(ugnichId, "test", null, null);
         int mid2 = messagesService.createMessage(ugnichId, "test2", null, null);
         subscriptionService.subscribeUser(userService.getUserByUID(freefdId).orElse(AnonymousUser.INSTANCE),
@@ -65,5 +74,14 @@ public class MessageServiceTest extends AbstractJUnit4SpringContextTests {
         assertThat(messagesService.recommendMessage(mid, ugnichId), equalTo(false));
         assertThat(messagesService.getMessage(mid).getLikes(), equalTo(0));
         assertThat(messagesService.getAll(ugnichId, 0).size(), equalTo(3));
+
+        User ugnich = userService.getUserByUID(ugnichId).orElse(AnonymousUser.INSTANCE);
+        User freefd = userService.getUserByUID(freefdId).orElse(AnonymousUser.INSTANCE);
+        int mid = messagesService.createMessage(ugnichId, "yo", null, null);
+        subscriptionService.subscribeMessage(mid, freefdId);
+        int rid = messagesService.createReply(mid, 0, ugnichId, "yo", null);
+        Message reply = messagesService.getReply(mid, rid);
+        assertThat(messagesService.getNotifications(freefd, null).size(), is(1));
+        assertThat(messagesService.getNotifications(freefd, reply.getTimestamp().atZone(ZoneId.systemDefault()).toLocalDateTime()).size(), is(0));
     }
 }