Changeset: 35db4977355d for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/35db4977355d
Modified Files:
src/test/java/JDBC_API_Tester.java
src/test/java/org/monetdb/jdbc/ApiTests.java
Branch: default
Log Message:
Convert Test_PSgetObject() -> ApiTests#testGetIntObject()
diffs (187 lines):
diff --git a/src/test/java/JDBC_API_Tester.java
b/src/test/java/JDBC_API_Tester.java
--- a/src/test/java/JDBC_API_Tester.java
+++ b/src/test/java/JDBC_API_Tester.java
@@ -1024,122 +1024,6 @@ public final class JDBC_API_Tester exten
}
@Test
- public void Test_PSgetObject() {
- sb.setLength(0); // clear the output log buffer
-
- Statement stmt = null;
- try {
- con.setAutoCommit(false);
- // >> false: auto commit was just switched off
- sb.append("0.
false\t").append(con.getAutoCommit()).append("\n");
-
- stmt = con.createStatement();
- sb.append("1. creating test table...");
- stmt.executeUpdate("CREATE TABLE table_Test_PSgetObject
(ti tinyint, si smallint, i int, bi bigint)");
- sb.append("success\n");
- stmt.close();
- } catch (SQLException e) {
- sb.append("FAILED:
").append(e.getMessage()).append("\n");
- }
- closeStmtResSet(stmt, null);
-
- PreparedStatement pstmt = null;
- ResultSet rs = null;
- try {
- sb.append("2a. inserting 3 records as batch...");
- pstmt = con.prepareStatement("INSERT INTO
table_Test_PSgetObject (ti,si,i,bi) VALUES (?,?,?,?)");
- pstmt.setShort(1, (short)1);
- pstmt.setShort(2, (short)1);
- pstmt.setInt (3, 1);
- pstmt.setLong(4, (long)1);
- pstmt.addBatch();
-
- pstmt.setShort(1, (short)127);
- pstmt.setShort(2, (short)12700);
- pstmt.setInt (3, 1270000);
- pstmt.setLong(4, (long)127000000);
- pstmt.addBatch();
-
- pstmt.setShort(1, (short)-127);
- pstmt.setShort(2, (short)-12700);
- pstmt.setInt (3, -1270000);
- pstmt.setLong(4, (long)-127000000);
- pstmt.addBatch();
-
- pstmt.executeBatch();
- sb.append(" passed\n");
- sb.append(pstmt.toString()); // test showing
prepared statement
-
- sb.append("2b. closing PreparedStatement...");
- pstmt.close();
- sb.append(" passed\n");
- } catch (SQLException e) {
- sb.append("FAILED to INSERT data:
").append(e.getMessage()).append("\n");
- while ((e = e.getNextException()) != null)
- sb.append("FAILED:
").append(e.getMessage()).append("\n");
- }
-
- try {
- sb.append("3a. selecting records...");
- pstmt = con.prepareStatement("SELECT ti,si,i,bi FROM
table_Test_PSgetObject ORDER BY ti,si,i,bi");
- rs = pstmt.executeQuery();
- sb.append(" passed\n");
-
- while (rs.next()) {
- // test fix for
https://github.com/MonetDB/MonetDB/issues/4026
- Short ti = (Short) rs.getObject(1);
- Short si = (Short) rs.getObject(2);
- Integer i = (Integer) rs.getObject(3);
- Long bi = (Long) rs.getObject(4);
-
- sb.append(" Retrieved row data:
ti=").append(ti).append(" si=").append(si).append(" i=").append(i).append("
bi=").append(bi).append("\n");
- }
-
- sb.append("3b. closing ResultSet...");
- rs.close();
- sb.append(" passed\n");
-
- sb.append("3c. closing PreparedStatement...");
- pstmt.close();
- sb.append(" passed\n");
- } catch (SQLException e) {
- sb.append("FAILED to RETRIEVE data:
").append(e.getMessage()).append("\n");
- while ((e = e.getNextException()) != null)
- sb.append("FAILED:
").append(e.getMessage()).append("\n");
- }
- closeStmtResSet(pstmt, rs);
-
- try {
- sb.append("4. Rollback changes...");
- con.rollback();
- sb.append(" passed\n");
-
- // restore default setting
- con.setAutoCommit(true);
- } catch (SQLException e) {
- sb.append("FAILED to rollback:
").append(e.getMessage()).append("\n");
- }
-
- compareExpectedOutput("Test_PSgetObject",
- "0. false false\n" +
- "1. creating test table...success\n" +
- "2a. inserting 3 records as batch... passed\n" +
- "Prepared SQL: INSERT INTO table_Test_PSgetObject
(ti,si,i,bi) VALUES (?,?,?,?)\n" +
- " parameter 1 tinyint, set value: -127\n" +
- " parameter 2 smallint, set value: -12700\n" +
- " parameter 3 int, set value: -1270000\n" +
- " parameter 4 bigint, set value: -127000000\n" +
- "2b. closing PreparedStatement... passed\n" +
- "3a. selecting records... passed\n" +
- " Retrieved row data: ti=-127 si=-12700 i=-1270000
bi=-127000000\n" +
- " Retrieved row data: ti=1 si=1 i=1 bi=1\n" +
- " Retrieved row data: ti=127 si=12700 i=1270000
bi=127000000\n" +
- "3b. closing ResultSet... passed\n" +
- "3c. closing PreparedStatement... passed\n" +
- "4. Rollback changes... passed\n");
- }
-
- @Test
public void Test_PSlargebatchval() {
sb.setLength(0); // clear the output log buffer
diff --git a/src/test/java/org/monetdb/jdbc/ApiTests.java
b/src/test/java/org/monetdb/jdbc/ApiTests.java
--- a/src/test/java/org/monetdb/jdbc/ApiTests.java
+++ b/src/test/java/org/monetdb/jdbc/ApiTests.java
@@ -684,4 +684,57 @@ public class ApiTests {
stmt.executeUpdate("DROP TABLE psgenkey");
}
+
+ @Test
+ public void testGetIntObject() throws SQLException {
+ stmt.executeUpdate("DROP TABLE IF EXISTS test_getobject");
+ stmt.executeUpdate("CREATE TABLE test_getobject (ti tinyint, si
smallint, i int, bi bigint)");
+
+ String ins = "INSERT INTO test_getobject(ti, si, i, bi) VALUES
(?, ?, ?, ?)";
+ try (PreparedStatement ps = conn.prepareStatement(ins)) {
+ ps.setShort(1, (short) 1);
+ ps.setShort(2, (short) 1);
+ ps.setInt(3, 1);
+ ps.setLong(4, 1);
+ ps.addBatch();
+
+ ps.setShort(1, (short) 127);
+ ps.setShort(2, (short) 12700);
+ ps.setInt(3, 1270000);
+ ps.setLong(4, 127000000);
+ ps.addBatch();
+
+ ps.setShort(1, (short) -127);
+ ps.setShort(2, (short) -12700);
+ ps.setInt(3, -1270000);
+ ps.setLong(4, -127000000);
+ ps.addBatch();
+
+ ps.executeBatch();
+ }
+
+ try (ResultSet rs = stmt.executeQuery("SELECT ti, si, i, bi
FROM test_getobject")) {
+ assertTrue(rs.next());
+ assertEquals((short) 1, (Short) rs.getObject(1));
+ assertEquals((short) 1, (Short) rs.getObject(2));
+ assertEquals(1, (Integer) rs.getObject(3));
+ assertEquals((long) 1, (Long) rs.getObject(4));
+
+ assertTrue(rs.next());
+ assertEquals((short) 127, (Short) rs.getObject(1));
+ assertEquals((short) 12700, (Short) rs.getObject(2));
+ assertEquals(1270000, rs.getObject(3));
+ assertEquals((long) 127000000, (Long) rs.getObject(4));
+
+ assertTrue(rs.next());
+ assertEquals((short) -127, (Short) rs.getObject(1));
+ assertEquals((short) -12700, (Short) rs.getObject(2));
+ assertEquals(-1270000, (Integer) rs.getObject(3));
+ assertEquals((long) -127000000, (Long) rs.getObject(4));
+
+ assertFalse(rs.next());
+ }
+
+ stmt.executeUpdate("DROP TABLE test_getobject");
+ }
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
