diff options
author | 2018-03-15 23:24:13 +0300 | |
---|---|---|
committer | 2018-03-15 23:24:13 +0300 | |
commit | ef9bb70fa1fe3744e971837eb78c6c004cd1e989 (patch) | |
tree | cee55dfcdcf9daf29c4835b200e1277a5d90b101 /juick-server-jdbc/src/test/java/com/juick/service | |
parent | 55ec9f370d76a76aa33e290a093995d576e70bdb (diff) |
boot: simplify test configuration
Diffstat (limited to 'juick-server-jdbc/src/test/java/com/juick/service')
-rw-r--r-- | juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java | 7 | ||||
-rw-r--r-- | juick-server-jdbc/src/test/java/com/juick/service/MockImagesService.java | 59 |
2 files changed, 5 insertions, 61 deletions
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); - } - } -} |