SQL tests on NodeThreadsGet.

Author: abmargb

src/main/java/org/buddycloud/channelserver/db/jdbc/dialect/Sql92NodeStoreDialect.java

@@ -223,20 +223,21 @@ public class Sql92NodeStoreDialect implements NodeStoreSQLDialect {
 	private static final String DELETE_USER_SUBSCRIPTIONS = "DELETE FROM \"subscriptions\" WHERE \"user\" = ?";
 
 	private static final String SELECT_NODE_THREADS = 
-			"SELECT \"items.node\", \"items.id\", \"items.updated\", \"items.xml\", \"items.in_reply_to\", " +
-			"\"threads.thread_id\", \"threads.thread_updated\" FROM items," +
-			  "(SELECT MAX(updated) AS thread_updated, thread_id FROM " +
-			  "(SELECT node, updated, (CASE WHEN (in_reply_to IS NULL) THEN id ELSE in_reply_to END) AS thread_id FROM items) AS _items" +
-			  "WHERE node = ? " +
-			  "GROUP BY thread_id " +
-			  "HAVING MAX(updated) < ? " +
-			  "ORDER BY thread_updated DESC LIMIT ?) AS threads " +
-			"WHERE items.in_reply_to = threads.thread_id OR items.id = threads.thread_id " +
-			"ORDER BY threads.thread_updated DESC, items.updated;";
-
-	private static final String COUNT_NODE_THREADS = "SELECT COUNT(DISTINCT _items.thread_id) " +
-			"FROM (SELECT node, (CASE WHEN (in_reply_to IS NULL) THEN id ELSE in_reply_to END) AS thread_id " +
-			      "FROM items WHERE node = ?) AS _items;";
+			"SELECT \"node\", \"id\", \"updated\", \"xml\", \"in_reply_to\", " +
+			"\"thread_id\", \"thread_updated\" FROM \"items\"," +
+			  "(SELECT MAX(\"updated\") AS \"thread_updated\", \"thread_id\" FROM " +
+			  "(SELECT \"updated\", " +
+			    "(CASE WHEN (\"in_reply_to\" IS NULL) THEN \"id\" ELSE \"in_reply_to\" END) AS \"thread_id\" " +
+			    "FROM \"items\" WHERE \"node\" = ?) AS \"_items\" " +
+			  "GROUP BY \"thread_id\" " +
+			  "HAVING MAX(\"updated\") < ? " +
+			  "ORDER BY \"thread_updated\" DESC LIMIT ?) AS \"threads\" " +
+			"WHERE \"in_reply_to\" = \"thread_id\" OR \"id\" = \"thread_id\" " +
+			"ORDER BY \"thread_updated\" DESC, \"updated\"";
+
+	private static final String COUNT_NODE_THREADS = "SELECT COUNT(DISTINCT \"thread_id\") " +
+			"FROM (SELECT \"node\", (CASE WHEN (\"in_reply_to\" IS NULL) THEN \"id\" ELSE \"in_reply_to\" END) AS \"thread_id\" " +
+			      "FROM \"items\" WHERE \"node\" = ?) AS \"_items\"";
 
     @Override
 	public String insertNode() {

src/test/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStoreTest.java

@@ -1,6 +1,6 @@
 package org.buddycloud.channelserver.db.jdbc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -43,8 +43,8 @@
 import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Test;
 import org.junit.Ignore;
+import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
 import org.xmpp.packet.JID;
@@ -2319,4 +2319,16 @@ private void assertSameNodeItem(NodeItem actual, NodeItem expected) {
 		assertEquals(expected.getPayload(), actual.getPayload());
 		assertEquals(expected.getInReplyTo(), actual.getInReplyTo());
 	}
+	
+	@Test
+	public void testSelectNodeThreads() throws Exception {
+		dbTester.loadData("node_1");
+		assertEquals(5, store.getNodeThreads(TEST_SERVER1_NODE1_ID, null, 10).size());
+	}
+	
+	@Test
+	public void testCountNodeThreads() throws Exception {
+		dbTester.loadData("node_1");
+		assertEquals(5, store.countNodeThreads(TEST_SERVER1_NODE1_ID));
+	}
 }