boot: simplify test configuration

17 files changed, 41 insertions, 420 deletions

diff --git a/build.gradle b/build.gradle
index 89ffeb42..26bde551 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,9 @@ allprojects {
         maven { url "https://jitpack.io" }
         maven { url "https://repository.apache.org/content/repositories/snapshots/" }
     }
+    apply plugin: 'java'
+    apply plugin: 'org.springframework.boot'
+    apply plugin: 'io.spring.dependency-management'
     apply plugin: 'com.github.ben-manes.versions'
     dependencyUpdates.resolutionStrategy = {
         componentSelection { rules ->
@@ -23,11 +26,6 @@ allprojects {
 project.ext {
     springBootVersion = '2.0.0.RELEASE'
     jacksonVersion = '2.9.4'
-    slf4jVersion = '1.7.25'
-    logbackVersion = '1.2.3'
-    junitVersion = "4.12"
-    hamcrestVersion= "1.3"
-    mockitoVersion = "2.+"
 }
 
 buildscript {
@@ -40,13 +38,13 @@ buildscript {
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
     }
 }
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
 
 repositories {
     jcenter()
 }
+dependencyManagement {
+    imports { mavenBom("org.springframework.boot:spring-boot-dependencies:${rootProject.springBootVersion}") }
+}
 dependencies {
     testCompile project(':juick-core')
     testCompile project(':juick-www')
@@ -57,10 +55,6 @@ dependencies {
     testCompile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}"
     compile("org.springframework.boot:spring-boot-starter-jdbc")
     compile("org.springframework.boot:spring-boot-starter-test")
-    testCompile "org.slf4j:slf4j-api:${slf4jVersion}"
-    testCompile "junit:junit:${junitVersion}"
-    testCompile "org.hamcrest:hamcrest-all:${hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:${mockitoVersion}"
     testRuntime "mysql:mysql-connector-java:5.1.40"
     testRuntime "org.postgresql:postgresql:42.2.1"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8941bfbb..568c50bf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
diff --git a/juick-core/build.gradle b/juick-core/build.gradle
index 913463c2..2df3f402 100644
--- a/juick-core/build.gradle
+++ b/juick-core/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'java'
-
 dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
     compile 'org.apache.commons:commons-lang3:3.7'
@@ -10,28 +8,10 @@ dependencies {
 
     compile 'com.google.code.findbugs:jsr305:3.0.2'
 
+    testCompile("org.springframework.boot:spring-boot-starter-test")
     testCompile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
     testCompile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
     testCompile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
     testCompile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.jacksonVersion}"
-    testCompile "junit:junit:${rootProject.junitVersion}"
-    testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
     testCompile "rocks.xmpp:xmpp-core-client:0.7.5"
 }
-
-compileJava.options.encoding = 'UTF-8'
-
-configurations {
-    all*.exclude module: 'commons-logging'
-}
-
-configurations {
-    testArtifacts.extendsFrom testRuntime
-}
-task testJar(type: Jar) {
-    classifier "test"
-    from sourceSets.test.output
-}
-artifacts {
-    testArtifacts testJar
-}
diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle
index a8596755..688111a6 100644
--- a/juick-notifications/build.gradle
+++ b/juick-notifications/build.gradle
@@ -7,10 +7,7 @@ dependencies {
     compile project(':juick-server-web')
     compile 'com.ganyo:gcm-server:1.1.0'
     compile 'com.turo:pushy:0.12.0'
-
-    testCompile "junit:junit:${rootProject.junitVersion}"
-    testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:${rootProject.mockitoVersion}"
+    testCompile("org.springframework.boot:spring-boot-starter-test")
 }
 
 compileJava.options.encoding = 'UTF-8'
diff --git a/juick-server-core/build.gradle b/juick-server-core/build.gradle
index 22adbb66..a03f88da 100644
--- a/juick-server-core/build.gradle
+++ b/juick-server-core/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'java'
 apply plugin: 'war'
 
 sourceCompatibility = 1.8
@@ -6,7 +5,6 @@ sourceCompatibility = 1.8
 dependencies {
     compile project(':juick-core')
 
-    compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}"
     compile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
@@ -21,14 +19,5 @@ dependencies {
     compile "rocks.xmpp:xmpp-extensions-client:0.7.5"
 
     compile "javax.inject:javax.inject:1"
-
-    testCompile "junit:junit:${rootProject.junitVersion}"
-    testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:${rootProject.mockitoVersion}"
-}
-
-compileJava.options.encoding = 'UTF-8'
-
-configurations {
-    all*.exclude module: 'commons-logging'
+    testCompile("org.springframework.boot:spring-boot-starter-test")
 }
diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index f17398b6..84b14c93 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -12,15 +12,6 @@ dependencies {
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.jacksonVersion}"
 
-    compile "ch.qos.logback:logback-classic:${rootProject.logbackVersion}"
-    compile "ch.qos.logback:logback-core:${rootProject.logbackVersion}"
-    compile "ch.qos.logback:logback-access:${rootProject.logbackVersion}"
-
-    compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}"
-    compile "org.slf4j:jcl-over-slf4j:${rootProject.slf4jVersion}"
-    compile "org.slf4j:log4j-over-slf4j:${rootProject.slf4jVersion}"
-    compile "org.slf4j:jul-to-slf4j:${rootProject.slf4jVersion}"
-
     compile "org.apache.commons:commons-lang3:3.7"
     compile "org.apache.commons:commons-collections4:4.1"
 
@@ -31,38 +22,12 @@ dependencies {
     compile "javax.inject:javax.inject:1"
 
     compile 'org.imgscalr:imgscalr-lib:4.2'
-
     compile 'com.h2database:h2:1.4.196'
     runtime 'mysql:mysql-connector-java:5.1.40'
 
     runtime "commons-fileupload:commons-fileupload:1.3.3"
-
-    testCompile project(path: ':juick-core', configuration: 'testArtifacts')
-    testCompile "junit:junit:${rootProject.junitVersion}"
-    testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:${rootProject.mockitoVersion}"
     testCompile("org.springframework.boot:spring-boot-starter-test")
 
     testRuntime "mysql:mysql-connector-java:5.1.40"
-    testRuntime "org.postgresql:postgresql:42.2.1"
-}
-dependencyManagement {
-    imports { mavenBom("org.springframework.boot:spring-boot-dependencies:${rootProject.springBootVersion}") }
-}
-
-compileJava.options.encoding = 'UTF-8'
-
-configurations {
-    all*.exclude module: 'commons-logging'
-}
-
-configurations {
-    testArtifacts.extendsFrom testRuntime
-}
-task testJar(type: Jar) {
-    classifier "test"
-    from sourceSets.test.output
-}
-artifacts {
-    testArtifacts testJar
+    testRuntime "org.postgresql:postgresql:42.2.2"
 }
diff --git a/juick-server-jdbc/src/test/java/com/juick/configuration/MockDataConfiguration.java b/juick-server-jdbc/src/test/java/com/juick/configuration/MockDataConfiguration.java
deleted file mode 100644
index 65c12d30..00000000
--- a/juick-server-jdbc/src/test/java/com/juick/configuration/MockDataConfiguration.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.configuration;
-
-import com.juick.service.*;
-import org.mockito.Mockito;
-import org.mockito.NotExtensible;
-import org.springframework.context.annotation.Bean;
-
-/**
- * Created by vitalyster on 12.01.2017.
- */
-public class MockDataConfiguration {
-    @Bean
-    MessagesService messagesService() {
-        return Mockito.mock(MessagesService.class);
-    }
-    @Bean
-    UserService userService() {
-        return Mockito.mock(UserService.class);
-    }
-    @Bean
-    TagService tagService() {
-        return Mockito.mock(TagService.class);
-    }
-    @Bean
-    PushQueriesService pushQueriesService() {
-        return Mockito.mock(PushQueriesService.class);
-    }
-    @Bean
-    SubscriptionService subscriptionService() {
-        return Mockito.mock(SubscriptionService.class);
-    }
-    @Bean
-    PMQueriesService pmQueriesService() {
-        return Mockito.mock(PMQueriesService.class);
-    }
-    @Bean
-    TelegramService telegramService() {
-        return Mockito.mock(TelegramService.class);
-    }
-    @Bean
-    CrosspostService crosspostService() {
-        return Mockito.mock(CrosspostService.class);
-    }
-    @Bean
-    EmailService emailService() {
-        return Mockito.mock(EmailService.class);
-    }
-    @Bean
-    ShowQueriesService showQueriesService() {
-        return Mockito.mock(ShowQueriesService.class);
-    }
-    @Bean
-    PrivacyQueriesService privacyQueriesService() {
-        return Mockito.mock(PrivacyQueriesService.class);
-    }
-}
diff --git a/juick-server-jdbc/src/test/java/com/juick/configuration/MockStorageConfiguration.java b/juick-server-jdbc/src/test/java/com/juick/configuration/MockStorageConfiguration.java
deleted file mode 100644
index bfaa26b9..00000000
--- a/juick-server-jdbc/src/test/java/com/juick/configuration/MockStorageConfiguration.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.juick.configuration;
-
-import com.juick.service.ImagesService;
-import com.juick.service.MockImagesService;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MockStorageConfiguration {
-    @Bean
-    public ImagesService imagesService() {
-        return new MockImagesService();
-    }
-}
diff --git a/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java b/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java
deleted file mode 100644
index 4541da94..00000000
--- a/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.configuration;
-
-import com.juick.service.ImagesService;
-import com.juick.service.MockImagesService;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Created by aalexeev on 11/25/16.
- */
-@Configuration
-public class RepositoryConfiguration {
-    @Bean
-    public ImagesService imagesService() {
-        return new MockImagesService();
-    }
-}
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 b082bfd1..4ef06789 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
@@ -21,7 +21,6 @@ import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.configuration.DataConfiguration;
-import com.juick.configuration.RepositoryConfiguration;
 import com.juick.server.helpers.AnonymousUser;
 import com.juick.server.helpers.TagStats;
 import com.juick.util.MessageUtils;
@@ -29,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertEquals;
  * Created by aalexeev on 11/25/16.
  */
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = { DataConfiguration.class, RepositoryConfiguration.class })
+@ContextConfiguration(classes = { DataConfiguration.class })
 public class MessageServiceTest extends AbstractJUnit4SpringContextTests {
     @Inject
     private MessagesService messagesService;
@@ -71,6 +71,9 @@ public class MessageServiceTest extends AbstractJUnit4SpringContextTests {
     @Inject
     private EmailService emailService;
 
+    @MockBean
+    private ImagesService imagesService;
+
     static int ugnichId, freefdId, mid;
 
     private static boolean setUpIsDone = false;
diff --git a/juick-server-jdbc/src/test/java/com/juick/service/MockImagesService.java b/juick-server-jdbc/src/test/java/com/juick/service/MockImagesService.java
deleted file mode 100644
index 33cc1243..00000000
--- a/juick-server-jdbc/src/test/java/com/juick/service/MockImagesService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.juick.service;
-
-import com.juick.Attachment;
-import com.juick.Message;
-import com.juick.Photo;
-import org.springframework.util.StringUtils;
-
-public class MockImagesService implements ImagesService {
-    @Override
-    public void setAttachmentMetadata(String imgDir, String baseUrl, Message msg) throws Exception {
-        if (!StringUtils.isEmpty(msg.getAttachmentType())) {
-            Photo photo = new Photo();
-            if (msg.getRid()> 0) {
-                photo.setSmall(String.format("%sphotos-512/%d-%d.%s", baseUrl, msg.getMid(), msg.getRid(), msg.getAttachmentType()));
-                photo.setMedium(String.format("%sphotos-1024/%d-%d.%s", baseUrl, msg.getMid(), msg.getRid(), msg.getAttachmentType()));
-                photo.setThumbnail(String.format("%sps/%d-%d.%s", baseUrl, msg.getMid(), msg.getRid(), msg.getAttachmentType()));
-            } else {
-                photo.setSmall(String.format("%sphotos-512/%d.%s", baseUrl, msg.getMid(), msg.getAttachmentType()));
-                photo.setMedium(String.format("%sphotos-1024/%d.%s", baseUrl, msg.getMid(), msg.getAttachmentType()));
-                photo.setThumbnail(String.format("%sps/%d.%s", baseUrl, msg.getMid(), msg.getAttachmentType()));
-            }
-            msg.setPhoto(photo);
-            StringBuilder builder = new StringBuilder();
-            builder.append(baseUrl);
-            builder.append(msg.getAttachmentType().equals("mp4") ? "video" : "p");
-            builder.append("/").append(msg.getMid());
-            if (msg.getRid() > 0) {
-                builder.append("-").append(msg.getRid());
-            }
-            builder.append(".").append(msg.getAttachmentType());
-            String originalUrl =  builder.toString();
-
-            Attachment original = new Attachment();
-            original.setUrl(originalUrl);
-            original.setHeight(2048);
-            original.setWidth(2048);
-
-            Attachment medium = new Attachment();
-            medium.setUrl(photo.getMedium());
-            medium.setWidth(1024);
-            medium.setHeight(1024);
-            original.setMedium(medium);
-
-            Attachment small = new Attachment();
-            small.setUrl(photo.getSmall());
-            small.setWidth(1024);
-            small.setHeight(1024);
-            original.setSmall(small);
-
-            Attachment thumb = new Attachment();
-            thumb.setUrl(photo.getMedium());
-            thumb.setWidth(1024);
-            thumb.setHeight(1024);
-            original.setThumbnail(thumb);
-
-            msg.setAttachment(original);
-        }
-    }
-}
diff --git a/juick-server-web/build.gradle b/juick-server-web/build.gradle
index 0cf63313..390b8e5a 100644
--- a/juick-server-web/build.gradle
+++ b/juick-server-web/build.gradle
@@ -1,8 +1,3 @@
-apply plugin: 'java'
-apply plugin: 'io.spring.dependency-management'
-
-sourceCompatibility = 1.8
-
 dependencies {
     compile project(':juick-server-core')
     compile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
@@ -11,15 +6,6 @@ dependencies {
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.jacksonVersion}"
 
-    compile "ch.qos.logback:logback-classic:${rootProject.logbackVersion}"
-    compile "ch.qos.logback:logback-core:${rootProject.logbackVersion}"
-    compile "ch.qos.logback:logback-access:${rootProject.logbackVersion}"
-
-    compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}"
-    compile "org.slf4j:jcl-over-slf4j:${rootProject.slf4jVersion}"
-    compile "org.slf4j:log4j-over-slf4j:${rootProject.slf4jVersion}"
-    compile "org.slf4j:jul-to-slf4j:${rootProject.slf4jVersion}"
-
     compile 'com.github.ben-manes.caffeine:caffeine:2.6.2'
     compile("org.springframework.boot:spring-boot-starter-cache")
     compile("org.springframework.boot:spring-boot-starter-web")
@@ -38,29 +24,6 @@ dependencies {
     }
     compile 'xpp3:xpp3:1.1.4c'
 
-    testCompile "junit:junit:${rootProject.junitVersion}"
-    testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:${rootProject.mockitoVersion}"
     testCompile "org.springframework.boot:spring-boot-starter-test"
     testCompile "org.springframework.security:spring-security-test"
-}
-dependencyManagement {
-    imports { mavenBom("org.springframework.boot:spring-boot-dependencies:${rootProject.springBootVersion}") }
-}
-
-compileJava.options.encoding = 'UTF-8'
-
-configurations {
-    all*.exclude module: 'commons-logging'
-}
-
-configurations {
-    testArtifacts.extendsFrom testRuntime
-}
-task testJar(type: Jar) {
-    classifier "test"
-    from sourceSets.test.output
-}
-artifacts {
-    testArtifacts testJar
-}
+}
\ No newline at end of file
diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index bcad2f41..3a60aad7 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -4,14 +4,12 @@ buildscript {
     }
 }
 
