From 5789f0321eca329bec9afdb8923f323cb6702f52 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 12 May 2017 16:53:50 +0300 Subject: fix tests configurations --- .../src/test/java/com/juick/api/tests/MessagesTests.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'juick-api/src') 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 af1e49a4..a892656b 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 @@ -3,6 +3,7 @@ package com.juick.api.tests; import com.juick.Message; import com.juick.Tag; import com.juick.User; +import com.juick.api.TGBot; import com.juick.api.configuration.ApiMvcConfiguration; import com.juick.api.configuration.ApiSecurityConfig; import com.juick.api.configuration.MessengerConfiguration; @@ -16,6 +17,8 @@ import com.juick.tests.util.MockUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.http.MediaType; @@ -26,6 +29,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.socket.client.WebSocketConnectionManager; import javax.inject.Inject; import java.util.*; @@ -47,7 +51,16 @@ public class MessagesTests { @Configuration @Import(value = {ApiMvcConfiguration.class, ApiSecurityConfig.class, MockDataConfiguration.class, MessengerConfiguration.class, TelegramConfiguration.class}) - static class Config {} + static class Config { + @Bean + WebSocketConnectionManager connectionManager() { + return Mockito.mock(WebSocketConnectionManager.class); + } + @Bean + TGBot tgBot() { + return Mockito.mock(TGBot.class); + } + } private MockMvc mockMvc; @Inject -- cgit v1.2.3