You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/02/09 06:42:51 UTC
[linkis] branch dev-1.3.2 updated: [feat] upgrade junit to junit 5 (#4157)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 23245b489 [feat] upgrade junit to junit 5 (#4157)
23245b489 is described below
commit 23245b489c7db83af9d3a303dd8a0f93aa13a332
Author: GuoPhilipse <46...@users.noreply.github.com>
AuthorDate: Thu Feb 9 14:42:43 2023 +0800
[feat] upgrade junit to junit 5 (#4157)
* upgrade junit to junit 5
* allow normal test though jdbc connection not available
---
.../linkis-jdbc-driver/pom.xml | 6 -
.../org/apache/linkis/ujes/jdbc/JDBCSpiTest.java | 10 +-
.../ujes/jdbc/UJESSQLDatabaseMetaDataTest.java | 135 ++++++++++++++-------
.../ujes/jdbc/UJESSQLPreparedStatementTest.java | 78 +++++++-----
.../linkis/ujes/jdbc/UJESSQLResultSetTest.java | 95 +++++++++------
.../linkis/ujes/jdbc/UJESSQLStatementTest.java | 102 ++++++++++------
6 files changed, 268 insertions(+), 158 deletions(-)
diff --git a/linkis-computation-governance/linkis-jdbc-driver/pom.xml b/linkis-computation-governance/linkis-jdbc-driver/pom.xml
index c215e2b71..cdf23c5f2 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/pom.xml
+++ b/linkis-computation-governance/linkis-jdbc-driver/pom.xml
@@ -36,12 +36,6 @@
<artifactId>joda-time</artifactId>
<version>2.10.5</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>RELEASE</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/JDBCSpiTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/JDBCSpiTest.java
index e46017420..427a6b5fc 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/JDBCSpiTest.java
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/JDBCSpiTest.java
@@ -20,8 +20,8 @@ package org.apache.linkis.ujes.jdbc;
import java.sql.DriverManager;
import java.sql.SQLException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
/*
* Notice:
@@ -35,7 +35,7 @@ public class JDBCSpiTest {
Class.forName("org.apache.linkis.ujes.jdbc.UJESSQLDriver");
conn =
(UJESSQLConnection)
- DriverManager.getConnection("jdbc:linkis://127.0.0.1:9001", "root", "123456");
+ DriverManager.getConnection("jdbc:linkis://hostname:port", "root", "123456");
return conn;
}
@@ -45,9 +45,11 @@ public class JDBCSpiTest {
UJESSQLConnection conn =
(UJESSQLConnection)
DriverManager.getConnection("jdbc:linkis://hostname:port", "username", "password");
- Assert.assertNotNull(conn);
+ Assertions.assertNotNull(conn);
} catch (SQLException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java
index 90a016ff6..0dab63b3f 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java
@@ -24,17 +24,20 @@ package org.apache.linkis.ujes.jdbc;
import java.sql.SQLException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class UJESSQLDatabaseMetaDataTest {
private static UJESSQLConnection conn;
private static UJESSQLDatabaseMetaData dbmd;
- @BeforeClass
+ @BeforeAll
public static void preWork() {
try {
conn = CreateConnection.getConnection();
@@ -43,117 +46,165 @@ public class UJESSQLDatabaseMetaDataTest {
e.printStackTrace();
} catch (SQLException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ dbmd = null;
}
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void supportsMinimumSQLGrammar() {
- dbmd.supportsMinimumSQLGrammar();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.supportsMinimumSQLGrammar());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void getResultSetHoldability() {
- dbmd.getResultSetHoldability();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.getResultSetHoldability());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void getMaxColumnsInGroupBy() {
- dbmd.getMaxColumnsInGroupBy();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.getMaxColumnsInGroupBy());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void supportsSubqueriesInComparisons() {
- dbmd.supportsSubqueriesInComparisons();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.supportsSubqueriesInComparisons());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void getMaxColumnsInSelect() {
- dbmd.getMaxColumnsInSelect();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.getMaxColumnsInSelect());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void nullPlusNonNullIsNull() {
- dbmd.nullPlusNonNullIsNull();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.nullPlusNonNullIsNull());
+ }
}
@Test
public void supportsCatalogsInDataManipulation() {
- assertFalse(dbmd.supportsCatalogsInDataManipulation());
+ if (dbmd != null) {
+ assertFalse(dbmd.supportsCatalogsInDataManipulation());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void supportsDataDefinitionAndDataManipulationTransactions() {
- dbmd.supportsDataDefinitionAndDataManipulationTransactions();
+ if (dbmd != null) {
+ Assertions.assertThrows(
+ UJESSQLException.class,
+ () -> dbmd.supportsDataDefinitionAndDataManipulationTransactions());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void supportsTableCorrelationNames() {
- dbmd.supportsTableCorrelationNames();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.supportsTableCorrelationNames());
+ }
}
@Test
public void getDefaultTransactionIsolation() {
- assertEquals(dbmd.getDefaultTransactionIsolation(), 0);
+ if (dbmd != null) {
+ assertEquals(dbmd.getDefaultTransactionIsolation(), 0);
+ }
}
@Test
public void supportsFullOuterJoins() {
- assertTrue(dbmd.supportsFullOuterJoins());
+ if (dbmd != null) {
+ assertTrue(dbmd.supportsFullOuterJoins());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void supportsExpressionsInOrderBy() {
- dbmd.supportsExpressionsInOrderBy();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.supportsExpressionsInOrderBy());
+ }
}
@Test
public void allProceduresAreCallable() {
- assertFalse(dbmd.allProceduresAreCallable());
+ if (dbmd != null) {
+ assertFalse(dbmd.allProceduresAreCallable());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void getMaxTablesInSelect() {
- dbmd.getMaxTablesInSelect();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.getMaxTablesInSelect());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void nullsAreSortedAtStart() {
- dbmd.nullsAreSortedAtStart();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.nullsAreSortedAtStart());
+ }
}
@Test
public void supportsPositionedUpdate() {
- assertFalse(dbmd.supportsPositionedUpdate());
+ if (dbmd != null) {
+ assertFalse(dbmd.supportsPositionedUpdate());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void ownDeletesAreVisible() {
- dbmd.ownDeletesAreVisible(0);
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.ownDeletesAreVisible(0));
+ }
}
@Test
public void supportsResultSetHoldability() {
- assertFalse(dbmd.supportsResultSetHoldability(0));
+ if (dbmd != null) {
+ assertFalse(dbmd.supportsResultSetHoldability(0));
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void getMaxStatements() {
- dbmd.getMaxStatements();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.getMaxStatements());
+ }
}
- @Test(expected = UJESSQLException.class)
+ @Test
public void getRowIdLifetime() {
- dbmd.getRowIdLifetime();
+ if (dbmd != null) {
+ Assertions.assertThrows(UJESSQLException.class, () -> dbmd.getRowIdLifetime());
+ }
}
@Test
public void getDriverVersion() {
- assertEquals(dbmd.getDriverVersion(), String.valueOf(UJESSQLDriverMain.DEFAULT_VERSION()));
+ if (dbmd != null) {
+ assertEquals(dbmd.getDriverVersion(), String.valueOf(UJESSQLDriverMain.DEFAULT_VERSION()));
+ }
}
- @AfterClass
+ @AfterAll
public static void closeStateAndConn() {
- conn.close();
+ if (conn != null) {
+ conn.close();
+ }
dbmd = null;
}
}
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java
index d6e71df36..54bc3d453 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java
@@ -24,10 +24,10 @@ package org.apache.linkis.ujes.jdbc;
import java.sql.SQLException;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/*
* Notice:
@@ -38,7 +38,7 @@ public class UJESSQLPreparedStatementTest {
private static UJESSQLConnection conn;
private UJESSQLPreparedStatement preStatement;
- @BeforeClass
+ @BeforeAll
public static void getConnection() {
try {
conn = JDBCSpiTest.getConnection();
@@ -46,48 +46,60 @@ public class UJESSQLPreparedStatementTest {
e.printStackTrace();
} catch (SQLException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ conn = null;
}
}
@Test
public void crud() {
- preStatement = conn.prepareStatement("");
- preStatement.executeUpdate(
- "CREATE TABLE if not exists db.test1236 as select * from ai_fmi_ods.1000_10");
- preStatement.executeUpdate("insert into db.test1236 select * from ai_fmi_ods.1000_10");
- // preStatement.executeUpdate("update db.test1236 set label=6 where label=1");
- preStatement.executeUpdate("select * from db.test1236");
- UJESSQLResultSet resultSet = preStatement.getResultSet();
- showResult(resultSet);
- preStatement.execute("drop table db.test1236");
- Assert.assertTrue(resultSet.isAfterLast());
+ if (conn != null) {
+ preStatement = conn.prepareStatement("");
+ preStatement.executeUpdate(
+ "CREATE TABLE if not exists db.test1236 as select * from ai_fmi_ods.1000_10");
+ preStatement.executeUpdate("insert into db.test1236 select * from ai_fmi_ods.1000_10");
+ // preStatement.executeUpdate("update db.test1236 set label=6 where label=1");
+ preStatement.executeUpdate("select * from db.test1236");
+ UJESSQLResultSet resultSet = preStatement.getResultSet();
+ showResult(resultSet);
+ preStatement.execute("drop table db.test1236");
+ Assertions.assertTrue(resultSet.isAfterLast());
+ }
}
- @AfterClass
+ @AfterAll
public static void closeConnection() {
- conn.close();
+ if (conn != null) {
+ conn.close();
+ }
}
@Test
public void setObject() {
- preStatement = conn.prepareStatement("? ?");
- preStatement.setObject(1, "show");
- preStatement.setObject(2, "tables");
- Assert.assertTrue(preStatement.execute());
+ if (conn != null) {
+ preStatement = conn.prepareStatement("? ?");
+ preStatement.setObject(1, "show");
+ preStatement.setObject(2, "tables");
+ Assertions.assertTrue(preStatement.execute());
+ }
}
@Test
public void execute() {
- preStatement = conn.prepareStatement("show tables");
- Assert.assertTrue(preStatement.execute());
+ if (conn != null) {
+ preStatement = conn.prepareStatement("show tables");
+ Assertions.assertTrue(preStatement.execute());
+ }
}
@Test
public void selectTest() {
- preStatement = conn.prepareStatement("select * from db.table limit 10");
- UJESSQLResultSet resultSet = preStatement.executeQuery();
- showResult(resultSet);
- Assert.assertTrue(resultSet.isAfterLast());
+ if (conn != null) {
+ preStatement = conn.prepareStatement("select * from db.table limit 10");
+ UJESSQLResultSet resultSet = preStatement.executeQuery();
+ showResult(resultSet);
+ Assertions.assertTrue(resultSet.isAfterLast());
+ }
}
private void showResult(UJESSQLResultSet resultSet) {
@@ -108,13 +120,17 @@ public class UJESSQLPreparedStatementTest {
@Test
public void executeUpdate() {
- preStatement = conn.prepareStatement("show tables");
- Assert.assertEquals(preStatement.executeUpdate(), 0);
+ if (conn != null) {
+ preStatement = conn.prepareStatement("show tables");
+ Assertions.assertEquals(preStatement.executeUpdate(), 0);
+ }
}
@Test
public void executeQuery() {
- preStatement = conn.prepareStatement("show tables");
- Assert.assertTrue(preStatement.executeQuery() instanceof UJESSQLResultSet);
+ if (conn != null) {
+ preStatement = conn.prepareStatement("show tables");
+ Assertions.assertTrue(preStatement.executeQuery() instanceof UJESSQLResultSet);
+ }
}
}
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLResultSetTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLResultSetTest.java
index df0e44639..0a545d801 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLResultSetTest.java
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLResultSetTest.java
@@ -19,7 +19,12 @@ package org.apache.linkis.ujes.jdbc;
import java.sql.SQLException;
-import org.junit.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/*
* Notice:
@@ -33,7 +38,7 @@ public class UJESSQLResultSetTest {
private UJESSQLResultSet resultSet;
private UJESSQLResultSetMetaData metaData;
- @BeforeClass
+ @BeforeAll
public static void getConnection() {
try {
conn = CreateConnection.getConnection();
@@ -41,75 +46,95 @@ public class UJESSQLResultSetTest {
e.printStackTrace();
} catch (SQLException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ conn = null;
}
}
- @AfterClass
+ @AfterAll
public static void closeConnection() {
- conn.close();
+ if (conn != null) {
+ conn.close();
+ }
}
- @Before
+ @BeforeEach
public void getResultSet() {
- preStatement = conn.prepareStatement("show tables");
- preStatement.execute();
- resultSet = preStatement.getResultSet();
+ if (conn != null) {
+ preStatement = conn.prepareStatement("show tables");
+ preStatement.execute();
+ resultSet = preStatement.getResultSet();
+ }
}
- @After
+ @AfterEach
public void closeStatement() {
- preStatement.close();
+ if (preStatement != null) {
+ preStatement.close();
+ }
}
@Test
public void getObject() {
- while (resultSet.next()) {
- metaData = resultSet.getMetaData();
- int columnTypeFromVal = UJESSQLTypeParser.parserFromVal(resultSet.getObject(1));
- int columnTypeFromMetaData = metaData.getColumnType(1);
- Assert.assertTrue(columnTypeFromVal == columnTypeFromMetaData);
+ if (conn != null) {
+ while (resultSet.next()) {
+ metaData = resultSet.getMetaData();
+ int columnTypeFromVal = UJESSQLTypeParser.parserFromVal(resultSet.getObject(1));
+ int columnTypeFromMetaData = metaData.getColumnType(1);
+ Assertions.assertEquals(columnTypeFromVal, columnTypeFromMetaData);
+ }
}
}
@Test
public void first() {
- resultSet.next();
- Object oldColumnVal = resultSet.getObject(1);
- while (resultSet.next()) {} // move to the end
- Assert.assertTrue(resultSet.first());
- Object newColumnVal = resultSet.getObject(1);
- Assert.assertTrue(oldColumnVal == newColumnVal);
+ if (conn != null) {
+ resultSet.next();
+ Object oldColumnVal = resultSet.getObject(1);
+ while (resultSet.next()) {} // move to the end
+ Assertions.assertTrue(resultSet.first());
+ Object newColumnVal = resultSet.getObject(1);
+ Assertions.assertSame(oldColumnVal, newColumnVal);
+ }
}
@Test
public void afterLast() {
- resultSet.next();
- resultSet.afterLast();
- Assert.assertTrue(resultSet.isAfterLast());
+ if (conn != null) {
+ resultSet.next();
+ resultSet.afterLast();
+ Assertions.assertTrue(resultSet.isAfterLast());
+ }
}
@Test
public void beforeFirst() {
- resultSet.next();
- resultSet.beforeFirst();
- Assert.assertTrue(resultSet.isBeforeFirst());
+ if (conn != null) {
+ resultSet.next();
+ resultSet.beforeFirst();
+ Assertions.assertTrue(resultSet.isBeforeFirst());
+ }
}
@Test
public void getMetaData() {
- resultSet.next();
- Assert.assertTrue(resultSet.getMetaData() != null);
+ if (conn != null) {
+ resultSet.next();
+ Assertions.assertNotNull(resultSet.getMetaData());
+ }
}
@Test
public void next() {
- while (resultSet.next()) {
- metaData = resultSet.getMetaData();
- for (int i = 1; i <= metaData.getColumnCount(); i++) {
- System.out.print(metaData.getColumnName(i) + ":" + resultSet.getObject(i) + " ");
+ if (conn != null) {
+ while (resultSet.next()) {
+ metaData = resultSet.getMetaData();
+ for (int i = 1; i <= metaData.getColumnCount(); i++) {
+ System.out.print(metaData.getColumnName(i) + ":" + resultSet.getObject(i) + " ");
+ }
+ System.out.println();
}
- System.out.println();
+ Assertions.assertTrue(resultSet.isAfterLast());
}
- Assert.assertTrue(resultSet.isAfterLast());
}
}
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLStatementTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLStatementTest.java
index 4e154e575..e674dd5b2 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLStatementTest.java
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/org/apache/linkis/ujes/jdbc/UJESSQLStatementTest.java
@@ -19,12 +19,14 @@ package org.apache.linkis.ujes.jdbc;
import java.sql.SQLException;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/*
* Notice:
@@ -42,7 +44,7 @@ public class UJESSQLStatementTest {
private static String sqlSelect;
private static String sqlDrop;
- @BeforeClass
+ @BeforeAll
public static void createConnection() {
try {
conn = CreateConnection.getConnection();
@@ -51,10 +53,12 @@ public class UJESSQLStatementTest {
e.printStackTrace();
} catch (SQLException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ statement = null;
}
}
- @Before
+ @BeforeEach
public void setParams() {
sql = "show tables";
sqlCreate = "CREATE TABLE if not exists db.test1236 as select * from ai_fmi_ods.1000_10";
@@ -67,67 +71,85 @@ public class UJESSQLStatementTest {
@Test
public void execute() {
- assertTrue(statement.execute(sql));
+ if (statement != null) {
+ assertTrue(statement.execute(sql));
+ }
}
@Test
public void executeQuery() {
- UJESSQLResultSet resultSet = statement.executeQuery(sql);
- assertTrue(resultSet.next());
+ if (statement != null) {
+ UJESSQLResultSet resultSet = statement.executeQuery(sql);
+ assertTrue(resultSet.next());
+ }
}
@Test
public void crud() {
- statement.executeQuery(sqlCreate);
- statement.executeQuery(sqlInsert);
- UJESSQLResultSet resultSet = statement.executeQuery(sqlSelect);
- int columnCount = 0;
- while (resultSet.next()) {
- UJESSQLResultSetMetaData rsmd = resultSet.getMetaData();
- for (int i = 1; i <= rsmd.getColumnCount(); i++) {
- System.out.print(
- rsmd.getColumnName(i)
- + ":"
- + rsmd.getColumnTypeName(i)
- + ":"
- + resultSet.getObject(i)
- + " ");
- columnCount = i;
+ if (statement != null) {
+ statement.executeQuery(sqlCreate);
+ statement.executeQuery(sqlInsert);
+ UJESSQLResultSet resultSet = statement.executeQuery(sqlSelect);
+ int columnCount = 0;
+ while (resultSet.next()) {
+ UJESSQLResultSetMetaData rsmd = resultSet.getMetaData();
+ for (int i = 1; i <= rsmd.getColumnCount(); i++) {
+ System.out.print(
+ rsmd.getColumnName(i)
+ + ":"
+ + rsmd.getColumnTypeName(i)
+ + ":"
+ + resultSet.getObject(i)
+ + " ");
+ columnCount = i;
+ }
}
+ System.out.println(columnCount);
+ assertTrue(resultSet.isAfterLast());
+ statement.executeQuery(sqlDrop);
}
- System.out.println(columnCount);
- assertTrue(resultSet.isAfterLast());
- statement.executeQuery(sqlDrop);
}
@Test
public void setMaxRows() {
- statement.setMaxRows(maxRows);
- assertEquals(maxRows, statement.getMaxRows());
+ if (statement != null) {
+ statement.setMaxRows(maxRows);
+ assertEquals(maxRows, statement.getMaxRows());
+ }
}
@Test
public void setQueryTimeout() {
- statement.setQueryTimeout(queryTimeout);
- assertEquals(statement.getQueryTimeout(), queryTimeout * 1000);
+ if (statement != null) {
+ statement.setQueryTimeout(queryTimeout);
+ assertEquals(statement.getQueryTimeout(), queryTimeout * 1000);
+ }
}
@Test
public void cancel() {
- statement.executeQuery(sql);
- statement.cancel();
- assertNull(statement.getResultSet());
- assertNull(statement.getJobExcuteResult());
+ if (statement != null) {
+ statement.executeQuery(sql);
+ statement.cancel();
+ assertNull(statement.getResultSet());
+ assertNull(statement.getJobExcuteResult());
+ }
}
@Test
public void getConnWhenIsClosed() {
- assertEquals(statement.getConnection(), conn);
+ if (statement != null) {
+ assertEquals(statement.getConnection(), conn);
+ }
}
- @AfterClass
+ @AfterAll
public static void closeStateAndConn() {
- statement.close();
- conn.close();
+ if (statement != null) {
+ statement.close();
+ }
+ if (conn != null) {
+ conn.close();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org