-apply plugin: 'java'
 apply plugin: 'war'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
 
 dependencies {
     compile project(':juick-server-jdbc')
     compile project(':juick-server-web')
+    compile ('org.springframework.boot:spring-boot-starter-security')
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 
     compile 'io.springfox:springfox-swagger2:2.8.0'
@@ -26,30 +24,14 @@ dependencies {
     compile 'com.rometools:rome:1.9.0'
     compile 'com.rometools:rome-modules:1.9.0'
 
-    testCompile project(path: ':juick-core', configuration: 'testArtifacts')
-    testCompile project(path: ':juick-server-web', configuration: 'testArtifacts')
-    testCompile project(path: ':juick-server-jdbc', configuration: 'testArtifacts')
+    testCompile("org.springframework.boot:spring-boot-starter-test")
+    // https://mvnrepository.com/artifact/org.springframework.security/spring-security-test
+    testCompile group: 'org.springframework.security', name: 'spring-security-test', version: '5.0.3.RELEASE'
+
 
     testRuntime 'com.jayway.jsonpath:json-path:2.4.0'
 }
 
-compileJava.options.encoding = 'UTF-8'
-
 bootJar {
     launchScript()
-}
-
-configurations {
-    all*.exclude module: 'commons-logging'
-}
-
-configurations {
-    testArtifacts.extendsFrom testRuntime
-}
-task testJar(type: Jar) {
-    classifier "test"
-    from sourceSets.test.output
-}
-artifacts {
-    testArtifacts testJar
-}
+}
\ No newline at end of file
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index defc6558..a48532d4 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -18,14 +18,10 @@ task compileFrontend(type: YarnTask) {
     args = ['run', 'compile']
 }
 
