diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSet.java b/src/main/java/com/alibaba/druid/mock/MockResultSet.java index e0da888fd8..f40f6f147b 100644 --- a/src/main/java/com/alibaba/druid/mock/MockResultSet.java +++ b/src/main/java/com/alibaba/druid/mock/MockResultSet.java @@ -328,26 +328,22 @@ public class MockResultSet implements ResultSet { @Override public Object getObject(String columnLabel) throws SQLException { - - return null; + return getObject(findColumn(columnLabel)); } @Override public int findColumn(String columnLabel) throws SQLException { - - return 0; + return Integer.parseInt(columnLabel); } @Override public Reader getCharacterStream(int columnIndex) throws SQLException { - - return null; + return (Reader) getObject(columnIndex); } @Override public Reader getCharacterStream(String columnLabel) throws SQLException { - - return null; + return (Reader) getObject(columnLabel); } @Override @@ -957,12 +953,12 @@ public class MockResultSet implements ResultSet { @Override public Reader getNCharacterStream(int columnIndex) throws SQLException { - return (Reader) getNCharacterStream(columnIndex); + return (Reader) getObject(columnIndex); } @Override public Reader getNCharacterStream(String columnLabel) throws SQLException { - return (Reader) getNCharacterStream(columnLabel); + return (Reader) getObject(columnLabel); } @Override @@ -971,8 +967,8 @@ public class MockResultSet implements ResultSet { } @Override - public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { - + public void updateNCharacterStream(String columnLabel, Reader x, long length) throws SQLException { + updateObject(columnLabel, x); } @Override diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java index ef4d7fb39f..49c8a5181b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java @@ -36,7 +36,7 @@ public class PoolableCallableStatementTest extends TestCase { } public void test_basic() throws Exception { - Assert.assertEquals(raw, stmt.getRawPreparedStatement()); + Assert.assertEquals(raw, stmt.getCallableStatementRaw()); } public void test_callableStmt() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java index 6496154e87..aaf1eee5ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java @@ -1194,4 +1194,139 @@ public class ResultSetTest extends TestCase { Assert.assertNotNull(error); } } + + public void test_getSQLXML() throws Exception { + resultSet.next(); + + resultSet.getSQLXML(1); + resultSet.getSQLXML("1"); + + { + SQLException error = null; + try { + resultSet.getSQLXML("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + + { + SQLException error = null; + try { + resultSet.getSQLXML("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + } + + public void test_getNClob() throws Exception { + resultSet.next(); + + resultSet.getNClob(1); + resultSet.getNClob("1"); + + { + SQLException error = null; + try { + resultSet.getNClob("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + + { + SQLException error = null; + try { + resultSet.getNClob("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + } + + public void test_getNString() throws Exception { + resultSet.next(); + + resultSet.getNString(1); + resultSet.getNString("1"); + + { + SQLException error = null; + try { + resultSet.getNString("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + + { + SQLException error = null; + try { + resultSet.getNString("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + } + + public void test_getNCharacterStream() throws Exception { + resultSet.next(); + + resultSet.getNCharacterStream(1); + resultSet.getNCharacterStream("1"); + + { + SQLException error = null; + try { + resultSet.getNCharacterStream("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + + { + SQLException error = null; + try { + resultSet.getNCharacterStream("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + } + + public void test_getCharacterStream() throws Exception { + resultSet.next(); + + resultSet.getCharacterStream(1); + resultSet.getCharacterStream("1"); + + { + SQLException error = null; + try { + resultSet.getCharacterStream("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + + { + SQLException error = null; + try { + resultSet.getCharacterStream("0"); + } catch (SQLException ex) { + error = ex; + } + Assert.assertNotNull(error); + } + } }