From d2620c993a67295299de9ef6ab539a46c6b21012 Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Thu, 21 Jan 2021 18:53:44 +0800
Subject: [PATCH] change

---
 .../java/com/taosdata/jdbc/SelectTest.java    | 80 +++++++++++--------
 .../java/com/taosdata/jdbc/StableTest.java    |  8 +-
 2 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
index 6c75860e0f..7db37beaf4 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
@@ -9,61 +9,73 @@ import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
 
-public class SelectTest extends BaseTest {
-    Connection connection = null;
-    Statement statement = null;
+public class SelectTest {
+    Connection connection;
     String dbName = "test";
     String tName = "t0";
-    String host = "localhost";
+    String host = "127.0.0.1";
 
     @Before
-    public void createDatabaseAndTable() throws SQLException {
+    public void createDatabaseAndTable() {
         try {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+            connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+            Statement stmt = connection.createStatement();
+            stmt.execute("drop database if exists " + dbName);
+            stmt.execute("create database if not exists " + dbName);
+            stmt.execute("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
+            stmt.close();
         } catch (ClassNotFoundException e) {
             return;
+        } catch (SQLException e) {
+            e.printStackTrace();
         }
-        Properties properties = new Properties();
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
-        statement = connection.createStatement();
-        statement.executeUpdate("drop database if exists " + dbName);
-        statement.executeUpdate("create database if not exists " + dbName);
-        statement.executeUpdate("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
     }
 
     @Test
-    public void selectData() throws SQLException {
+    public void selectData() {
         long ts = 1496732686000l;
 
-        for (int i = 0; i < 50; i++) {
-            ts++;
-            int row = statement.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")");
-            System.out.println("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")\t" + row);
-            assertEquals(1, row);
-        }
+        try (Statement stmt = connection.createStatement()) {
+            for (int i = 0; i < 50; i++) {
+                ts++;
+                int row = stmt.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")");
+                System.out.println("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")\t" + row);
+                assertEquals(1, row);
+            }
 
-        String sql = "select * from " + dbName + "." + tName;
-        ResultSet resSet = statement.executeQuery(sql);
+            String sql = "select * from " + dbName + "." + tName;
+            ResultSet resSet = stmt.executeQuery(sql);
 
-        int num = 0;
-        while (resSet.next()) {
-            num++;
+            int num = 0;
+            while (resSet.next()) {
+                num++;
+            }
+            resSet.close();
+            assertEquals(num, 50);
+        } catch (SQLException e) {
+            e.printStackTrace();
         }
-        resSet.close();
 
-        assertEquals(num, 50);
     }
 
     @After
-    public void close() throws Exception {
-        statement.executeUpdate("drop database " + dbName);
-        statement.close();
-        connection.close();
-        Thread.sleep(10);
+    public void close() {
+        try {
+            if (connection != null) {
+                Statement stmt = connection.createStatement();
+                stmt.executeUpdate("drop database " + dbName);
+                stmt.close();
+                connection.close();
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
     }
 }
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
index 8a3de4017a..c86a0b4c6a 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
@@ -14,10 +14,10 @@ import static org.junit.Assert.assertEquals;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class StableTest {
 
-    static Connection connection;
-    static String dbName = "test";
-    static String stbName = "st";
-    static String host = "127.0.0.1";
+    private static Connection connection;
+    private static String dbName = "test";
+    private static String stbName = "st";
+    private static String host = "127.0.0.1";
 
     @BeforeClass
     public static void createDatabase() {
-- 
GitLab