boot: simplify test configuration

6 files changed, 6 insertions, 218 deletions

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);
-        }
-    }
-}