fix some tests that missing assert.

Author: youngsofun

databend-jdbc/src/test/java/com/databend/jdbc/TestPrepareStatement.java

@@ -27,79 +27,75 @@ public void setUp()
         Connection c = Utils.createConnection();
         System.out.println("-----------------");
         c.createStatement().execute("create database if not exists test_prepare_statement");
-        System.out.println("drop all existing test table");
 
         c.createStatement().execute("drop table if exists test_prepare_statement");
-        c.createStatement().execute("drop table if exists test_prepare_time");
-        c.createStatement().execute("drop table if exists objects_test1");
-        c.createStatement().execute("drop table if exists binary1");
-        c.createStatement().execute("drop table if exists test_prepare_statement_null");
         c.createStatement().execute("create table test_prepare_statement (a int, b string)");
-        c.createStatement().execute("create table test_prepare_statement_null (a int, b string)");
-        c.createStatement().execute("create table test_prepare_time(a DATE, b TIMESTAMP)");
-        // json data
-        c.createStatement().execute(
-                "CREATE TABLE IF NOT EXISTS objects_test1(id TINYINT, obj VARIANT, d TIMESTAMP, s String, arr ARRAY(INT64)) Engine = Fuse");
-        // Binary data
-        c.createStatement().execute("create table IF NOT EXISTS binary1 (a binary);");
     }
 
     @Test(groups = "IT")
     public void TestBatchInsert() throws SQLException {
         Connection c = Utils.createConnection();
         c.setAutoCommit(false);
+        Statement s = c.createStatement();
+        s.execute("use test_prepare_statement");
+        s.execute("create or replace table batch_insert (a int, b string)");
 
-        PreparedStatement ps = c.prepareStatement("insert into test_prepare_statement values");
-        ps.setInt(1, 1);
-        ps.setString(2, "a");
-        ps.addBatch();
-        ps.setInt(1, 2);
-        ps.setString(2, "b");
-        ps.addBatch();
-        System.out.println("execute batch insert");
+        int[] c1 = {1, 2};
+        String[] c2 = {"a", "b"};
+
+        PreparedStatement ps = c.prepareStatement("insert into batch_insert values");
+        for (int i = 0; i < c1.length; i++) {
+            ps.setInt(1, c1[i]);
+            ps.setString(2, c2[i]);
+            ps.addBatch();
+        }
         int[] ans = ps.executeBatch();
-        Assert.assertEquals(ans.length, 2);
-        Assert.assertEquals(ans[0], 1);
-        Assert.assertEquals(ans[1], 1);
-        Statement statement = c.createStatement();
+        Assert.assertEquals(ans, new int[] {1, 1});
 
-        System.out.println("execute select");
-        statement.execute("SELECT * from test_prepare_statement");
-        ResultSet r = statement.getResultSet();
+        s.execute("SELECT * from batch_insert");
+        ResultSet r = s.getResultSet();
 
-        while (r.next()) {
-            System.out.println(r.getInt(1));
-            System.out.println(r.getString(2));
+        for (int i = 0; i < c1.length; i++) {
+            Assert.assertTrue(r.next());
+            Assert.assertEquals(r.getInt(1), c1[i]);
+            Assert.assertEquals(r.getString(2), c2[i]);
         }
+        Assert.assertFalse(r.next());
     }
 
     @Test(groups = "IT")
     public void TestBatchInsertWithNULL() throws SQLException {
         Connection c = Utils.createConnection();
         c.setAutoCommit(false);
+        Statement s = c.createStatement();
+        s.execute("use test_prepare_statement");
+        s.execute("create or replace table batch_insert_null (a int, b string)");
+
+
+        PreparedStatement ps = c.prepareStatement("insert into batch_insert_null values");
 
-        PreparedStatement ps = c.prepareStatement("insert into test_prepare_statement_null values");
         ps.setInt(1, 1);
         ps.setNull(2, Types.NULL);
         ps.addBatch();
+
         ps.setInt(1, 2);
         ps.setObject(2, null, Types.NULL);
         ps.addBatch();
-        System.out.println("execute batch insert");
+
         int[] ans = ps.executeBatch();
-        Assert.assertEquals(ans.length, 2);
-        Assert.assertEquals(ans[0], 1);
-        Assert.assertEquals(ans[1], 1);
-        Statement statement = c.createStatement();
+        Assert.assertEquals(ans, new int[] {1, 1});
 
-        System.out.println("execute select");
-        statement.execute("SELECT * from test_prepare_statement_null");
+        Statement statement = c.createStatement();
+        statement.execute("SELECT * from batch_insert_null");
         ResultSet r = statement.getResultSet();
 
-        while (r.next()) {
-            System.out.println(r.getInt(1));
-            Assert.assertEquals(r.getObject(2), null);
+        int[] c1 = {1, 2};
+        for (int j : c1) {
+            Assert.assertTrue(r.next());
+            Assert.assertEquals(r.getInt(1), j);
+            Assert.assertNull(r.getString(2));
         }
+        Assert.assertFalse(r.next());
     }
 
     @Test(groups = "IT")
@@ -131,30 +127,29 @@ public void TestConvertSQLWithBatchValues() throws SQLException {
     @Test(groups = "IT")
     public void TestBatchDelete() throws SQLException {
         try ( Connection c = Utils.createConnection();
-              Statement statement = c.createStatement();
+              Statement statement = c.createStatement()
             ) {
             c.setAutoCommit(false);
             c.createStatement().execute("create or replace table test_batch_delete(a int, b string)");
+
+            int[] c1 = {1, 3};
+            String[] c2 = {"b", "b"};
+
             PreparedStatement ps = c.prepareStatement("insert into test_batch_delete values");
-            ps.setInt(1, 1);
-            ps.setString(2, "b");
-            ps.addBatch();
-            ps.setInt(1, 3);
-            ps.setString(2, "b");
-            ps.addBatch();
-            System.out.println("execute batch insert");
-            int[] ans = ps.executeBatch();
-            Assert.assertEquals(ans.length, 2);
-            Assert.assertEquals(ans[0], 1);
-            Assert.assertEquals(ans[1], 1);
+            for (int i = 0; i < c1.length; i++) {
+                ps.setInt(1, c1[i]);
+                ps.setString(2, c2[i]);
+                ps.addBatch();
+            }
+            Assert.assertEquals(ps.executeBatch(), new int[] {1, 1});
 
-            System.out.println("execute select");
             statement.execute("SELECT * from test_batch_delete");
             ResultSet r = statement.getResultSet();
 
-            while (r.next()) {
-                System.out.println(r.getInt(1));
-                System.out.println(r.getString(2));
+            for (int i = 0; i < c1.length; i++) {
+                Assert.assertTrue(r.next());
+                Assert.assertEquals(r.getInt(1), c1[i]);
+                Assert.assertEquals(r.getString(2), c2[i]);
             }
 
             PreparedStatement deletePs = c.prepareStatement("delete from test_batch_delete where a = ?");
@@ -180,27 +175,30 @@ public void TestBatchDelete() throws SQLException {
     @Test(groups = "IT")
     public void TestBatchInsertWithTime() throws SQLException {
         Connection c = Utils.createConnection();
+        Statement s = c.createStatement();
+        s.execute("create or replace table test_prepare_time(a DATE, b TIMESTAMP)");
         c.setAutoCommit(false);
+
+        java.sql.Date[] c1 = {Date.valueOf("2020-01-10"), Date.valueOf("1970-01-01"), Date.valueOf("2021-01-01")};
+        Timestamp[] c2 = {Timestamp.valueOf("1983-07-12 21:30:55.888"), Timestamp.valueOf("1970-01-01 00:00:01"), Timestamp.valueOf("1970-01-01 00:00:01.234")};
+
         PreparedStatement ps = c.prepareStatement("insert into test_prepare_time values");
-        ps.setDate(1, Date.valueOf("2020-01-10"));
-        ps.setTimestamp(2, Timestamp.valueOf("1983-07-12 21:30:55.888"));
-        ps.addBatch();
-        ps.setDate(1, Date.valueOf("1970-01-01"));
-        ps.setTimestamp(2, Timestamp.valueOf("1970-01-01 00:00:01"));
-        ps.addBatch();
-        ps.setDate(1, Date.valueOf("2021-01-01"));
-        ps.setTimestamp(2, Timestamp.valueOf("1970-01-01 00:00:01.234"));
-        int[] ans = ps.executeBatch();
-        Statement statement = c.createStatement();
+        for (int i = 0; i < c1.length; i++) {
+            ps.setDate(1, c1[i]);
+            ps.setTimestamp(2, c2[i]);
+            ps.addBatch();
+        }
+        Assert.assertEquals(ps.executeBatch(), new int[] {1, 1, 1});
 
-        System.out.println("execute select on time");
-        statement.execute("SELECT * from test_prepare_time");
-        ResultSet r = statement.getResultSet();
+        s.execute("SELECT * from test_prepare_time");
+        ResultSet r = s.getResultSet();
 
-        while (r.next()) {
-            System.out.println(r.getDate(1).toString());
-            System.out.println(r.getTimestamp(2).toString());
+        for (int i = 0; i < c1.length; i++) {
+            Assert.assertTrue(r.next());
+            Assert.assertEquals(r.getDate(1), c1[i]);
+            Assert.assertEquals(r.getTimestamp(2), c2[i]);
         }
+        Assert.assertFalse(r.next());
     }
 
     @DataProvider(name = "complexDataType")
@@ -655,5 +653,4 @@ public void testInsertWithSelect() throws SQLException {
         Assert.assertEquals(3, count, "should have 3 rows in the table after insert with select");
         conn.close();
     }
-
 }