aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-03-16 11:35:08 +0300
committerGravatar Vitaly Takmazov2018-03-16 11:35:08 +0300
commit223e8ec7742855ac83da445c40656aea3bec7e9b (patch)
treeeafe323999559ebe7e4492e665b458abcfe7fe6f
parent9ef168a03b75aeca0c2f7dda9ce87d4014c703a9 (diff)
gradle: remove tests from root project
-rw-r--r--build.gradle12
-rw-r--r--contrib/scripts/update_updated.sql (renamed from src/scripts/update_updated.sql)0
-rw-r--r--juick-common/build.gradle1
-rw-r--r--juick-common/src/test/java/com/juick/MessageTest.java55
-rw-r--r--juick-server-jdbc/build.gradle2
-rw-r--r--juick-server-web/build.gradle24
-rw-r--r--src/test/java/com/juick/rss/LegacyRSS.java215
-rw-r--r--src/test/java/com/juick/tests/MessageTests.java83
8 files changed, 57 insertions, 335 deletions
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/src/scripts/update_updated.sql b/contrib/scripts/update_updated.sql
index 39b29210..39b29210 100644
--- a/src/scripts/update_updated.sql
+++ b/contrib/scripts/update_updated.sql
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/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 <http://www.gnu.org/licenses/>.
- */
-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<Integer> mids = getLastMessages(hours);
- List<Message> 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<Integer> mids = Collections.emptyList(); //MessagesQueries.getUserBlog(sql, uid, 0, 0);
- if (!mids.isEmpty()) {
- List<Message> 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<Message> msgs) throws IOException {
- response.setContentType("application/rss+xml; charset=UTF-8");
-
- try (PrintWriter out = response.getWriter()) {
- out.println("<?xml version='1.0' encoding='utf-8'?>");
- out.println("<rss version='2.0' xmlns:atom='http://www.w3.org/2005/Atom' xmlns:slash='http://purl.org/rss/1.0/modules/slash/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:media='http://search.yahoo.com/mrss/' xmlns:juick='http://juick.com/'>");
- out.println("<channel>");
- if (uid > 0) {
- out.println("<atom:link href='http://rss.juick.com/" + uname + "/blog' rel='self' type='application/rss+xml'/>");
- out.println("<title>" + uname + " - Juick</title>");
- out.println("<link>http://juick.com/" + uname + "/</link>");
- out.println("<description>The latest messages by @" + uname + " at Juick</description>");
- out.println("<image><url>http://i.juick.com/a/" + uid + ".png</url><title>" + uname + " - Juick</title><link>http://juick.com/" + uname + "/</link></image>");
- } else {
- out.println("<title>Juick</title>");
- out.println("<link>http://juick.com/</link>");
- out.println("<description>The latest messages at Juick</description>");
- }
-
- for (Message msg : msgs) {
- out.println("<item>");
- out.println("<link>http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + "</link>");
- out.println("<guid>http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + "</guid>");
-
- out.print("<title><![CDATA[@" + msg.getUser().getName() + ":");
- if (!msg.getTags().isEmpty()) {
- for (Tag tag : msg.getTags()) {
- out.print(" *" + tag);
- }
- }
- out.println("]]></title>");
- out.println("<description><![CDATA[" + MessageUtils.formatMessage(StringUtils.defaultString(msg.getText())) + "]]></description>");
-
- out.println("<pubDate>" + DateFormattersHolder.getRssFormatterInstance().format(msg.getTimestamp()) + "</pubDate>");
-
- out.println("<comments>http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + "</comments>");
- if (!msg.getTags().isEmpty()) {
- for (Tag tag : msg.getTags()) {
- out.println("<category>" + StringEscapeUtils.escapeHtml4(tag.getName()) + "</category>");
- }
- }
- if (msg.getAttachmentType() != null) {
- if (msg.getAttachmentType().equals("jpg")) {
- out.println("<media:content url='http://i.juick.com/photos-1024/" + msg.getMid() + ".jpg' type='image/jpeg'/>");
- out.println("<media:thumbnail url='http://i.juick.com/ps/" + msg.getMid() + ".jpg'/>");
- } else if (msg.getAttachmentType().equals("png")) {
- out.println("<media:content url='http://i.juick.com/photos-1024/" + msg.getMid() + ".png' type='image/png'/>");
- out.println("<media:thumbnail url='http://i.juick.com/ps/" + msg.getMid() + ".png'/>");
- }
- }
- out.println("<juick:user uid='" + msg.getUser().getUid() + "'/>");
- out.println("</item>");
- }
-
- out.println("</channel></rss>");
- }
- }
-
- 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("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
- out.println("<rss version=\"2.0\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:ya=\"http://blogs.yandex.ru/yarss/\" xmlns:media=\"http://search.yahoo.com/mrss/\">");
- out.println("<channel>");
- out.println("<title>Juick</title>");
- out.println("<link>http://juick.com/</link>");
- out.println("<description>The latest comments at Juick</description>");
-
- 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("<item>");
- out.println("<ya:post>http://juick.com/" + r.muname + "/" + r.mid + "</ya:post>");
- out.println("<link>http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + "</link>");
- out.println("<guid>http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + "</guid>");
- out.println("<author>http://juick.com/" + r.uname + "/</author>");
- out.println("<title>@" + r.uname + ":</title>");
- out.println("<description><![CDATA[" + MessageUtils.formatMessage(r.description) + "]]></description>");
- out.println("<pubDate>" + DateFormattersHolder.getRssFormatterInstance().format(r.pubDate.toInstant()) + "</pubDate>");
- String attachment = r.attachmentType;
- if (attachment != null && !attachment.isEmpty()) {
- if (attachment.equals("jpg")) {
- out.println("<media:content url='http://i.juick.com/photos-1024/" + r.mid + "-" + r.rid + ".jpg' type='image/jpeg'/>");
- out.println("<media:thumbnail url='http://i.juick.com/ps/" + r.mid + "-" + r.rid + ".jpg'/>");
- } else if (attachment.equals("png")) {
- out.println("<media:content url='http://i.juick.com/photos-1024/" + r.mid + "-" + r.rid + ".png' type='image/png'/>");
- out.println("<media:thumbnail url='http://i.juick.com/ps/" + r.mid + "-" + r.rid + ".png'/>");
- }
- }
- out.println("</item>");
- });
- out.println("</channel></rss>");
- }
- }
-
- private List<Integer> 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 <http://www.gnu.org/licenses/>.
- */
-
-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