commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brit...@apache.org
Subject svn commit: r916835 [30/41] - in /websites/production/commons/content/proper/commons-dbutils: ./ apidocs/ apidocs/org/apache/commons/dbutils/ apidocs/org/apache/commons/dbutils/class-use/ apidocs/org/apache/commons/dbutils/handlers/ apidocs/org/apache/...
Date Sun, 20 Jul 2014 08:52:25 GMT
Modified: websites/production/commons/content/proper/commons-dbutils/testapidocs/src-html/org/apache/commons/dbutils/AsyncQueryRunnerTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-dbutils/testapidocs/src-html/org/apache/commons/dbutils/AsyncQueryRunnerTest.html (original)
+++ websites/production/commons/content/proper/commons-dbutils/testapidocs/src-html/org/apache/commons/dbutils/AsyncQueryRunnerTest.html Sun Jul 20 08:52:20 2014
@@ -40,461 +40,465 @@
 <span class="sourceLineNo">032</span>import java.util.concurrent.ExecutionException;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import java.util.concurrent.Executors;<a name="line.33"></a>
 <span class="sourceLineNo">034</span>import java.util.concurrent.Future;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>import javax.sql.DataSource;<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.commons.dbutils.handlers.ArrayHandler;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.Before;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.Test;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.mockito.Mock;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.mockito.MockitoAnnotations;<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>@SuppressWarnings("boxing") // test code<a name="line.44"></a>
