1 files changed, 25 insertions, 1 deletions
diff --git a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
index d03bd0bf..9f324686 100644
--- a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
+++ b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
@@ -1,5 +1,8 @@
 package com.juick.api.tests;
 
+import com.juick.Message;
+import com.juick.Tag;
+import com.juick.User;
 import com.juick.api.configuration.ApiAppConfiguration;
 import com.juick.api.configuration.ApiMvcConfiguration;
 import com.juick.service.MessagesService;
@@ -12,6 +15,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
+import org.springframework.http.MediaType;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -22,8 +26,12 @@ import org.springframework.web.context.WebApplicationContext;
 import javax.inject.Inject;
 import java.util.Collections;
 
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
@@ -65,6 +73,16 @@ public class MessagesTests {
 
     @Test
     public void messageTests() throws Exception {
+        String ugnichName = "ugnich";
+        String msgText = "Привет, я - Угнич";
+        User user = new User();
+        user.setName(ugnichName);
+        user.setUid(1);
+        Message msg = new Message();
+        msg.setMid(1);
+        msg.setUser(user);
+        msg.setText(msgText);
+        msg.setTags(Collections.singletonList(new Tag("yo")));
         mockMvc.perform(get("/home"))
                 .andExpect(status().is4xxClientError());
         when(userService.getUIDByHttpAuth(null))
@@ -72,8 +90,14 @@ public class MessagesTests {
 
         when(messagesService.getMyFeed(1, 0))
                 .thenReturn(Collections.singletonList(1));
+        when(messagesService.getMessages(Collections.singletonList(1)))
+                .thenReturn(Collections.singletonList(msg));
 
         mockMvc.perform(get("/home"))
-                .andExpect(status().isOk());
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+                .andExpect(jsonPath("$", hasSize(1)))
+                .andExpect(jsonPath("$[0].mid", is(1)))
+                .andExpect(jsonPath("$[0].body", is(msgText)));
     }
 }