-apply plugin: 'java'
-apply plugin: 'war'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
 dependencies {
     compile project(':juick-server-web')
     compile project(':juick-server-jdbc')
+    compile ('org.springframework.boot:spring-boot-starter-security')
     compile 'com.github.scribejava:scribejava-apis:5.3.0'
     compile 'com.github.ooxi:serialized-php-parser:0.5.0'
     compile 'com.sun.mail:javax.mail:1.6.1'
@@ -33,20 +29,13 @@ dependencies {
     compile 'com.atlassian.commonmark:commonmark:0.11.0'
     compile 'com.atlassian.commonmark:commonmark-ext-autolink:0.11.0'
 
-    testCompile project(path: ':juick-core', configuration: 'testArtifacts')
-    testCompile project(path: ':juick-server-web', configuration: 'testArtifacts')
-    testCompile project(path: ':juick-server-jdbc', configuration: 'testArtifacts')
+    testCompile("org.springframework.boot:spring-boot-starter-test")
     testCompile ('net.sourceforge.htmlunit:htmlunit:2.29')
 }
 
 compileFrontend.dependsOn 'yarn'
 processResources.dependsOn 'compileFrontend'
-compileJava.options.encoding = 'UTF-8'
 
 bootJar {
     launchScript()
 }
-
-configurations {
-    all*.exclude module: 'commons-logging'
-}
diff --git a/juick-www/src/test/java/com/juick/www/WebAppTests.java b/juick-www/src/test/java/com/juick/www/WebAppTests.java
index 73cec17a..7aa0a515 100644
--- a/juick-www/src/test/java/com/juick/www/WebAppTests.java
+++ b/juick-www/src/test/java/com/juick/www/WebAppTests.java
@@ -27,7 +27,6 @@ import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.configuration.DataConfiguration;
-import com.juick.configuration.RepositoryConfiguration;
 import com.juick.service.*;
 import com.juick.util.MessageUtils;
 import com.juick.www.configuration.SapeConfiguration;
@@ -44,9 +43,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.autoconfigure.web.client.AutoConfigureWebClient;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
@@ -80,7 +79,6 @@ import java.util.stream.StreamSupport;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
@@ -95,17 +93,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @ContextConfiguration(classes = {
         DataConfiguration.class,
         WwwServletConfiguration.class, WwwAppConfiguration.class, SapeConfiguration.class,
-        RepositoryConfiguration.class, WebSecurityConfig.class
+        WebSecurityConfig.class
 })
 public class WebAppTests {
-    @Configuration
-    static class Config {
-        @Bean
-        public ImagesService imagesService() {
-            return new MockImagesService();
-        }
-    }
-
+    @MockBean
+    private ImagesService imagesService;
     @Inject
     private WebApp webApp;
 
diff --git a/juick-xmpp-wip/build.gradle b/juick-xmpp-wip/build.gradle
index ad49cf16..4b63c2f7 100644
--- a/juick-xmpp-wip/build.gradle
+++ b/juick-xmpp-wip/build.gradle
@@ -1,21 +1,5 @@
-apply plugin: 'java'
-apply plugin: 'war'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
 dependencies {
     compile project(':juick-server-jdbc')
     compile project(':juick-server-web')
-
-    testCompile project(path: ':juick-core', configuration: 'testArtifacts')
-    testCompile project(path: ':juick-server', configuration: 'testArtifacts')
-    testCompile project(path: ':juick-server-jdbc', configuration: 'testArtifacts')
-    testCompile ('net.sourceforge.htmlunit:htmlunit:2.29')
+    testCompile("org.springframework.boot:spring-boot-starter-test")
 }
-
-compileJava.options.encoding = 'UTF-8'
-
-configurations {
-    all*.exclude module: 'commons-logging'
-}
-
diff --git a/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java b/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
index 2cad5fb4..72d9dfe9 100644
--- a/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
+++ b/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
@@ -17,25 +17,16 @@
 
 package com.juick.xmpp;
 
-import com.gargoylesoftware.htmlunit.WebClient;
 import com.juick.components.XMPPRouter;
 import com.juick.components.configuration.BotAppConfiguration;
-import com.juick.configuration.MockDataConfiguration;
-import com.juick.service.MessengerService;
-import com.juick.service.PrivacyQueriesService;
-import com.juick.service.ShowQueriesService;
-import org.junit.Before;
+import com.juick.configuration.DataConfiguration;
+import com.juick.service.ImagesService;
 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.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
-import org.springframework.web.context.WebApplicationContext;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
 import rocks.xmpp.addr.Jid;
 import rocks.xmpp.core.XmppException;
 import rocks.xmpp.core.session.ConnectionEvent;
@@ -52,40 +43,12 @@ import java.util.concurrent.ExecutorService;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
+        classes = { BotAppConfiguration.class, DataConfiguration.class})
 public class XMPPTests {
-    @Configuration
-    @Import(value = {
-            BotAppConfiguration.class, MockDataConfiguration.class
-    })
-    static class Config {
-        @Bean
-        public ShowQueriesService showQueriesService() {
-            return Mockito.mock(ShowQueriesService.class);
-        }
-        @Bean
-        public PrivacyQueriesService privacyQueriesService() {
-            return Mockito.mock(PrivacyQueriesService.class);
-        }
-        @Bean
-        public MessengerService messengerService() {
-            return Mockito.mock(MessengerService.class);
-        }
-    }
-
-    @Inject
-    private WebApplicationContext wac;
-
-    private WebClient webClient;
-
-    @Before
-    public void setup() {
-        webClient = MockMvcWebClientBuilder.webAppContextSetup(this.wac).build();
-        webClient.getOptions().setJavaScriptEnabled(false);
-    }
-
+    @MockBean
+    ImagesService imagesService;
     @Inject
     XMPPRouter router;
     @Inject