From fa025754c5475cc59bc1f2fd9b471d63b750a528 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 18 Sep 2018 17:54:11 +0300
Subject: fix xmpp test

---
 .../server/configuration/ApiAppConfiguration.java  | 17 -------------
 .../com/juick/server/configuration/XMPPConfig.java | 28 ++++++++++++++++++++++
 .../java/com/juick/server/tests/ServerTests.java   |  4 +++-
 3 files changed, 31 insertions(+), 18 deletions(-)

(limited to 'juick-server/src')

diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
index 619aeff8..ac321dcc 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
@@ -83,21 +83,4 @@ public class ApiAppConfiguration implements WebMvcConfigurer, WebSocketConfigure
     AbstractRssFeedView repliesView() {
         return new RepliesView();
     }
-    @Value("${hostname:localhost}")
-    private String hostname;
-    @Bean
-    public BasicXmppSession session() {
-        XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
-                .extensions(Extension.of(com.juick.Message.class), Extension.of(MessageQuery.class))
-                .debugger(LogbackDebugger.class)
-                .defaultResponseTimeout(Duration.ofMillis(120000))
-                .build();
-        return BasicXmppSession.create(hostname, configuration);
-    }
-    @Bean
-    public static ConversionService conversionService() {
-        DefaultFormattingConversionService cs = new DefaultFormattingConversionService();
-        cs.addConverter(new JidConverter());
-        return cs;
-    }
 }
diff --git a/juick-server/src/main/java/com/juick/server/configuration/XMPPConfig.java b/juick-server/src/main/java/com/juick/server/configuration/XMPPConfig.java
index e1115c7e..2feef286 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/XMPPConfig.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/XMPPConfig.java
@@ -2,15 +2,43 @@ package com.juick.server.configuration;
 
 import com.juick.server.XMPPConnection;
 import com.juick.server.XMPPServer;
+import com.juick.server.xmpp.JidConverter;
+import com.juick.server.xmpp.iq.MessageQuery;
 import com.juick.server.xmpp.router.XMPPRouter;
+import com.juick.server.xmpp.s2s.BasicXmppSession;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.format.support.DefaultFormattingConversionService;
+import rocks.xmpp.core.session.Extension;
+import rocks.xmpp.core.session.XmppSessionConfiguration;
+import rocks.xmpp.core.session.debug.LogbackDebugger;
+
+import java.time.Duration;
 
 @Configuration
 @ConditionalOnProperty("xmppbot_jid")
 public class XMPPConfig {
+    @Value("${hostname:localhost}")
+    private String hostname;
+    @Bean
+    public BasicXmppSession session() {
+        XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
+                .extensions(Extension.of(com.juick.Message.class), Extension.of(MessageQuery.class))
+                .debugger(LogbackDebugger.class)
+                .defaultResponseTimeout(Duration.ofMillis(120000))
+                .build();
+        return BasicXmppSession.create(hostname, configuration);
+    }
+    @Bean
+    public static ConversionService conversionService() {
+        DefaultFormattingConversionService cs = new DefaultFormattingConversionService();
+        cs.addConverter(new JidConverter());
+        return cs;
+    }
     @Bean
     public XMPPServer xmppServer() {
         return new XMPPServer();
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index 8c3e6a01..54645f44 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -133,7 +133,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @TestPropertySource(properties = {
         "broken_ssl_hosts=localhost,serverstorageisfull.tld",
         "ios_app_id=12345678.com.juick.ExampleApp",
-        "xmppbot_jid=juick@localhost/Juick"
+        "xmppbot_jid=juick@localhost/Juick",
+        "hostname=localhost",
+        "componentname=localhost"
 })
 @AutoConfigureMockMvc
 public class ServerTests {
-- 
cgit v1.2.3