From 223e8ec7742855ac83da445c40656aea3bec7e9b Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 16 Mar 2018 11:35:08 +0300 Subject: gradle: remove tests from root project --- build.gradle | 12 -- contrib/scripts/update_updated.sql | 2 + juick-common/build.gradle | 1 + .../src/test/java/com/juick/MessageTest.java | 55 ++++++ juick-server-jdbc/build.gradle | 2 +- juick-server-web/build.gradle | 24 --- src/scripts/update_updated.sql | 2 - src/test/java/com/juick/rss/LegacyRSS.java | 215 --------------------- src/test/java/com/juick/tests/MessageTests.java | 83 -------- 9 files changed, 59 insertions(+), 337 deletions(-) create mode 100644 contrib/scripts/update_updated.sql delete mode 100644 juick-server-web/build.gradle delete mode 100644 src/scripts/update_updated.sql delete mode 100644 src/test/java/com/juick/rss/LegacyRSS.java delete mode 100644 src/test/java/com/juick/tests/MessageTests.java diff --git a/build.gradle b/build.gradle index 91d6d56c..a8452a7e 100644 --- a/build.gradle +++ b/build.gradle @@ -40,15 +40,3 @@ allprojects { } } -apply plugin: 'java' - -dependencies { - compile project(':juick-common') - - testCompile "org.json:json:20180130" - testCompile("org.springframework.boot:spring-boot-starter-jdbc") - testCompile("org.springframework.boot:spring-boot-starter-test") - testRuntime "mysql:mysql-connector-java:5.1.40" - testRuntime "org.postgresql:postgresql:42.2.1" -} - diff --git a/contrib/scripts/update_updated.sql b/contrib/scripts/update_updated.sql new file mode 100644 index 00000000..39b29210 --- /dev/null +++ b/contrib/scripts/update_updated.sql @@ -0,0 +1,2 @@ +UPDATE messages, (SELECT messages.`message_id` midd, MAX(COALESCE(replies.ts, messages.ts)) lastt FROM messages LEFT JOIN replies ON messages.`message_id`=replies.`message_id` GROUP BY messages.`message_id`) res +SET messages.updated = res.lastt WHERE messages.`message_id` = res.midd ; \ No newline at end of file diff --git a/juick-common/build.gradle b/juick-common/build.gradle index bf81aee5..d27af42e 100644 --- a/juick-common/build.gradle +++ b/juick-common/build.gradle @@ -23,4 +23,5 @@ dependencies { compile "javax.inject:javax.inject:1" testCompile("org.springframework.boot:spring-boot-starter-test") + testCompile "org.json:json:20180130" } diff --git a/juick-common/src/test/java/com/juick/MessageTest.java b/juick-common/src/test/java/com/juick/MessageTest.java index 45c5730c..d3205876 100644 --- a/juick-common/src/test/java/com/juick/MessageTest.java +++ b/juick-common/src/test/java/com/juick/MessageTest.java @@ -17,21 +17,42 @@ package com.juick; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.juick.util.DateFormattersHolder; import com.juick.util.MessageUtils; +import org.apache.commons.codec.CharEncoding; import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.StringUtils; +import org.json.JSONObject; import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; import rocks.xmpp.addr.Jid; import rocks.xmpp.core.session.Extension; import rocks.xmpp.core.session.XmppSession; import rocks.xmpp.core.session.XmppSessionConfiguration; +import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.StringReader; +import java.io.StringWriter; +import java.text.ParseException; +import java.time.Instant; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertEquals; /** * Created by aalexeev on 12/7/16. @@ -189,4 +210,38 @@ public class MessageTest { Message juickMessage = xmppMessage.getExtension(Message.class); assertThat(juickMessage.getTags().get(0).getName(), equalTo("yo")); } + @Test + public void messageParserSerializer() throws ParseException, ParserConfigurationException, + IOException, SAXException, JAXBException { + Message msg = new Message(); + msg.setTags(MessageUtils.parseTags("test test" + (char) 0xA0 + "2 test3")); + assertEquals("First tag must be", "test", msg.getTags().get(0).getName()); + assertEquals("Third tag must be", "test3", msg.getTags().get(2).getName()); + assertEquals("Count of tags must be", 3, msg.getTags().size()); + Instant currentDate = Instant.now(); + msg.setTimestamp(currentDate); + ObjectMapper serializer = new ObjectMapper(); + serializer.registerModule(new Jdk8Module()); + serializer.registerModule(new JavaTimeModule()); + String jsonMessage = serializer.writeValueAsString(msg); + JSONObject jsonObject = new JSONObject(jsonMessage); + assertEquals("date should be in timestamp field", DateFormattersHolder.getMessageFormatterInstance().format(currentDate), + jsonObject.getString("timestamp")); + + + JAXBContext context = JAXBContext + .newInstance(Message.class); + Marshaller m = context.createMarshaller(); + + StringWriter sw = new StringWriter(); + m.marshal(msg, sw); + + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + DocumentBuilder db = dbf.newDocumentBuilder(); + Document doc = db.parse(new ByteArrayInputStream(sw.toString().getBytes(CharEncoding.UTF_8))); + Node juickNode = doc.getElementsByTagName("juick").item(0); + NamedNodeMap attrs = juickNode.getAttributes(); + assertEquals("date should be in ts field", DateFormattersHolder.getMessageFormatterInstance().format(currentDate), + attrs.getNamedItem("ts").getNodeValue()); + } } diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle index 5b323432..3dc3d0c4 100644 --- a/juick-server-jdbc/build.gradle +++ b/juick-server-jdbc/build.gradle @@ -7,7 +7,7 @@ dependencies { compile "org.apache.commons:commons-dbcp2:2.2.0" compile "com.googlecode.log4jdbc:log4jdbc:1.2" - runtime 'mysql:mysql-connector-java:5.1.40' + runtime 'mysql:mysql-connector-java:5.1.45' testCompile("org.springframework.boot:spring-boot-starter-test") testRuntime 'com.h2database:h2:1.4.196' diff --git a/juick-server-web/build.gradle b/juick-server-web/build.gradle deleted file mode 100644 index eeccbdbc..00000000 --- a/juick-server-web/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -dependencies { - compile project(':juick-server-core') - - 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") - compile("org.springframework.boot:spring-boot-starter-websocket") - compile("org.springframework.boot:spring-boot-starter-security") - - compile "javax.inject:javax.inject:1" - - compile 'org.imgscalr:imgscalr-lib:4.2' - compile "org.apache.commons:commons-imaging:1.0-SNAPSHOT" - - runtime "commons-fileupload:commons-fileupload:1.3.3" - - compile ('com.github.juick:com.juick.xmpp:658f8cf751') { - exclude group: 'xmlpull' - } - compile 'xpp3:xpp3:1.1.4c' - - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.springframework.security:spring-security-test" -} \ No newline at end of file diff --git a/src/scripts/update_updated.sql b/src/scripts/update_updated.sql deleted file mode 100644 index 39b29210..00000000 --- a/src/scripts/update_updated.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE messages, (SELECT messages.`message_id` midd, MAX(COALESCE(replies.ts, messages.ts)) lastt FROM messages LEFT JOIN replies ON messages.`message_id`=replies.`message_id` GROUP BY messages.`message_id`) res -SET messages.updated = res.lastt WHERE messages.`message_id` = res.midd ; \ No newline at end of file diff --git a/src/test/java/com/juick/rss/LegacyRSS.java b/src/test/java/com/juick/rss/LegacyRSS.java deleted file mode 100644 index 25e1de15..00000000 --- a/src/test/java/com/juick/rss/LegacyRSS.java +++ /dev/null @@ -1,215 +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 . - */ -package com.juick.rss; - -import com.juick.Message; -import com.juick.Tag; -import com.juick.util.DateFormattersHolder; -import com.juick.util.MessageUtils; -import org.apache.commons.codec.CharEncoding; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.apache.commons.text.StringEscapeUtils; -import org.springframework.jdbc.core.JdbcTemplate; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -/** - * @author ugnich - */ -public class LegacyRSS { - - JdbcTemplate sql; - - public LegacyRSS(JdbcTemplate sql) { - this.sql = sql; - } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - if (request.getCharacterEncoding() == null) { - request.setCharacterEncoding(CharEncoding.UTF_8); - } - - String uri = request.getRequestURI(); - if (uri.equals("/")) { - int hours = NumberUtils.toInt(request.getParameter("hours"), 0); - if (hours > 0 && hours < 13) { - List mids = getLastMessages(hours); - List msgs = Collections.emptyList(); //MessagesQueries.getMessages(sql, mids); - responseMessages(response, 0, null, msgs); - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - } else if (uri.equals("/comments")) { - int hours = NumberUtils.toInt(request.getParameter("hours"), 0); - if (hours > 0 && hours < 13) { - responseReplies(response, hours); - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - } else if (uri.matches("^/[a-zA-Z0-9\\-]{2,16}/blog$")) { - String uname = uri.substring(1, uri.length() - 5); - int uid = 0; // UserQueries.getUIDbyName(sql, uname); - if (uid > 0) { - List mids = Collections.emptyList(); //MessagesQueries.getUserBlog(sql, uid, 0, 0); - if (!mids.isEmpty()) { - List msgs = Collections.emptyList();// MessagesQueries.getMessages(sql, mids); - responseMessages(response, uid, uname, msgs); - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - } - - private void responseMessages(HttpServletResponse response, int uid, String uname, List msgs) throws IOException { - response.setContentType("application/rss+xml; charset=UTF-8"); - - try (PrintWriter out = response.getWriter()) { - out.println(""); - out.println(""); - out.println(""); - if (uid > 0) { - out.println(""); - out.println("" + uname + " - Juick"); - out.println("http://juick.com/" + uname + "/"); - out.println("The latest messages by @" + uname + " at Juick"); - out.println("http://i.juick.com/a/" + uid + ".png" + uname + " - Juickhttp://juick.com/" + uname + "/"); - } else { - out.println("Juick"); - out.println("http://juick.com/"); - out.println("The latest messages at Juick"); - } - - for (Message msg : msgs) { - out.println(""); - out.println("http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + ""); - out.println("http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + ""); - - out.print("<![CDATA[@" + msg.getUser().getName() + ":"); - if (!msg.getTags().isEmpty()) { - for (Tag tag : msg.getTags()) { - out.print(" *" + tag); - } - } - out.println("]]>"); - out.println(""); - - out.println("" + DateFormattersHolder.getRssFormatterInstance().format(msg.getTimestamp()) + ""); - - out.println("http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + ""); - if (!msg.getTags().isEmpty()) { - for (Tag tag : msg.getTags()) { - out.println("" + StringEscapeUtils.escapeHtml4(tag.getName()) + ""); - } - } - if (msg.getAttachmentType() != null) { - if (msg.getAttachmentType().equals("jpg")) { - out.println(""); - out.println(""); - } else if (msg.getAttachmentType().equals("png")) { - out.println(""); - out.println(""); - } - } - out.println(""); - out.println(""); - } - - out.println(""); - } - } - - private class ResponseReply { - String muname; - int mid; - int rid; - String uname; - String description; - Date pubDate; - String attachmentType; - } - - private void responseReplies(HttpServletResponse response, int hours) throws IOException { - response.setContentType("application/rss+xml; charset=UTF-8"); - - try (PrintWriter out = response.getWriter()) { - - out.println(""); - out.println(""); - out.println(""); - out.println("Juick"); - out.println("http://juick.com/"); - out.println("The latest comments at Juick"); - - sql.query("SELECT users2.nick,replies.message_id,replies.reply_id," + - "users.nick,replies.txt," + - "replies.ts,replies.attach,replies.ts+0 " + - "FROM ((replies INNER JOIN users ON replies.user_id=users.id) " + - "INNER JOIN messages ON replies.message_id=messages.message_id) " + - "INNER JOIN users AS users2 ON messages.user_id=users2.id " + - "WHERE replies.ts>TIMESTAMPADD(HOUR,?,NOW()) AND messages.privacy>0", (rs, rowNum) -> { - ResponseReply reply = new ResponseReply(); - reply.muname = rs.getString(1); - reply.mid = rs.getInt(2); - reply.rid = rs.getInt(3); - reply.uname = rs.getString(4); - reply.description = rs.getString(5); - reply.pubDate = rs.getTimestamp(6); - reply.attachmentType = rs.getString(7); - return reply; - }, -hours).forEach(r -> { - out.println(""); - out.println("http://juick.com/" + r.muname + "/" + r.mid + ""); - out.println("http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + ""); - out.println("http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + ""); - out.println("http://juick.com/" + r.uname + "/"); - out.println("@" + r.uname + ":"); - out.println(""); - out.println("" + DateFormattersHolder.getRssFormatterInstance().format(r.pubDate.toInstant()) + ""); - String attachment = r.attachmentType; - if (attachment != null && !attachment.isEmpty()) { - if (attachment.equals("jpg")) { - out.println(""); - out.println(""); - } else if (attachment.equals("png")) { - out.println(""); - out.println(""); - } - } - out.println(""); - }); - out.println(""); - } - } - - private List getLastMessages(int hours) { - return sql.queryForList("SELECT message_id FROM messages WHERE messages.ts>TIMESTAMPADD(HOUR,?,NOW())", - Integer.class, -hours); - } -} diff --git a/src/test/java/com/juick/tests/MessageTests.java b/src/test/java/com/juick/tests/MessageTests.java deleted file mode 100644 index 0baf53b6..00000000 --- a/src/test/java/com/juick/tests/MessageTests.java +++ /dev/null @@ -1,83 +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 . - */ - -package com.juick.tests; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.juick.Message; -import com.juick.util.DateFormattersHolder; -import com.juick.util.MessageUtils; -import org.apache.commons.codec.CharEncoding; -import org.json.JSONObject; -import org.junit.Test; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.xml.sax.SAXException; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.StringWriter; -import java.text.ParseException; -import java.time.Instant; - -import static org.junit.Assert.assertEquals; - -public class MessageTests { - @Test - public void messageParserSerializer() throws ParseException, ParserConfigurationException, - IOException, SAXException, JAXBException { - Message msg = new Message(); - msg.setTags(MessageUtils.parseTags("test test" + (char) 0xA0 + "2 test3")); - assertEquals("First tag must be", "test", msg.getTags().get(0).getName()); - assertEquals("Third tag must be", "test3", msg.getTags().get(2).getName()); - assertEquals("Count of tags must be", 3, msg.getTags().size()); - Instant currentDate = Instant.now(); - msg.setTimestamp(currentDate); - ObjectMapper serializer = new ObjectMapper(); - serializer.registerModule(new Jdk8Module()); - serializer.registerModule(new JavaTimeModule()); - String jsonMessage = serializer.writeValueAsString(msg); - JSONObject jsonObject = new JSONObject(jsonMessage); - assertEquals("date should be in timestamp field", DateFormattersHolder.getMessageFormatterInstance().format(currentDate), - jsonObject.getString("timestamp")); - - - JAXBContext context = JAXBContext - .newInstance(Message.class); - Marshaller m = context.createMarshaller(); - - StringWriter sw = new StringWriter(); - m.marshal(msg, sw); - - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db = dbf.newDocumentBuilder(); - Document doc = db.parse(new ByteArrayInputStream(sw.toString().getBytes(CharEncoding.UTF_8))); - Node juickNode = doc.getElementsByTagName("juick").item(0); - NamedNodeMap attrs = juickNode.getAttributes(); - assertEquals("date should be in ts field", DateFormattersHolder.getMessageFormatterInstance().format(currentDate), - attrs.getNamedItem("ts").getNodeValue()); - } -} \ No newline at end of file -- cgit v1.2.3