-<span class="sourceLineNo">045</span>public class AsyncQueryRunnerTest {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    AsyncQueryRunner runner;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    ArrayHandler handler;<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>    @Mock DataSource dataSource;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    @Mock Connection conn;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    @Mock PreparedStatement stmt;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    @Mock ParameterMetaData meta;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    @Mock ResultSet results;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>    @Before<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    public void setUp() throws Exception {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>        MockitoAnnotations.initMocks(this);    // init the mocks<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>        when(dataSource.getConnection()).thenReturn(conn);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>        when(conn.prepareStatement(any(String.class))).thenReturn(stmt);<a name="line.60"></a>
-<span class="sourceLineNo">061</span>        when(stmt.getParameterMetaData()).thenReturn(meta);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>        when(stmt.getResultSet()).thenReturn(results);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>        when(stmt.executeQuery()).thenReturn(results);<a name="line.63"></a>
-<span class="sourceLineNo">064</span>        when(results.next()).thenReturn(false);<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>         handler = new ArrayHandler();<a name="line.66"></a>
-<span class="sourceLineNo">067</span>         runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1), new QueryRunner(dataSource));<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>    //<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    // Batch test cases<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    //<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    private void callGoodBatch(Connection conn, Object[][] params) throws Exception {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        Future&lt;int[]&gt; future = runner.batch(conn, "select * from blah where ? = ?", params);<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>        future.get();<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>        verify(stmt, times(2)).addBatch();<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        verify(stmt, times(1)).executeBatch();<a name="line.80"></a>
-<span class="sourceLineNo">081</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>    private void callGoodBatch(Object[][] params) throws Exception {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        Future&lt;int[]&gt; future = runner.batch("select * from blah where ? = ?", params);<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>        future.get();<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        <a name="line.90"></a>
-<span class="sourceLineNo">091</span>        verify(stmt, times(2)).addBatch();<a name="line.91"></a>
-<span class="sourceLineNo">092</span>        verify(stmt, times(1)).executeBatch();<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.93"></a>
-<span class="sourceLineNo">094</span>        verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>    @Test<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    public void testGoodBatch() throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>        callGoodBatch(params);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>    @SuppressWarnings("deprecation") // deliberate test of deprecated code<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    @Test<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    public void testGoodBatchPmdTrue() throws Exception {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>        runner = new AsyncQueryRunner(dataSource, true, Executors.newFixedThreadPool(1));<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>        callGoodBatch(params);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>    @Test<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    public void testGoodBatchDefaultConstructor() throws Exception {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>        runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1));<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>        callGoodBatch(conn, params);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>    @Test<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    public void testNullParamsBatch() throws Exception {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>        String[][] params = new String[][] { { null, "unit" }, { "test", null } };<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>        callGoodBatch(params);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">035</span>import java.util.concurrent.TimeUnit;<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>import javax.sql.DataSource;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.commons.dbutils.handlers.ArrayHandler;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.Before;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.Test;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.mockito.Mock;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.mockito.MockitoAnnotations;<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>@SuppressWarnings("boxing") // test code<a name="line.45"></a>
+<span class="sourceLineNo">046</span>public class AsyncQueryRunnerTest {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    AsyncQueryRunner runner;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    ArrayHandler handler;<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>    @Mock DataSource dataSource;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    @Mock Connection conn;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    @Mock PreparedStatement stmt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    @Mock ParameterMetaData meta;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    @Mock ResultSet results;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>    @Before<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    public void setUp() throws Exception {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>        MockitoAnnotations.initMocks(this);<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>        when(dataSource.getConnection()).thenReturn(conn);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>        when(conn.prepareStatement(any(String.class))).thenReturn(stmt);<a name="line.61"></a>
+<span class="sourceLineNo">062</span>        when(stmt.getParameterMetaData()).thenReturn(meta);<a name="line.62"></a>
+<span class="sourceLineNo">063</span>        when(stmt.getResultSet()).thenReturn(results);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>        when(stmt.executeQuery()).thenReturn(results);<a name="line.64"></a>
+<span class="sourceLineNo">065</span>        when(results.next()).thenReturn(false);<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>         handler = new ArrayHandler();<a name="line.67"></a>
+<span class="sourceLineNo">068</span>         runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1), new QueryRunner(dataSource));<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>    //<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    // Batch test cases<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    //<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    private void callGoodBatch(Connection conn, Object[][] params) throws Exception {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>        Future&lt;int[]&gt; future = runner.batch(conn, "select * from blah where ? = ?", params);<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>        future.get();<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>        verify(stmt, times(2)).addBatch();<a name="line.80"></a>
+<span class="sourceLineNo">081</span>        verify(stmt, times(1)).executeBatch();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>    private void callGoodBatch(Object[][] params) throws Exception {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>        Future&lt;int[]&gt; future = runner.batch("select * from blah where ? = ?", params);<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>        future.get();<a name="line.90"></a>
+<span class="sourceLineNo">091</span>        <a name="line.91"></a>
+<span class="sourceLineNo">092</span>        verify(stmt, times(2)).addBatch();<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        verify(stmt, times(1)).executeBatch();<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.94"></a>
+<span class="sourceLineNo">095</span>        verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>    @Test<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    public void testGoodBatch() throws Exception {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>        callGoodBatch(params);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>    @SuppressWarnings("deprecation") // deliberate test of deprecated code<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    @Test<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    public void testGoodBatchPmdTrue() throws Exception {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>        runner = new AsyncQueryRunner(dataSource, true, Executors.newFixedThreadPool(1));<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>        callGoodBatch(params);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>    @Test<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    public void testGoodBatchDefaultConstructor() throws Exception {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1));<a name="line.116"></a>
+<span class="sourceLineNo">117</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>        callGoodBatch(conn, params);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>    @Test<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    public void testNullParamsBatch() throws Exception {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        String[][] params = new String[][] { { null, "unit" }, { "test", null } };<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>        callGoodBatch(params);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
 <span class="sourceLineNo">128</span><a name="line.128"></a>
 <span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    // helper method for calling batch when an exception is expected<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    private void callBatchWithException(String sql, Object[][] params) throws Exception {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        Future&lt;int[]&gt; future = null;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        boolean caught = false;<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>        try {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>            future = runner.batch(sql, params);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            <a name="line.137"></a>
-<span class="sourceLineNo">138</span>            future.get();<a name="line.138"></a>
-<span class="sourceLineNo">139</span>            <a name="line.139"></a>
-<span class="sourceLineNo">140</span>            verify(stmt, times(2)).addBatch();<a name="line.140"></a>
-<span class="sourceLineNo">141</span>            verify(stmt, times(1)).executeBatch();<a name="line.141"></a>
-<span class="sourceLineNo">142</span>            verify(stmt, times(1)).close();    // make sure the statement is closed<a name="line.142"></a>
-<span class="sourceLineNo">143</span>            verify(conn, times(1)).close();    // make sure the connection is closed<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        } catch(Exception e) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>            caught = true;<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        }<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>        if(!caught)<a name="line.148"></a>
-<span class="sourceLineNo">149</span>            fail("Exception never thrown, but expected");<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    @Test<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public void testTooFewParamsBatch() throws Exception {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>        String[][] params = new String[][] { { "unit" }, { "test" } };<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>        callBatchWithException("select * from blah where ? = ?", params);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    @Test<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    public void testTooManyParamsBatch() throws Exception {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        String[][] params = new String[][] { { "unit", "unit", "unit" }, { "test", "test", "test" } };<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>        callBatchWithException("select * from blah where ? = ?", params);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>    @Test(expected=ExecutionException.class)<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    public void testNullConnectionBatch() throws Exception {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>        when(dataSource.getConnection()).thenReturn(null);<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>        runner.batch("select * from blah where ? = ?", params).get();<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>    @Test(expected=ExecutionException.class)<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    public void testNullSqlBatch() throws Exception {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>        runner.batch(null, params).get();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    @Test(expected=ExecutionException.class)<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    public void testNullParamsArgBatch() throws Exception {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span>        runner.batch("select * from blah where ? = ?", null).get();<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>    @Test<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    public void testAddBatchException() throws Exception {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>        doThrow(new SQLException()).when(stmt).addBatch();<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>        callBatchWithException("select * from blah where ? = ?", params);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>    @Test<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    public void testExecuteBatchException() throws Exception {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>        doThrow(new SQLException()).when(stmt).executeBatch();<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>        callBatchWithException("select * from blah where ? = ?", params);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    // helper method for calling batch when an exception is expected<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    private void callBatchWithException(String sql, Object[][] params) throws Exception {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>        Future&lt;int[]&gt; future = null;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        boolean caught = false;<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>        try {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>            future = runner.batch(sql, params);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            <a name="line.138"></a>
+<span class="sourceLineNo">139</span>            future.get();<a name="line.139"></a>
+<span class="sourceLineNo">140</span>            <a name="line.140"></a>
+<span class="sourceLineNo">141</span>            verify(stmt, times(2)).addBatch();<a name="line.141"></a>
+<span class="sourceLineNo">142</span>            verify(stmt, times(1)).executeBatch();<a name="line.142"></a>
+<span class="sourceLineNo">143</span>            verify(stmt, times(1)).close();    // make sure the statement is closed<a name="line.143"></a>
+<span class="sourceLineNo">144</span>            verify(conn, times(1)).close();    // make sure the connection is closed<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        } catch(Exception e) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>            caught = true;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>        }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>        if(!caught)<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            fail("Exception never thrown, but expected");<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    }<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>    @Test<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    public void testTooFewParamsBatch() throws Exception {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        String[][] params = new String[][] { { "unit" }, { "test" } };<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>        callBatchWithException("select * from blah where ? = ?", params);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>    @Test<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    public void testTooManyParamsBatch() throws Exception {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        String[][] params = new String[][] { { "unit", "unit", "unit" }, { "test", "test", "test" } };<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>        callBatchWithException("select * from blah where ? = ?", params);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>    @Test(expected=ExecutionException.class)<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    public void testNullConnectionBatch() throws Exception {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        when(dataSource.getConnection()).thenReturn(null);<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>        runner.batch("select * from blah where ? = ?", params).get();<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>    @Test(expected=ExecutionException.class)<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    public void testNullSqlBatch() throws Exception {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>        runner.batch(null, params).get();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    @Test(expected=ExecutionException.class)<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    public void testNullParamsArgBatch() throws Exception {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>        runner.batch("select * from blah where ? = ?", null).get();<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>    @Test<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    public void testAddBatchException() throws Exception {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>        doThrow(new SQLException()).when(stmt).addBatch();<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>        callBatchWithException("select * from blah where ? = ?", params);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    @Test<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    public void testExecuteBatchException() throws Exception {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } };<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>        doThrow(new SQLException()).when(stmt).executeBatch();<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>        callBatchWithException("select * from blah where ? = ?", params);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    }<a name="line.209"></a>
 <span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>    //<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    // Query test cases<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    //<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    private void callGoodQuery(Connection conn) throws Exception {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>        runner.query(conn, "select * from blah where ? = ?", handler, "unit", "test").get();<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>        verify(stmt, times(1)).executeQuery();<a name="line.218"></a>
-<span class="sourceLineNo">219</span>        verify(results, times(1)).close();<a name="line.219"></a>
-<span class="sourceLineNo">220</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>        // call the other variation of query<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        when(meta.getParameterCount()).thenReturn(0);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        runner.query(conn, "select * from blah", handler).get();<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>        verify(stmt, times(2)).executeQuery();<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        verify(results, times(2)).close();<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        verify(stmt, times(2)).close();    // make sure we closed the statement<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>    private void callGoodQuery() throws Exception {<a name="line.233"></a>
-<span class="sourceLineNo">234</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>        runner.query("select * from blah where ? = ?", handler, "unit", "test").get();<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>        verify(stmt, times(1)).executeQuery();<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        verify(results, times(1)).close();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>        // call the other variation of query<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        when(meta.getParameterCount()).thenReturn(0);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        runner.query("select * from blah", handler).get();<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span>        verify(stmt, times(2)).executeQuery();<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        verify(results, times(2)).close();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        verify(stmt, times(2)).close();    // make sure we closed the statement<a name="line.248"></a>
-<span class="sourceLineNo">249</span>        verify(conn, times(2)).close();    // make sure we closed the connection<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>    @Test<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    public void testGoodQuery() throws Exception {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>        callGoodQuery();<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>    @SuppressWarnings("deprecation") // deliberate test of deprecated code<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    @Test<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public void testGoodQueryPmdTrue() throws Exception {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        runner = new AsyncQueryRunner(true, Executors.newFixedThreadPool(1));<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        callGoodQuery(conn);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>    @Test<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    public void testGoodQueryDefaultConstructor() throws Exception {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>        runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1));<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        callGoodQuery(conn);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    //<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    // Query test cases<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    //<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    private void callGoodQuery(Connection conn) throws Exception {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>        runner.query(conn, "select * from blah where ? = ?", handler, "unit", "test").get();<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>        verify(stmt, times(1)).executeQuery();<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        verify(results, times(1)).close();<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.221"></a>
+<span class="sourceLineNo">222</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>        // call the other variation of query<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        when(meta.getParameterCount()).thenReturn(0);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        runner.query(conn, "select * from blah", handler).get();<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>        verify(stmt, times(2)).executeQuery();<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        verify(results, times(2)).close();<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        verify(stmt, times(2)).close();    // make sure we closed the statement<a name="line.230"></a>
+<span class="sourceLineNo">231</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>    private void callGoodQuery() throws Exception {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        runner.query("select * from blah where ? = ?", handler, "unit", "test").get();<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>        verify(stmt, times(1)).executeQuery();<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        verify(results, times(1)).close();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>        // call the other variation of query<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        when(meta.getParameterCount()).thenReturn(0);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        runner.query("select * from blah", handler).get();<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>        verify(stmt, times(2)).executeQuery();<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        verify(results, times(2)).close();<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        verify(stmt, times(2)).close();    // make sure we closed the statement<a name="line.249"></a>
+<span class="sourceLineNo">250</span>        verify(conn, times(2)).close();    // make sure we closed the connection<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    @Test<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    public void testGoodQuery() throws Exception {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        callGoodQuery();<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span>    @SuppressWarnings("deprecation") // deliberate test of deprecated code<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    @Test<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    public void testGoodQueryPmdTrue() throws Exception {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>        runner = new AsyncQueryRunner(true, Executors.newFixedThreadPool(1));<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        callGoodQuery(conn);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span>    @Test<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    public void testGoodQueryDefaultConstructor() throws Exception {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>        runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1));<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        callGoodQuery(conn);<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    }<a name="line.269"></a>
 <span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span>    // helper method for calling batch when an exception is expected<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    private void callQueryWithException(Object... params) throws Exception {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>        boolean caught = false;<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>        try {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>            when(meta.getParameterCount()).thenReturn(2);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>            runner.query("select * from blah where ? = ?", handler, params).get();<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>            verify(stmt, times(1)).executeQuery();<a name="line.279"></a>
-<span class="sourceLineNo">280</span>            verify(results, times(1)).close();<a name="line.280"></a>
-<span class="sourceLineNo">281</span>            verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        } catch(Exception e) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            caught = true;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>        if(!caught)<a name="line.287"></a>
-<span class="sourceLineNo">288</span>            fail("Exception never thrown, but expected");<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>    @Test<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    public void testNoParamsQuery() throws Exception {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        callQueryWithException();<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>    @Test<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    public void testTooFewParamsQuery() throws Exception {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        callQueryWithException("unit");<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>    @Test<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    public void testTooManyParamsQuery() throws Exception {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        callQueryWithException("unit", "test", "fail");<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    @Test(expected=ExecutionException.class)<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    public void testNullConnectionQuery() throws Exception {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        when(dataSource.getConnection()).thenReturn(null);<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span>        runner.query("select * from blah where ? = ?", handler, "unit", "test").get();<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>    @Test(expected=ExecutionException.class)<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    public void testNullSqlQuery() throws Exception {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>        runner.query(null, handler).get();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>    @Test(expected=ExecutionException.class)<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    public void testNullHandlerQuery() throws Exception {<a name="line.322"></a>
-<span class="sourceLineNo">323</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>        runner.query("select * from blah where ? = ?", null).get();<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>    @Test<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    public void testExecuteQueryException() throws Exception {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        doThrow(new SQLException()).when(stmt).executeQuery();<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>        callQueryWithException(handler, "unit", "test");<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>    // helper method for calling batch when an exception is expected<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    private void callQueryWithException(Object... params) throws Exception {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        boolean caught = false;<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>        try {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>            when(meta.getParameterCount()).thenReturn(2);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>            runner.query("select * from blah where ? = ?", handler, params).get();<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>            verify(stmt, times(1)).executeQuery();<a name="line.280"></a>
+<span class="sourceLineNo">281</span>            verify(results, times(1)).close();<a name="line.281"></a>
+<span class="sourceLineNo">282</span>            verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.283"></a>
+<span class="sourceLineNo">284</span>        } catch(Exception e) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            caught = true;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span>        if(!caught)<a name="line.288"></a>
+<span class="sourceLineNo">289</span>            fail("Exception never thrown, but expected");<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    @Test<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    public void testNoParamsQuery() throws Exception {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>        callQueryWithException();<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>    @Test<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    public void testTooFewParamsQuery() throws Exception {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>        callQueryWithException("unit");<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>    @Test<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    public void testTooManyParamsQuery() throws Exception {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        callQueryWithException("unit", "test", "fail");<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>    @Test(expected=ExecutionException.class)<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    public void testNullConnectionQuery() throws Exception {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        when(dataSource.getConnection()).thenReturn(null);<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span>        runner.query("select * from blah where ? = ?", handler, "unit", "test").get();<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>    @Test(expected=ExecutionException.class)<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    public void testNullSqlQuery() throws Exception {<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>        runner.query(null, handler).get();<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>    @Test(expected=ExecutionException.class)<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    public void testNullHandlerQuery() throws Exception {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>        runner.query("select * from blah where ? = ?", null).get();<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    @Test<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    public void testExecuteQueryException() throws Exception {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>        doThrow(new SQLException()).when(stmt).executeQuery();<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>        callQueryWithException(handler, "unit", "test");<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
 <span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>    //<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    // Update test cases<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    //<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    private void callGoodUpdate(Connection conn) throws Exception {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        runner.update(conn, "update blah set ? = ?", "unit", "test").get();<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>        verify(stmt, times(1)).executeUpdate();<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span>        // call the other variation<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        when(meta.getParameterCount()).thenReturn(0);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        runner.update(conn, "update blah set unit = test").get();<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>        verify(stmt, times(2)).executeUpdate();<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        verify(stmt, times(2)).close();    // make sure we closed the statement<a name="line.352"></a>
-<span class="sourceLineNo">353</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>        // call the other variation<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        when(meta.getParameterCount()).thenReturn(1);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        runner.update(conn, "update blah set unit = ?", "test").get();<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span>        verify(stmt, times(3)).executeUpdate();<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        verify(stmt, times(3)).close();    // make sure we closed the statement<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    }<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span>    private void callGoodUpdate() throws Exception {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.365"></a>
-<span class="sourceLineNo">366</span>        runner.update("update blah set ? = ?", "unit", "test").get();<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span>        verify(stmt, times(1)).executeUpdate();<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span>        // call the other variation<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        when(meta.getParameterCount()).thenReturn(0);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        runner.update("update blah set unit = test").get();<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span>        verify(stmt, times(2)).executeUpdate();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        verify(stmt, times(2)).close();    // make sure we closed the statement<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        verify(conn, times(2)).close();    // make sure we closed the connection<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>        // call the other variation<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        when(meta.getParameterCount()).thenReturn(1);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        runner.update("update blah set unit = ?", "test").get();<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span>        verify(stmt, times(3)).executeUpdate();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        verify(stmt, times(3)).close();    // make sure we closed the statement<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        verify(conn, times(3)).close();    // make sure we closed the connection<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>    @Test<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    public void testGoodUpdate() throws Exception {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>        callGoodUpdate();<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>    @SuppressWarnings("deprecation") // deliberate test of deprecated code<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    @Test<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    public void testGoodUpdatePmdTrue() throws Exception {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        runner = new AsyncQueryRunner(true, Executors.newFixedThreadPool(1));<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        callGoodUpdate(conn);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span>    @Test<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    public void testGoodUpdateDefaultConstructor() throws Exception {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1));<a name="line.403"></a>
-<span class="sourceLineNo">404</span>        callGoodUpdate(conn);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>    // helper method for calling batch when an exception is expected<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    private void callUpdateWithException(Object... params) throws Exception {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        boolean caught = false;<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span>        try {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>            when(meta.getParameterCount()).thenReturn(2);<a name="line.412"></a>
-<span class="sourceLineNo">413</span>            runner.update("select * from blah where ? = ?", params).get();<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span>            verify(stmt, times(1)).executeUpdate();<a name="line.415"></a>
-<span class="sourceLineNo">416</span>            verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.416"></a>
-<span class="sourceLineNo">417</span>            verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        } catch(Exception e) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>            caught = true;<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>        if(!caught)<a name="line.422"></a>
-<span class="sourceLineNo">423</span>            fail("Exception never thrown, but expected");<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span>    @Test<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    public void testNoParamsUpdate() throws Exception {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        callUpdateWithException();<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span>    @Test<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    public void testTooFewParamsUpdate() throws Exception {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        callUpdateWithException("unit");<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span>    @Test<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    public void testTooManyParamsUpdate() throws Exception {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        callUpdateWithException("unit", "test", "fail");<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    <a name="line.440"></a>
-<span class="sourceLineNo">441</span>    @Test<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    public void testInsertUsesGivenQueryRunner() throws Exception {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        QueryRunner mockQueryRunner = mock(QueryRunner.class<a name="line.443"></a>
-<span class="sourceLineNo">444</span>                , org.mockito.Mockito.withSettings().verboseLogging() // debug for Continuum<a name="line.444"></a>
-<span class="sourceLineNo">445</span>                );<a name="line.445"></a>
-<span class="sourceLineNo">446</span>        runner = new AsyncQueryRunner(Executors.newSingleThreadExecutor(), mockQueryRunner);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>        <a name="line.447"></a>
-<span class="sourceLineNo">448</span>        runner.insert("1", handler);<a name="line.448"></a>
-<span class="sourceLineNo">449</span>        runner.insert("2", handler, "param1");<a name="line.449"></a>
-<span class="sourceLineNo">450</span>        runner.insert(conn, "3", handler);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>        runner.insert(conn, "4", handler, "param1");<a name="line.451"></a>
-<span class="sourceLineNo">452</span>        <a name="line.452"></a>
-<span class="sourceLineNo">453</span>        verify(mockQueryRunner).insert("1", handler);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>        verify(mockQueryRunner).insert("2", handler, "param1");<a name="line.454"></a>
-<span class="sourceLineNo">455</span>        verify(mockQueryRunner).insert(conn, "3", handler);<a name="line.455"></a>
-<span class="sourceLineNo">456</span>        verify(mockQueryRunner).insert(conn, "4", handler, "param1");<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>    @Test(expected=ExecutionException.class)<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    public void testNullConnectionUpdate() throws Exception {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        when(dataSource.getConnection()).thenReturn(null);<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span>        runner.update("select * from blah where ? = ?", "unit", "test").get();<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>    @Test(expected=ExecutionException.class)<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    public void testNullSqlUpdate() throws Exception {<a name="line.468"></a>
-<span class="sourceLineNo">469</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.469"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>    //<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    // Update test cases<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    //<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    private void callGoodUpdate(Connection conn) throws Exception {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.341"></a>
+<span class="sourceLineNo">342</span>        runner.update(conn, "update blah set ? = ?", "unit", "test").get();<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>        verify(stmt, times(1)).executeUpdate();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // call the other variation<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        when(meta.getParameterCount()).thenReturn(0);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>        runner.update(conn, "update blah set unit = test").get();<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>        verify(stmt, times(2)).executeUpdate();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        verify(stmt, times(2)).close();    // make sure we closed the statement<a name="line.353"></a>
+<span class="sourceLineNo">354</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>        // call the other variation<a name="line.356"></a>
+<span class="sourceLineNo">357</span>        when(meta.getParameterCount()).thenReturn(1);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>        runner.update(conn, "update blah set unit = ?", "test").get();<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span>        verify(stmt, times(3)).executeUpdate();<a name="line.360"></a>
+<span class="sourceLineNo">361</span>        verify(stmt, times(3)).close();    // make sure we closed the statement<a name="line.361"></a>
+<span class="sourceLineNo">362</span>        verify(conn, times(0)).close();    // make sure we closed the connection<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    }<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span>    private void callGoodUpdate() throws Exception {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>        runner.update("update blah set ? = ?", "unit", "test").get();<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>        verify(stmt, times(1)).executeUpdate();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>        verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span>        // call the other variation<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        when(meta.getParameterCount()).thenReturn(0);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        runner.update("update blah set unit = test").get();<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>        verify(stmt, times(2)).executeUpdate();<a name="line.377"></a>
+<span class="sourceLineNo">378</span>        verify(stmt, times(2)).close();    // make sure we closed the statement<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        verify(conn, times(2)).close();    // make sure we closed the connection<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span>        // call the other variation<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        when(meta.getParameterCount()).thenReturn(1);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        runner.update("update blah set unit = ?", "test").get();<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span>        verify(stmt, times(3)).executeUpdate();<a name="line.385"></a>
+<span class="sourceLineNo">386</span>        verify(stmt, times(3)).close();    // make sure we closed the statement<a name="line.386"></a>
+<span class="sourceLineNo">387</span>        verify(conn, times(3)).close();    // make sure we closed the connection<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span>    @Test<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    public void testGoodUpdate() throws Exception {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        callGoodUpdate();<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>    @SuppressWarnings("deprecation") // deliberate test of deprecated code<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    @Test<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    public void testGoodUpdatePmdTrue() throws Exception {<a name="line.397"></a>
+<span class="sourceLineNo">398</span>        runner = new AsyncQueryRunner(true, Executors.newFixedThreadPool(1));<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        callGoodUpdate(conn);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    }<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span>    @Test<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    public void testGoodUpdateDefaultConstructor() throws Exception {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1));<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        callGoodUpdate(conn);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>    // helper method for calling batch when an exception is expected<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    private void callUpdateWithException(Object... params) throws Exception {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        boolean caught = false;<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span>        try {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>            when(meta.getParameterCount()).thenReturn(2);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>            runner.update("select * from blah where ? = ?", params).get();<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span>            verify(stmt, times(1)).executeUpdate();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>            verify(stmt, times(1)).close();    // make sure we closed the statement<a name="line.417"></a>
+<span class="sourceLineNo">418</span>            verify(conn, times(1)).close();    // make sure we closed the connection<a name="line.418"></a>
+<span class="sourceLineNo">419</span>        } catch(Exception e) {<a name="line.419"></a>
+<span class="sourceLineNo">420</span>            caught = true;<a name="line.420"></a>
+<span class="sourceLineNo">421</span>        }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span>        if(!caught)<a name="line.423"></a>
+<span class="sourceLineNo">424</span>            fail("Exception never thrown, but expected");<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span>    @Test<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    public void testNoParamsUpdate() throws Exception {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        callUpdateWithException();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    }<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span>    @Test<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    public void testTooFewParamsUpdate() throws Exception {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        callUpdateWithException("unit");<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span>    @Test<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    public void testTooManyParamsUpdate() throws Exception {<a name="line.438"></a>
+<span class="sourceLineNo">439</span>        callUpdateWithException("unit", "test", "fail");<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    <a name="line.441"></a>
+<span class="sourceLineNo">442</span>    @Test<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    public void testInsertUsesGivenQueryRunner() throws Exception {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>        QueryRunner mockQueryRunner = mock(QueryRunner.class<a name="line.444"></a>
+<span class="sourceLineNo">445</span>                , org.mockito.Mockito.withSettings().verboseLogging() // debug for Continuum<a name="line.445"></a>
+<span class="sourceLineNo">446</span>                );<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        runner = new AsyncQueryRunner(Executors.newSingleThreadExecutor(), mockQueryRunner);<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>        runner.insert("1", handler);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>        runner.insert("2", handler, "param1");<a name="line.450"></a>
+<span class="sourceLineNo">451</span>        runner.insert(conn, "3", handler);<a name="line.451"></a>
+<span class="sourceLineNo">452</span>        runner.insert(conn, "4", handler, "param1");<a name="line.452"></a>
+<span class="sourceLineNo">453</span><a name="line.453"></a>
+<span class="sourceLineNo">454</span>        // give the Executor time to submit all insert statements. Otherwise the following verify statements will fail from time to time.<a name="line.454"></a>
+<span class="sourceLineNo">455</span>        TimeUnit.MILLISECONDS.sleep(50);<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span>        verify(mockQueryRunner).insert("1", handler);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>        verify(mockQueryRunner).insert("2", handler, "param1");<a name="line.458"></a>
+<span class="sourceLineNo">459</span>        verify(mockQueryRunner).insert(conn, "3", handler);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>        verify(mockQueryRunner).insert(conn, "4", handler, "param1");<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span>    @Test(expected=ExecutionException.class)<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    public void testNullConnectionUpdate() throws Exception {<a name="line.464"></a>
+<span class="sourceLineNo">465</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.465"></a>
+<span class="sourceLineNo">466</span>        when(dataSource.getConnection()).thenReturn(null);<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>        runner.update("select * from blah where ? = ?", "unit", "test").get();<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    }<a name="line.469"></a>
 <span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span>        runner.update(null).get();<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    }<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span>    @Test<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    public void testExecuteUpdateException() throws Exception {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>        doThrow(new SQLException()).when(stmt).executeUpdate();<a name="line.476"></a>
+<span class="sourceLineNo">471</span>    @Test(expected=ExecutionException.class)<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    public void testNullSqlUpdate() throws Exception {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>        when(meta.getParameterCount()).thenReturn(2);<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span>        runner.update(null).get();<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    }<a name="line.476"></a>
 <span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>        callUpdateWithException("unit", "test");<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span>    //<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    // Random tests<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    //<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    @Test(expected=ExecutionException.class)<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    public void testBadPrepareConnection() throws Exception {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>        runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1));<a name="line.486"></a>
-<span class="sourceLineNo">487</span>        runner.update("update blah set unit = test").get();<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    }<a name="line.488"></a>
-<span class="sourceLineNo">489</span>}<a name="line.489"></a>
+<span class="sourceLineNo">478</span>    @Test<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    public void testExecuteUpdateException() throws Exception {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>        doThrow(new SQLException()).when(stmt).executeUpdate();<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>        callUpdateWithException("unit", "test");<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    }<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span>    //<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    // Random tests<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    //<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    @Test(expected=ExecutionException.class)<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    public void testBadPrepareConnection() throws Exception {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>        runner = new AsyncQueryRunner(Executors.newFixedThreadPool(1));<a name="line.490"></a>
+<span class="sourceLineNo">491</span>        runner.update("update blah set unit = test").get();<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>}<a name="line.493"></a>
 
 
 



Mime
View raw message