This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new bc810c324a [ZEPPELIN-5849] MIGRATE JDBC MODULE TO JUNIT 5 (#4511)
bc810c324a is described below
commit bc810c324aadf472049d1e3ce95b3b1ee53edf5f
Author: Guanhua Li <guanhua...@foxmail.com>
AuthorDate: Tue Nov 22 20:43:33 2022 +0800
[ZEPPELIN-5849] MIGRATE JDBC MODULE TO JUNIT 5 (#4511)
---
.../jdbc/JDBCInterpreterInterpolationTest.java | 8 +++----
.../apache/zeppelin/jdbc/JDBCInterpreterTest.java | 27 +++++++++++-----------
.../org/apache/zeppelin/jdbc/SqlCompleterTest.java | 15 ++++++------
.../apache/zeppelin/jdbc/hive/HiveUtilsTest.java | 7 +++---
4 files changed, 29 insertions(+), 28 deletions(-)
diff --git
a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterInterpolationTest.java
b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterInterpolationTest.java
index 1374739c50..f310d8f981 100644
---
a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterInterpolationTest.java
+++
b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterInterpolationTest.java
@@ -23,8 +23,8 @@ import
org.apache.zeppelin.interpreter.InterpreterResultMessage;
import org.apache.zeppelin.resource.LocalResourcePool;
import org.apache.zeppelin.resource.ResourcePool;
import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.file.Files;
@@ -36,7 +36,7 @@ import java.util.List;
import java.util.Properties;
import static java.lang.String.format;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* JDBC interpreter Z-variable interpolation unit tests.
@@ -56,7 +56,7 @@ public class JDBCInterpreterInterpolationTest extends
BasicJDBCTestCaseAdapter {
return jdbcConnection;
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Class.forName("org.h2.Driver");
Connection connection = DriverManager.getConnection(getJdbcConnection());
diff --git
a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
index 3d3611c7ad..84148f621e 100644
--- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
+++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
@@ -30,8 +30,8 @@ import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.user.UserCredentials;
import org.apache.zeppelin.user.UsernamePassword;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.file.Files;
@@ -59,10 +59,10 @@ import static
org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_URL;
import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_USER;
import static org.apache.zeppelin.jdbc.JDBCInterpreter.PRECODE_KEY_TEMPLATE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
@@ -92,7 +92,7 @@ public class JDBCInterpreterTest extends
BasicJDBCTestCaseAdapter {
return p;
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Class.forName("org.h2.Driver");
Connection connection = DriverManager.getConnection(getJdbcConnection());
@@ -266,8 +266,9 @@ public class JDBCInterpreterTest extends
BasicJDBCTestCaseAdapter {
InterpreterResult interpreterResult = t.interpret(sqlQuery, context);
assertEquals(InterpreterResult.Code.ERROR, interpreterResult.code());
- assertTrue(interpreterResult.toString(), interpreterResult.message()
- .get(0).getData().contains("Table \"INVALID_TABLE\" not found;"));
+ assertTrue(interpreterResult.message()
+ .get(0).getData().contains("Table \"INVALID_TABLE\" not found;"),
+ interpreterResult.toString());
}
@Test
@@ -286,8 +287,8 @@ public class JDBCInterpreterTest extends
BasicJDBCTestCaseAdapter {
InterpreterResult interpreterResult = t.interpret(sqlQuery, context);
List<InterpreterResultMessage> resultMessages =
context.out.toInterpreterResultMessage();
- assertEquals(interpreterResult.toString(),
- InterpreterResult.Code.SUCCESS, interpreterResult.code());
+ assertEquals(InterpreterResult.Code.SUCCESS, interpreterResult.code(),
+ interpreterResult.toString());
assertEquals(InterpreterResult.Type.TABLE,
resultMessages.get(0).getType());
assertEquals("SOME_OTHER_NAME\na_name\n", resultMessages.get(0).getData());
}
@@ -710,8 +711,8 @@ public class JDBCInterpreterTest extends
BasicJDBCTestCaseAdapter {
assertEquals(InterpreterResult.Code.ERROR, interpreterResult.code());
assertEquals(InterpreterResult.Type.TEXT,
interpreterResult.message().get(0).getType());
- assertTrue(interpreterResult.toString(),
- interpreterResult.message().get(0).getData().contains("Syntax
error"));
+ assertTrue(interpreterResult.message().get(0).getData().contains("Syntax
error"),
+ interpreterResult.toString());
}
@Test
diff --git a/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
b/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
index 28644d0793..3df9a42a12 100644
--- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
+++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
@@ -14,13 +14,12 @@
*/
package org.apache.zeppelin.jdbc;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.lang3.StringUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -95,8 +94,8 @@ public class SqlCompleterTest {
logger.info(explain);
- Assert.assertEquals("Buffer [" + buffer.replace(" ", ".") + "] and
Cursor[" + cursor + "] "
- + explain, expected, new HashSet<>(candidates));
+ assertEquals(expected, new HashSet<>(candidates), "Buffer [" +
buffer.replace(" ", ".")
+ + "] and Cursor[" + cursor + "] " + explain);
}
private String explain(String buffer, int cursor,
List<InterpreterCompletion> candidates) {
@@ -138,7 +137,7 @@ public class SqlCompleterTest {
private SqlCompleter sqlCompleter = new SqlCompleter(0);
- @Before
+ @BeforeEach
public void beforeTest() throws IOException, SQLException {
Set<String> schemas = new HashSet<>();
Set<String> keywords = new HashSet<>();
diff --git
a/jdbc/src/test/java/org/apache/zeppelin/jdbc/hive/HiveUtilsTest.java
b/jdbc/src/test/java/org/apache/zeppelin/jdbc/hive/HiveUtilsTest.java
index a3db8c8fb1..11e940f09f 100644
--- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/hive/HiveUtilsTest.java
+++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/hive/HiveUtilsTest.java
@@ -17,12 +17,13 @@
package org.apache.zeppelin.jdbc.hive;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Optional;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class HiveUtilsTest {
