You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2016/02/11 19:34:57 UTC
lucene-solr git commit: SOLR-8529: Improve JdbcTest to not use plain
assert statements
Repository: lucene-solr
Updated Branches:
refs/heads/master 56b79ece8 -> 111f45efa
SOLR-8529: Improve JdbcTest to not use plain assert statements
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/111f45ef
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/111f45ef
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/111f45ef
Branch: refs/heads/master
Commit: 111f45efa91392eaea55a590b0d5c84697f6fd7f
Parents: 56b79ec
Author: jbernste <jb...@apache.org>
Authored: Thu Feb 11 13:37:07 2016 -0500
Committer: jbernste <jb...@apache.org>
Committed: Thu Feb 11 13:37:07 2016 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 1 +
.../solr/client/solrj/io/sql/JdbcTest.java | 307 +++++++++++--------
2 files changed, 173 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/111f45ef/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bc7b39a..20e10ac 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -246,6 +246,7 @@ Other Changes
* SOLR-8190: Implement Closeable on TupleStream (Kevin Risden, Joel Bernstein)
+* SOLR-8529: Improve JdbcTest to not use plain assert statements (Kevin Risden, Joel Bernstein)
======================= 5.6.0 =======================
(No Changes)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/111f45ef/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
index e8c0c50..e1e9739 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
@@ -115,68 +115,81 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
try (Connection con = DriverManager.getConnection("jdbc:solr://" + zkHost + "?collection=collection1", props)) {
try (Statement stmt = con.createStatement()) {
try (ResultSet rs = stmt.executeQuery("select id, a_i, a_s, a_f from collection1 order by a_i desc limit 2")) {
- assertTrue(rs.getMetaData() != null);
-
- assert(rs.next());
- assert(rs.getLong("a_i") == 14);
- assert(rs.getLong(2) == 14);
- assert(rs.getString("a_s").equals("hello0"));
- assert(rs.getString(3).equals("hello0"));
- assert(rs.getDouble("a_f") == 10);
- assert(rs.getDouble(4) == 10);
-
- assert(rs.next());
- assert(rs.getLong("a_i") == 13);
- assert(rs.getLong(2) == 13);
- assert(rs.getString("a_s").equals("hello3"));
- assert(rs.getString(3).equals("hello3"));
- assert(rs.getDouble("a_f") == 9);
- assert(rs.getDouble(4) == 9);
- assert(!rs.next());
+ assertTrue(rs.next());
+
+ assertEquals(14, rs.getLong("a_i"));
+ assertEquals(14, rs.getLong(2));
+ assertEquals("hello0", rs.getString("a_s"));
+ assertEquals("hello0", rs.getString(3));
+ assertEquals(10, rs.getDouble("a_f"), 0);
+ assertEquals(10, rs.getDouble(4), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals(13, rs.getLong("a_i"));
+ assertEquals(13, rs.getLong(2));
+ assertEquals("hello3", rs.getString("a_s"));
+ assertEquals("hello3", rs.getString(3));
+ assertEquals(9, rs.getDouble("a_f"), 0);
+ assertEquals(9, rs.getDouble(4), 0);
+
+ assertFalse(rs.next());
}
//Test statement reuse
try (ResultSet rs = stmt.executeQuery("select id, a_i, a_s, a_f from collection1 order by a_i asc limit 2")) {
- assert(rs.next());
- assert(rs.getLong("a_i") == 0);
- assert(rs.getLong(2) == 0);
- assert(rs.getString("a_s").equals("hello0"));
- assert(rs.getString(3).equals("hello0"));
- assert(rs.getDouble("a_f") == 1);
- assert(rs.getDouble(4) == 1);
-
- assert(rs.next());
- assert(rs.getLong("a_i") == 1);
- assert(rs.getLong(2) == 1);
- assert(rs.getString("a_s").equals("hello0"));
- assert(rs.getString(3).equals("hello0"));
- assert(rs.getDouble("a_f") == 5);
- assert(rs.getDouble(4) == 5);
- assert(!rs.next());
+ assertTrue(rs.next());
+
+ assertEquals(0, rs.getLong("a_i"));
+ assertEquals(0, rs.getLong(2));
+ assertEquals("hello0", rs.getString("a_s"));
+ assertEquals("hello0", rs.getString(3));
+ assertEquals(1, rs.getDouble("a_f"), 0);
+ assertEquals(1, rs.getDouble(4), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals(1, rs.getLong("a_i"));
+ assertEquals(1, rs.getLong(2));
+ assertEquals("hello0", rs.getString("a_s"));
+ assertEquals("hello0", rs.getString(3));
+ assertEquals(5, rs.getDouble("a_f"), 0);
+ assertEquals(5, rs.getDouble(4), 0);
+
+ assertFalse(rs.next());
}
}
//Test connection reuse
try (Statement stmt = con.createStatement()) {
try (ResultSet rs = stmt.executeQuery("select id, a_i, a_s, a_f from collection1 order by a_i desc limit 2")) {
- assert(rs.next());
- assert(rs.getLong("a_i") == 14);
- assert(rs.getLong(2) == 14);
- assert(rs.next());
- assert(rs.getLong("a_i") == 13);
- assert(rs.getLong(2) == 13);
+ assertTrue(rs.next());
+
+ assertEquals(14, rs.getLong("a_i"));
+ assertEquals(14, rs.getLong(2));
+
+ assertTrue(rs.next());
+
+ assertEquals(13, rs.getLong("a_i"));
+ assertEquals(13, rs.getLong(2));
+
+ assertFalse(rs.next());
}
//Test statement reuse
stmt.setMaxRows(2);
try (ResultSet rs = stmt.executeQuery("select id, a_i, a_s, a_f from collection1 order by a_i asc")) {
- assert(rs.next());
- assert(rs.getLong("a_i") == 0);
- assert(rs.getLong(2) == 0);
- assert(rs.next());
- assert(rs.getLong("a_i") == 1);
- assert(rs.getLong(2) == 1);
- assert(!rs.next());
+ assertTrue(rs.next());
+
+ assertEquals(0, rs.getLong("a_i"));
+ assertEquals(0, rs.getLong(2));
+
+ assertTrue(rs.next());
+
+ assertEquals(1, rs.getLong("a_i"));
+ assertEquals(1, rs.getLong(2));
+
+ assertFalse(rs.next());
}
//Test simple loop. Since limit is set it will override the statement maxRows.
@@ -185,7 +198,7 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
while (rs.next()) {
++count;
}
- assert(count == 10);
+ assertEquals(10, count);
}
}
}
@@ -198,24 +211,28 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
try (ResultSet rs = stmt.executeQuery("select a_s, sum(a_f) from collection1 group by a_s " +
"order by sum(a_f) desc")) {
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello3"));
- assert(rs.getString(1).equals("hello3"));
- assert(rs.getDouble("sum(a_f)") == 26);
- assert(rs.getDouble(2) == 26);
+ assertTrue(rs.next());
+
+ assertEquals("hello3", rs.getString("a_s"));
+ assertEquals("hello3", rs.getString(1));
+ assertEquals(26, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(26, rs.getDouble(2), 0);
+ assertTrue(rs.next());
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello0"));
- assert(rs.getString(1).equals("hello0"));
- assert(rs.getDouble("sum(a_f)") == 18);
- assert(rs.getDouble(2) == 18);
+ assertEquals("hello0", rs.getString("a_s"));
+ assertEquals("hello0", rs.getString(1));
+ assertEquals(18, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(18, rs.getDouble(2), 0);
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello4"));
- assert(rs.getString(1).equals("hello4"));
- assert(rs.getDouble("sum(a_f)") == 11);
- assert(rs.getDouble(2) == 11);
+ assertTrue(rs.next());
+
+ assertEquals("hello4", rs.getString("a_s"));
+ assertEquals("hello4", rs.getString(1));
+ assertEquals(11, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(11, rs.getDouble(2), 0);
+
+ assertFalse(rs.next());
}
}
}
@@ -229,23 +246,28 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
try (ResultSet rs = stmt.executeQuery("select a_s, sum(a_f) from collection1 group by a_s " +
"order by sum(a_f) desc")) {
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello3"));
- assert(rs.getString(1).equals("hello3"));
- assert(rs.getDouble("sum(a_f)") == 26);
- assert(rs.getDouble(2) == 26);
-
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello0"));
- assert(rs.getString(1).equals("hello0"));
- assert(rs.getDouble("sum(a_f)") == 18);
- assert(rs.getDouble(2) == 18);
-
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello4"));
- assert(rs.getString(1).equals("hello4"));
- assert(rs.getDouble("sum(a_f)") == 11);
- assert(rs.getDouble(2) == 11);
+ assertTrue(rs.next());
+
+ assertEquals("hello3", rs.getString("a_s"));
+ assertEquals("hello3", rs.getString(1));
+ assertEquals(26, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(26, rs.getDouble(2), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals("hello0", rs.getString("a_s"));
+ assertEquals("hello0", rs.getString(1));
+ assertEquals(18, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(18, rs.getDouble(2), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals("hello4", rs.getString("a_s"));
+ assertEquals("hello4", rs.getString(1));
+ assertEquals(11, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(11, rs.getDouble(2), 0);
+
+ assertFalse(rs.next());
}
}
}
@@ -263,23 +285,28 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
try (ResultSet rs = stmt.executeQuery("select a_s, sum(a_f) from collection1 group by a_s " +
"order by sum(a_f) desc")) {
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello3"));
- assert(rs.getString(1).equals("hello3"));
- assert(rs.getDouble("sum(a_f)") == 26);
- assert(rs.getDouble(2) == 26);
-
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello0"));
- assert(rs.getString(1).equals("hello0"));
- assert(rs.getDouble("sum(a_f)") == 18);
- assert(rs.getDouble(2) == 18);
-
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello4"));
- assert(rs.getString(1).equals("hello4"));
- assert(rs.getDouble("sum(a_f)") == 11);
- assert(rs.getDouble(2) == 11);
+ assertTrue(rs.next());
+
+ assertEquals("hello3", rs.getString("a_s"));
+ assertEquals("hello3", rs.getString(1));
+ assertEquals(26, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(26, rs.getDouble(2), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals("hello0", rs.getString("a_s"));
+ assertEquals("hello0", rs.getString(1));
+ assertEquals(18, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(18, rs.getDouble(2), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals("hello4", rs.getString("a_s"));
+ assertEquals("hello4", rs.getString(1));
+ assertEquals(11, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(11, rs.getDouble(2), 0);
+
+ assertFalse(rs.next());
}
}
}
@@ -289,32 +316,37 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
"jdbc:solr://" + zkHost + "?collection=collection1&username=&password=&testKey1=testValue&testKey2")) {
Properties p = ((ConnectionImpl) con).getProperties();
- assert(p.getProperty("username").equals(""));
- assert(p.getProperty("password").equals(""));
- assert(p.getProperty("testKey1").equals("testValue"));
- assert(p.getProperty("testKey2").equals(""));
+ assertEquals("", p.getProperty("username"));
+ assertEquals("", p.getProperty("password"));
+ assertEquals("testValue", p.getProperty("testKey1"));
+ assertEquals("", p.getProperty("testKey2"));
try (Statement stmt = con.createStatement()) {
try (ResultSet rs = stmt.executeQuery("select a_s, sum(a_f) from collection1 group by a_s " +
"order by sum(a_f) desc")) {
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello3"));
- assert(rs.getString(1).equals("hello3"));
- assert(rs.getDouble("sum(a_f)") == 26);
- assert(rs.getDouble(2) == 26);
-
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello0"));
- assert(rs.getString(1).equals("hello0"));
- assert(rs.getDouble("sum(a_f)") == 18);
- assert(rs.getDouble(2) == 18);
-
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello4"));
- assert(rs.getString(1).equals("hello4"));
- assert(rs.getDouble("sum(a_f)") == 11);
- assert(rs.getDouble(2) == 11);
+ assertTrue(rs.next());
+
+ assertEquals("hello3", rs.getString("a_s"));
+ assertEquals("hello3", rs.getString(1));
+ assertEquals(26, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(26, rs.getDouble(2), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals("hello0", rs.getString("a_s"));
+ assertEquals("hello0", rs.getString(1));
+ assertEquals(18, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(18, rs.getDouble(2), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals("hello4", rs.getString("a_s"));
+ assertEquals("hello4", rs.getString(1));
+ assertEquals(11, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(11, rs.getDouble(2), 0);
+
+ assertFalse(rs.next());
}
}
}
@@ -338,23 +370,28 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
try (ResultSet rs = stmt.executeQuery("select a_s, sum(a_f) from collection1 group by a_s " +
"order by sum(a_f) desc")) {
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello3"));
- assert(rs.getString(1).equals("hello3"));
- assert(rs.getDouble("sum(a_f)") == 26);
- assert(rs.getDouble(2) == 26);
-
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello0"));
- assert(rs.getString(1).equals("hello0"));
- assert(rs.getDouble("sum(a_f)") == 18);
- assert(rs.getDouble(2) == 18);
-
- assert(rs.next());
- assert(rs.getString("a_s").equals("hello4"));
- assert(rs.getString(1).equals("hello4"));
- assert(rs.getDouble("sum(a_f)") == 11);
- assert(rs.getDouble(2) == 11);
+ assertTrue(rs.next());
+
+ assertEquals("hello3", rs.getString("a_s"));
+ assertEquals("hello3", rs.getString(1));
+ assertEquals(26, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(26, rs.getDouble(2), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals("hello0", rs.getString("a_s"));
+ assertEquals("hello0", rs.getString(1));
+ assertEquals(18, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(18, rs.getDouble(2), 0);
+
+ assertTrue(rs.next());
+
+ assertEquals("hello4", rs.getString("a_s"));
+ assertEquals("hello4", rs.getString(1));
+ assertEquals(11, rs.getDouble("sum(a_f)"), 0);
+ assertEquals(11, rs.getDouble(2), 0);
+
+ assertFalse(rs.next());
}
}
}