h2 schema and test fixes

1 files changed, 0 insertions, 231 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
deleted file mode 100644
index 5cbc2ca0..00000000
--- a/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
+++ /dev/null
@@ -1,231 +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.service;
-
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.User;
-import com.juick.server.helpers.AnonymousUser;
-import com.juick.server.helpers.TagStats;
-import com.juick.util.MessageUtils;
-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;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.inject.Inject;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by aalexeev on 11/25/16.
- */
-@RunWith(SpringRunner.class)
-public class MessageServiceTest extends AbstractJUnit4SpringContextTests {
-    @Inject
-    private MessagesService messagesService;
-    @Inject
-    private UserService userService;
-    @Inject
-    private SubscriptionService subscriptionService;
-    @Inject
-    private TagService tagService;
-    @Inject
-    private TelegramService telegramService;
-    @Inject
-    private JdbcTemplate jdbcTemplate;
-    @Inject
-    private CrosspostService crosspostService;
-    @Inject
-    private PMQueriesService pmQueriesService;
-    @Inject
-    private EmailService emailService;
-
-    @MockBean
-    private ImagesService imagesService;
-
-    static int ugnichId, freefdId, mid;
-
-    private static boolean setUpIsDone = false;
-
-    @Before
-    public void createUgniches() {
-        if (!setUpIsDone) {
-            ugnichId = userService.createUser("ugnich", "secret");
-            freefdId = userService.createUser("freefd", "secret");
-            setUpIsDone = true;
-        }
-    }
-
-    @Test
-    public void getMyFeed() {
-        mid = messagesService.createMessage(ugnichId, "test", null, null);
-        int mid2 = messagesService.createMessage(ugnichId, "test2", null, null);
-        subscriptionService.subscribeUser(userService.getUserByUID(freefdId).orElse(AnonymousUser.INSTANCE),
-                userService.getUserByUID(ugnichId).orElse(AnonymousUser.INSTANCE));
-        List<Integer> freefdFeed = messagesService.getMyFeed(freefdId, 0, false);
-        assertThat(freefdFeed.size(), equalTo(2));
-        int tonyaid = userService.createUser("Tonya", "secret");
-        int mid3 = messagesService.createMessage(tonyaid, "test3", null, null);
-        messagesService.recommendMessage(mid3, ugnichId);
-        assertThat(messagesService.getMyFeed(freefdId, 0, false).size(), equalTo(2));
-        assertThat(messagesService.getMyFeed(freefdId, 0, true).size(), equalTo(3));
-        assertThat(messagesService.getMyFeed(freefdId, mid2, true).size(), equalTo(1));
-        assertThat(messagesService.getMyFeed(freefdId, mid, false).size(), equalTo(0));
-        assertThat(messagesService.recommendMessage(mid, ugnichId), equalTo(MessagesService.RecommendStatus.Added));
-        assertThat(messagesService.getMessage(mid).getLikes(), equalTo(1));
-        assertThat(messagesService.recommendMessage(mid, ugnichId), equalTo(MessagesService.RecommendStatus.Deleted));
-        assertThat(messagesService.getMessage(mid).getLikes(), equalTo(0));
-        assertThat(messagesService.getAll(ugnichId, 0).size(), equalTo(3));
-
-        User ugnich = userService.getUserByUID(ugnichId).orElse(AnonymousUser.INSTANCE);
-        User freefd = userService.getUserByUID(freefdId).orElse(AnonymousUser.INSTANCE);
-        Tag yoTag = tagService.getTag("yoyo", true);
-        assertThat(tagService.getTag("YOYO", false), equalTo(yoTag));
-        int mid = messagesService.createMessage(ugnichId, "yo", null, Collections.singletonList(yoTag));
-        List<User> subscribers = subscriptionService.getSubscribedUsers(ugnichId, mid);
-
-        telegramService.createTelegramUser(12345, "freefd");
-        String loginhash = jdbcTemplate.queryForObject("SELECT loginhash FROM telegram where tg_id=?",
-                String.class, 12345);
-        crosspostService.setTelegramUser(loginhash, freefd.getUid());
-
-        List<Long> telegramSubscribers = telegramService.getTelegramIdentifiers(subscribers);
-        assertThat(subscribers.size(), equalTo(1));
-        assertThat(subscribers.size(), equalTo(telegramSubscribers.size()));
-        assertThat(subscribers.get(0).getUid(), equalTo(freefd.getUid()));
-        tagService.blacklistTag(freefd, yoTag);
-        List<User> subscribers2 = subscriptionService.getSubscribedUsers(ugnichId, mid);
-        assertThat(subscribers2.size(), equalTo(0));
-        assertThat(telegramService.getTelegramIdentifiers(subscribers2).size(), equalTo(0));
-        tagService.blacklistTag(freefd, yoTag);
-        assertThat(subscriptionService.getSubscribedUsers(ugnichId, mid).size(), equalTo(1));
-    }
-    @Test
-    public void pmTests() {
-        pmQueriesService.createPM(freefdId, ugnichId, "hello");
-        Message pm = pmQueriesService.getPMMessages(ugnichId, freefdId).get(0);
-        assertThat(pm.getText(), equalTo("hello"));
-        assertThat(pm.getUser().getUid(), equalTo(freefdId));
-    }
-
-    @Test
-    public void messageTests() {
-        int user_id = userService.createUser("mmmme", "secret");
-        User user = userService.getUserByUID(user_id).orElse(new User());
-        assertEquals("it should be me", "mmmme", user.getName());
-        int mid = messagesService.createMessage(user_id, "yo", null, new ArrayList<>());
-        Message msg = messagesService.getMessage(mid);
-        assertEquals("yo", msg.getText());
-        User me = msg.getUser();
-        assertEquals("mmmme", me.getName());
-        assertEquals("mmmme", messagesService.getMessageAuthor(mid).getName());
-        int tagID = tagService.createTag("weather");
-        Tag tag = tagService.getTag(tagID);
-        List<Tag> tagList = new ArrayList<>();
-        tagList.add(tag);
-        int mid2 = messagesService.createMessage(user_id, "yo2", null, tagList);
-        Message msg2 = messagesService.getMessage(mid2);
-        assertEquals(1, msg2.getTags().size());
-        assertEquals("we already have ugnich", -1, userService.createUser("ugnich", "x"));
-        int ugnich_id = userService.createUser("hugnich", "x");
-        User ugnich = userService.getUserByUID(ugnich_id).orElse(new User());
-        int rid = messagesService.createReply(msg2.getMid(), 0, ugnich.getUid(), "bla-bla", null);
-        assertEquals(1, rid);
-        assertThat(msg2.getTo(), equalTo(null));
-        Message reply = messagesService.getReply(msg2.getMid(), rid);
-        assertThat(reply.getTo().getName(), equalTo(user.getName()));
-        List<Message> replies = messagesService.getReplies(msg2.getMid());
-        assertThat(replies.size(), equalTo(1));
-        assertThat(replies.get(0), equalTo(reply));
-        int ridToReply = messagesService.createReply(msg2.getMid(), 1, ugnich_id, "blax2", null);
-        Message reply2 = messagesService.getReply(msg2.getMid(), ridToReply);
-        assertThat(reply.getTo().getName(), equalTo(user.getName()));
-        List<Message> replies2 = messagesService.getReplies(msg2.getMid());
-        assertThat(replies2.size(), equalTo(2));
-        assertThat(replies2.get(1), equalTo(reply2));
-        Message msg3 = messagesService.getMessage(mid2);
-        assertEquals(2, msg3.getReplies());
-        assertEquals("weather", msg3.getTags().get(0).getName());
-        assertEquals(ugnich.getUid(), userService.checkPassword(ugnich.getName(), "x"));
-        assertEquals(-1, userService.checkPassword(ugnich.getName(), "xy"));
-        subscriptionService.subscribeMessage(msg.getMid(), user.getUid());
-        subscriptionService.subscribeMessage(msg.getMid(), ugnich.getUid());
-        int reply_id = messagesService.createReply(msg.getMid(), 0, ugnich_id, "comment", null);
-        assertEquals(1, subscriptionService.getUsersSubscribedToComments(msg,
-                messagesService.getReply(msg.getMid(), reply_id)).size());
-        assertThat(messagesService.getDiscussions(ugnich.getUid(), Instant.now().toEpochMilli()).get(0),
-                                equalTo(msg.getMid()));
-        messagesService.deleteMessage(user_id, mid);
-        messagesService.deleteMessage(user_id, mid2);
-        String htmlTagName = ">_<";
-        Tag htmlTag = tagService.getTag(htmlTagName, true);
-        TagStats htmlTagStats = new TagStats();
-        htmlTagStats.setTag(htmlTag);
-        String dbTagName = jdbcTemplate.queryForObject("select name from tags where name=?", String.class, htmlTagName);
-        assertEquals("db tags should not be escaped", dbTagName, htmlTag.getName());
-        int mid4 = messagesService.createMessage(user_id, "yoyoyo", null, null);
-        Message msg4 = messagesService.getMessage(mid4);
-        assertEquals("tags string should be empty", StringUtils.EMPTY, MessageUtils.getTagsString(msg4));
-        messagesService.deleteMessage(user_id, mid4);
-    }
-    @Test
-    public void lastJidShouldNotBeDeleted() {
-        int ugnich_id = userService.createUser("hugnich2", "x");
-        jdbcTemplate.update("INSERT INTO jids(user_id,jid,active) VALUES(?,?,?)", ugnich_id, "firstjid@localhost", 1);
-        jdbcTemplate.update("INSERT INTO jids(user_id,jid,active) VALUES(?,?,?)", ugnich_id, "secondjid@localhost", 1);
-        assertThat(userService.deleteJID(ugnich_id, "secondjid@localhost"), equalTo(true));
-        assertThat(userService.deleteJID(ugnich_id, "firstjid@localhost"), equalTo(false));
-    }
-    @Test
-    public void lastEmailShouldNotBeDeleted() {
-        int ugnich_id = userService.createUser("hugnich3", "x");
-        jdbcTemplate.update("INSERT INTO emails(user_id,email) VALUES(?,?)", ugnich_id, "first@localhost");
-        jdbcTemplate.update("INSERT INTO emails(user_id,email) VALUES(?,?)", ugnich_id, "second@localhost");
-        assertThat(emailService.deleteEmail(ugnich_id, "second@localhost"), equalTo(true));
-        assertThat(emailService.deleteEmail(ugnich_id, "first@localhost"), equalTo(false));
-    }
-    @Test
-    public void messageUpdatedTimeShouldMatchLastReplyTime() throws InterruptedException {
-        int ugnich_id = userService.createUser("hugnich4", "x");
-        int mid = messagesService.createMessage(ugnich_id, "yo", null, null);
-        Instant ts = jdbcTemplate.queryForObject("SELECT updated FROM messages WHERE message_id=?",
-                Timestamp.class, mid).toInstant();
-        Thread.sleep(1000);
-        int rid = messagesService.createReply(mid, 0, ugnich_id, "people", null);
-        Instant rts = jdbcTemplate.queryForObject("SELECT updated FROM messages WHERE message_id=?",
-                Timestamp.class, mid).toInstant();
-        assertThat(rts, greaterThan(ts));
-        Message msg = messagesService.getReply(mid, rid);
-        assertThat(rts, equalTo(msg.getTimestamp()));
-        messagesService.deleteMessage(ugnich_id, mid);
-    }
-}