From f732250271b28aaf785f7a54b184031e44e1ef18 Mon Sep 17 00:00:00 2001 From: Shuaiqiang Chang Date: Tue, 9 Jun 2020 22:41:13 +0800 Subject: [PATCH] tests: add test --- src/connector/jdbc/pom.xml | 251 ++++++++++-------- .../src/test/java/TestPreparedStatement.java | 1 + ...cribeTest.java => AsyncSubscribeTest.java} | 2 +- .../{TSDBImportTest.java => ImportTest.java} | 9 +- .../java/com/taosdata/jdbc/SelectTest.java | 65 +++++ .../java/com/taosdata/jdbc/StableTest.java | 4 + ...BSubscribeTest.java => SubscribeTest.java} | 2 +- 7 files changed, 211 insertions(+), 123 deletions(-) rename src/connector/jdbc/src/test/java/com/taosdata/jdbc/{TSDBAsyncSubscribeTest.java => AsyncSubscribeTest.java} (98%) rename src/connector/jdbc/src/test/java/com/taosdata/jdbc/{TSDBImportTest.java => ImportTest.java} (94%) create mode 100644 src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java create mode 100644 src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java rename src/connector/jdbc/src/test/java/com/taosdata/jdbc/{TSDBSubscribeTest.java => SubscribeTest.java} (98%) diff --git a/src/connector/jdbc/pom.xml b/src/connector/jdbc/pom.xml index 0f441d097e..456c9e6423 100755 --- a/src/connector/jdbc/pom.xml +++ b/src/connector/jdbc/pom.xml @@ -1,119 +1,136 @@ - 4.0.0 - - com.taosdata.jdbc - taos-jdbcdriver - 1.0.3 - jar - - JDBCDriver - https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc - TDengine JDBC Driver - - - - GNU AFFERO GENERAL PUBLIC LICENSE Version 3 - https://github.com/taosdata/TDengine/blob/master/LICENSE - repo - - - - - scm:git:git://github.com/taosdata/TDengine.git - scm:git:git@github.com:taosdata/TDengine.git - https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc - HEAD - - - - - taosdata - support@taosdata.com - https://www.taosdata.com/ - https://www.taosdata.com/ - - - - - UTF-8 - 1.8 - - 3.6.0 - - 1.1.2 - 3.5 - - - - - commons-logging - commons-logging - ${commons-logging.version} - - - * - * - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - junit - junit - 4.8.2 - test - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.0.0 - - - - src/main/assembly/assembly-jar.xml - - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - UTF-8 - ${java.version} - ${java.version} - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - true - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.taosdata.jdbc + taos-jdbcdriver + 1.0.3 + jar + JDBCDriver + https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc + TDengine JDBC Driver + + + GNU AFFERO GENERAL PUBLIC LICENSE Version 3 + https://github.com/taosdata/TDengine/blob/master/LICENSE + repo + + + + scm:git:git://github.com/taosdata/TDengine.git + scm:git:git@github.com:taosdata/TDengine.git + https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc + HEAD + + + + taosdata + support@taosdata.com + https://www.taosdata.com/ + https://www.taosdata.com/ + + + + UTF-8 + 1.8 + 3.6.0 + 1.1.2 + 3.5 + + + + commons-logging + commons-logging + ${commons-logging.version} + + + * + * + + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + junit + junit + 4.8.2 + test + + + org.jacoco + jacoco-maven-plugin + 0.8.3 + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.0.0 + + + src/main/assembly/assembly-jar.xml + + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + UTF-8 + ${java.version} + ${java.version} + true + true + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + true + + + + org.jacoco + jacoco-maven-plugin + 0.8.3 + + + com/**/* + + + + + pre-test + + prepare-agent + + + + post-test + test + + report + + + + + + diff --git a/src/connector/jdbc/src/test/java/TestPreparedStatement.java b/src/connector/jdbc/src/test/java/TestPreparedStatement.java index 9d7f1cf760..aabc34549b 100644 --- a/src/connector/jdbc/src/test/java/TestPreparedStatement.java +++ b/src/connector/jdbc/src/test/java/TestPreparedStatement.java @@ -22,6 +22,7 @@ public class TestPreparedStatement { } } resSet.close(); + pstmt.close(); connection.close(); } catch (Exception e) { diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBAsyncSubscribeTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/AsyncSubscribeTest.java similarity index 98% rename from src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBAsyncSubscribeTest.java rename to src/connector/jdbc/src/test/java/com/taosdata/jdbc/AsyncSubscribeTest.java index 245ababae1..a7b6848f1e 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBAsyncSubscribeTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/AsyncSubscribeTest.java @@ -12,7 +12,7 @@ import java.util.Properties; import static org.junit.Assert.assertTrue; -public class TSDBAsyncSubscribeTest { +public class AsyncSubscribeTest { Connection connection = null; Statement statement = null; String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBImportTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java similarity index 94% rename from src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBImportTest.java rename to src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java index 8b3c9f3141..063046bc74 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBImportTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java @@ -9,7 +9,7 @@ import java.util.Properties; import static org.junit.Assert.assertEquals; -public class TSDBImportTest { +public class ImportTest { Connection connection = null; Statement statement = null; String dbName = "test"; @@ -36,7 +36,7 @@ public class TSDBImportTest { } @Test - public void insertInto() throws Exception { + public void insertData() throws Exception { long ts = 1496732686000l; for (int i = 0; i < 50; i++) { @@ -49,6 +49,7 @@ public class TSDBImportTest { @Test public void selectData() throws Exception { + insertData(); String sql = "select * from test.t0"; ResultSet resSet = statement.executeQuery(sql); @@ -61,7 +62,7 @@ public class TSDBImportTest { } @Test - public void importInto() throws Exception { + public void importData() throws Exception { // 避免时间重复 long ts = 1496732686000l; @@ -78,7 +79,7 @@ public class TSDBImportTest { assertEquals(10, rows); } -// @After + @After public void close() throws Exception { statement.executeUpdate("drop database " + dbName); statement.close(); 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 new file mode 100644 index 0000000000..4b57131178 --- /dev/null +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java @@ -0,0 +1,65 @@ +package com.taosdata.jdbc; + +import org.junit.Before; +import org.junit.Test; + +import java.sql.*; +import java.util.Properties; + +import static org.junit.Assert.assertEquals; + +public class SelectTest { + Connection connection = null; + Statement statement = null; + String dbName = "test"; + String tName = "t0"; + String host = "localhost"; + + @Before + public void createDatabaseAndTable() throws SQLException { + try { + Class.forName("com.taosdata.jdbc.TSDBDriver"); + } catch (ClassNotFoundException e) { + return; + } + Properties properties = new Properties(); + properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host); + connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata" + , 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 { + 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); + } + + String sql = "select * from " + dbName + "." + tName; + ResultSet resSet = statement.executeQuery(sql); + + int num = 0; + while (resSet.next()) { + num++; + } + resSet.close(); + + assertEquals(num, 50); + } + + public void close() throws SQLException { + statement.executeUpdate("drop database " + dbName); + statement.close(); + connection.close(); + } +} 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 new file mode 100644 index 0000000000..cf44a78b97 --- /dev/null +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java @@ -0,0 +1,4 @@ +package com.taosdata.jdbc; + +public class StableTest { +} diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBSubscribeTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java similarity index 98% rename from src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBSubscribeTest.java rename to src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java index 11698ea299..fd18d85476 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBSubscribeTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java @@ -12,7 +12,7 @@ import java.util.Properties; import static org.junit.Assert.assertTrue; -public class TSDBSubscribeTest { +public class SubscribeTest { Connection connection = null; Statement statement = null; String dbName = "test";