You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by gu...@apache.org on 2023/05/10 05:46:39 UTC
[zeppelin] branch master updated: [ZEPPELIN-5851][JUnit 5 Migration] Module: zeppelin-zengine (#4532)
This is an automated email from the ASF dual-hosted git repository.
guanhuali 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 e6d61072a2 [ZEPPELIN-5851][JUnit 5 Migration] Module: zeppelin-zengine (#4532)
e6d61072a2 is described below
commit e6d61072a231e2e7888f659a3e348bd6ef74ce07
Author: Guanhua Li <gu...@foxmail.com>
AuthorDate: Wed May 10 13:46:32 2023 +0800
[ZEPPELIN-5851][JUnit 5 Migration] Module: zeppelin-zengine (#4532)
* [JUnit 5 Migration] Module: zeppelin-zengine
* update for review
* Fix TimeoutLifecycleManagerTest
* Remove mockito-junit-jupiter
---------
Co-authored-by: Philipp Dallig <ph...@gmail.com>
---
zeppelin-zengine/pom.xml | 6 --
.../zeppelin/conf/ZeppelinConfigurationTest.java | 43 +++++++------
.../helium/HeliumApplicationFactoryTest.java | 26 ++++----
.../zeppelin/helium/HeliumBundleFactoryTest.java | 18 +++---
.../zeppelin/helium/HeliumLocalRegistryTest.java | 12 ++--
.../zeppelin/helium/HeliumOnlineRegistryTest.java | 16 ++---
.../org/apache/zeppelin/helium/HeliumTest.java | 16 ++---
.../interpreter/AbstractInterpreterTest.java | 11 ++--
.../zeppelin/interpreter/ConfInterpreterTest.java | 7 +--
.../interpreter/InterpreterFactoryTest.java | 8 +--
.../interpreter/InterpreterSettingManagerTest.java | 14 ++---
.../interpreter/InterpreterSettingTest.java | 21 +++----
.../interpreter/ManagedInterpreterGroupTest.java | 8 +--
.../interpreter/SessionConfInterpreterTest.java | 4 +-
.../install/InstallInterpreterTest.java | 14 ++---
.../launcher/SparkInterpreterLauncherTest.java | 12 ++--
.../launcher/StandardInterpreterLauncherTest.java | 10 ++--
.../lifecycle/TimeoutLifecycleManagerTest.java | 18 +++---
.../recovery/FileSystemRecoveryStorageTest.java | 12 ++--
.../recovery/LocalRecoveryStorageTest.java | 12 ++--
.../interpreter/remote/AppendOutputRunnerTest.java | 10 ++--
.../remote/RemoteAngularObjectTest.java | 8 +--
.../remote/RemoteInterpreterOutputTestStream.java | 12 ++--
.../interpreter/remote/RemoteInterpreterTest.java | 22 +++----
.../zeppelin/notebook/CredentialInjectorTest.java | 6 +-
.../org/apache/zeppelin/notebook/NoteAuthTest.java | 7 ++-
.../apache/zeppelin/notebook/NoteManagerTest.java | 54 +++++++++--------
.../org/apache/zeppelin/notebook/NoteTest.java | 66 ++++++++++----------
.../org/apache/zeppelin/notebook/NotebookTest.java | 31 +++++-----
.../apache/zeppelin/notebook/ParagraphTest.java | 70 ++++++++++------------
.../zeppelin/notebook/ParagraphTextParserTest.java | 30 ++++------
.../notebook/repo/GitNotebookRepoTest.java | 20 +++----
.../repo/NotebookRepoSyncInitializationTest.java | 16 ++---
.../notebook/repo/NotebookRepoSyncTest.java | 14 ++---
.../notebook/repo/VFSNotebookRepoTest.java | 12 ++--
.../apache/zeppelin/plugin/PluginManagerTest.java | 4 +-
.../resource/DistributedResourcePoolTest.java | 14 ++---
.../zeppelin/scheduler/RemoteSchedulerTest.java | 18 +++---
.../apache/zeppelin/search/LuceneSearchTest.java | 18 +++---
.../zeppelin/storage/LocalConfigStorageTest.java | 4 +-
.../org/apache/zeppelin/user/CredentialsTest.java | 4 +-
.../org/apache/zeppelin/user/EncryptorTest.java | 6 +-
.../java/org/apache/zeppelin/util/UtilTest.java | 9 +--
43 files changed, 362 insertions(+), 381 deletions(-)
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index 0f0f7f7670..b974912fb7 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -226,12 +226,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java
index 5ef10406ad..ba5e609ca2 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java
@@ -18,25 +18,24 @@ package org.apache.zeppelin.conf;
import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import java.net.MalformedURLException;
import java.util.List;
+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 ZeppelinConfigurationTest {
- @BeforeClass
+ @BeforeAll
public static void clearSystemVariables() {
ZeppelinConfiguration.reset();
}
- @After
+ @AfterEach
public void cleanup() {
ZeppelinConfiguration.reset();
}
@@ -46,9 +45,9 @@ public class ZeppelinConfigurationTest {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("test-zeppelin-site2.xml");
List<String> origins = conf.getAllowedOrigins();
- Assert.assertEquals(2, origins.size());
- Assert.assertEquals("http://onehost:8080", origins.get(0));
- Assert.assertEquals("http://otherhost.com", origins.get(1));
+ assertEquals(2, origins.size());
+ assertEquals("http://onehost:8080", origins.get(0));
+ assertEquals("http://otherhost.com", origins.get(1));
}
@Test
@@ -56,8 +55,8 @@ public class ZeppelinConfigurationTest {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("test-zeppelin-site1.xml");
List<String> origins = conf.getAllowedOrigins();
- Assert.assertEquals(1, origins.size());
- Assert.assertEquals("http://onehost:8080", origins.get(0));
+ assertEquals(1, origins.size());
+ assertEquals("http://onehost:8080", origins.get(0));
}
@Test
@@ -65,7 +64,7 @@ public class ZeppelinConfigurationTest {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("zeppelin-test-site.xml");
List<String> origins = conf.getAllowedOrigins();
- Assert.assertEquals(1, origins.size());
+ assertEquals(1, origins.size());
}
@Test
@@ -73,7 +72,7 @@ public class ZeppelinConfigurationTest {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("zeppelin-test-site.xml");
Boolean isIt = conf.isWindowsPath("c:\\test\\file.txt");
- Assert.assertTrue(isIt);
+ assertTrue(isIt);
}
@Test
@@ -81,7 +80,7 @@ public class ZeppelinConfigurationTest {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("zeppelin-test-site.xml");
Boolean isIt = conf.isWindowsPath("~/test/file.xml");
- Assert.assertFalse(isIt);
+ assertFalse(isIt);
}
@Test
@@ -89,7 +88,7 @@ public class ZeppelinConfigurationTest {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("zeppelin-test-site.xml");
Boolean isIt = conf.isPathWithScheme("hdfs://hadoop.example.com/zeppelin/notebook");
- Assert.assertTrue(isIt);
+ assertTrue(isIt);
}
@Test
@@ -97,7 +96,7 @@ public class ZeppelinConfigurationTest {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("zeppelin-test-site.xml");
Boolean isIt = conf.isPathWithScheme("~/test/file.xml");
- Assert.assertFalse(isIt);
+ assertFalse(isIt);
}
@Test
@@ -105,7 +104,7 @@ public class ZeppelinConfigurationTest {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("zeppelin-test-site.xml");
Boolean isIt = conf.isPathWithScheme("c:\\test\\file.txt");
- Assert.assertFalse(isIt);
+ assertFalse(isIt);
}
@Test
@@ -127,8 +126,8 @@ public class ZeppelinConfigurationTest {
public void getPathTest() {
ZeppelinConfiguration conf = ZeppelinConfiguration.create("zeppelin-test-site.xml");
conf.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), "/usr/lib/zeppelin");
- Assert.assertEquals("/usr/lib/zeppelin", conf.getZeppelinHome());
- Assert.assertEquals("/usr/lib/zeppelin/conf", conf.getConfDir());
+ assertEquals("/usr/lib/zeppelin", conf.getZeppelinHome());
+ assertEquals("/usr/lib/zeppelin/conf", conf.getConfDir());
}
@Test
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
index 5dcf6c1ead..95a3858885 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.zeppelin.helium;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
import java.io.IOException;
@@ -37,10 +37,10 @@ import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.notebook.repo.NotebookRepo;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.user.Credentials;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class HeliumApplicationFactoryTest extends AbstractInterpreterTest {
@@ -50,7 +50,7 @@ public class HeliumApplicationFactoryTest extends AbstractInterpreterTest {
private AuthenticationInfo anonymous;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -79,14 +79,14 @@ public class HeliumApplicationFactoryTest extends AbstractInterpreterTest {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
}
@Test
- @Ignore
+ @Disabled
public void testLoadRunUnloadApplication()
throws IOException, ApplicationException, InterruptedException {
// given
@@ -136,7 +136,7 @@ public class HeliumApplicationFactoryTest extends AbstractInterpreterTest {
}
@Test
- @Ignore
+ @Disabled
public void testUnloadOnParagraphRemove() throws IOException {
// given
HeliumPackage pkg1 = new HeliumPackage(HeliumType.APPLICATION,
@@ -179,7 +179,7 @@ public class HeliumApplicationFactoryTest extends AbstractInterpreterTest {
@Test
- @Ignore
+ @Disabled
public void testUnloadOnInterpreterUnbind() throws IOException {
// given
HeliumPackage pkg1 = new HeliumPackage(HeliumType.APPLICATION,
@@ -219,7 +219,7 @@ public class HeliumApplicationFactoryTest extends AbstractInterpreterTest {
}
@Test
- @Ignore
+ @Disabled
public void testInterpreterUnbindOfNullReplParagraph() throws IOException {
// create note
String note1Id = notebook.createNote("note1", anonymous);
@@ -246,7 +246,7 @@ public class HeliumApplicationFactoryTest extends AbstractInterpreterTest {
@Test
- @Ignore
+ @Disabled
public void testUnloadOnInterpreterRestart() throws IOException, InterpreterException {
// given
HeliumPackage pkg1 = new HeliumPackage(HeliumType.APPLICATION,
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java
index 5e8d435bbe..9c84251ee7 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java
@@ -17,10 +17,10 @@
package org.apache.zeppelin.helium;
import static org.apache.zeppelin.helium.HeliumBundleFactory.HELIUM_LOCAL_REPO;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import com.github.eirslett.maven.plugins.frontend.lib.InstallationException;
import com.github.eirslett.maven.plugins.frontend.lib.TaskRunnerException;
@@ -32,16 +32,16 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class HeliumBundleFactoryTest {
private HeliumBundleFactory hbf;
private File nodeInstallationDir;
private String zeppelinHomePath;
- @Before
+ @BeforeEach
public void setUp() throws InstallationException, TaskRunnerException, IOException {
zeppelinHomePath = System.getProperty(ConfVars.ZEPPELIN_HOME.getVarName());
System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), "../");
@@ -55,7 +55,7 @@ public class HeliumBundleFactoryTest {
hbf.copyFrameworkModulesToInstallPath(true);
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
if (null != zeppelinHomePath) {
System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), zeppelinHomePath);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumLocalRegistryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumLocalRegistryTest.java
index 0f490d1f90..972e461ffb 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumLocalRegistryTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumLocalRegistryTest.java
@@ -18,25 +18,25 @@ package org.apache.zeppelin.helium;
import com.google.gson.Gson;
import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HeliumLocalRegistryTest {
private File tmpDir;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tmpDir = new File(System.getProperty("java.io.tmpdir") + "/ZeppelinLTest_" + System.currentTimeMillis());
tmpDir.mkdirs();
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
FileUtils.deleteDirectory(tmpDir);
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumOnlineRegistryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumOnlineRegistryTest.java
index dea0c20529..9fb4f0a1de 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumOnlineRegistryTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumOnlineRegistryTest.java
@@ -17,11 +17,11 @@
package org.apache.zeppelin.helium;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
@@ -35,7 +35,7 @@ public class HeliumOnlineRegistryTest {
private File tmpDir;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tmpDir = new File(
System.getProperty("java.io.tmpdir")
@@ -44,7 +44,7 @@ public class HeliumOnlineRegistryTest {
);
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
FileUtils.deleteDirectory(tmpDir);
}
@@ -73,12 +73,12 @@ public class HeliumOnlineRegistryTest {
ZeppelinConfiguration.ConfVars.ZEPPELIN_NOTEBOOK_S3_TIMEOUT.getStringValue()
);
assertTrue(
+ basicTimeout > processTime,
String.format(
"Wrong timeout during connection: expected %s, actual is about %d",
TIMEOUT,
processTime
- ),
- basicTimeout > processTime
+ )
);
}
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTest.java
index bdd639e3bb..021e6cb786 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTest.java
@@ -18,23 +18,23 @@ package org.apache.zeppelin.helium;
import com.github.eirslett.maven.plugins.frontend.lib.TaskRunnerException;
import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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 HeliumTest {
private File tmpDir;
private File localRegistryPath;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tmpDir = new File(System.getProperty("java.io.tmpdir") + "/ZeppelinLTest_" + System.currentTimeMillis());
tmpDir.mkdirs();
@@ -42,7 +42,7 @@ public class HeliumTest {
localRegistryPath.mkdirs();
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
FileUtils.deleteDirectory(tmpDir);
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/AbstractInterpreterTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/AbstractInterpreterTest.java
index df1c6ec139..bf63964be1 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/AbstractInterpreterTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/AbstractInterpreterTest.java
@@ -29,18 +29,15 @@ import org.apache.zeppelin.notebook.NoteManager;
import org.apache.zeppelin.notebook.Notebook;
import org.apache.zeppelin.notebook.repo.InMemoryNotebookRepo;
import org.apache.zeppelin.notebook.repo.NotebookRepo;
-import org.apache.zeppelin.search.LuceneSearch;
-import org.apache.zeppelin.search.SearchService;
import org.apache.zeppelin.user.Credentials;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
/**
* This class will load configuration files under
@@ -62,7 +59,7 @@ public abstract class AbstractInterpreterTest {
protected File notebookDir;
protected ZeppelinConfiguration conf;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// copy the resources files to a temp folder
zeppelinHome = new File("..");
@@ -97,7 +94,7 @@ public abstract class AbstractInterpreterTest {
interpreterSettingManager.setNotebook(notebook);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (interpreterSettingManager != null) {
interpreterSettingManager.close();
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ConfInterpreterTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ConfInterpreterTest.java
index 3a8717ff37..18fec666fd 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ConfInterpreterTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ConfInterpreterTest.java
@@ -18,12 +18,11 @@
package org.apache.zeppelin.interpreter;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Properties;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public class ConfInterpreterTest extends AbstractInterpreterTest {
@@ -100,7 +99,7 @@ public class ConfInterpreterTest extends AbstractInterpreterTest {
.build();
InterpreterResult result = confInterpreter.interpret(" property_1\t \n new_property\t \n", context);
- assertEquals(result.toString(), InterpreterResult.Code.SUCCESS, result.code);
+ assertEquals(InterpreterResult.Code.SUCCESS, result.code, result.toString());
assertTrue(interpreterFactory.getInterpreter("test", executionContext) instanceof RemoteInterpreter);
RemoteInterpreter remoteInterpreter = (RemoteInterpreter) interpreterFactory.getInterpreter("test", executionContext);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
index 87d65cdbd5..54c6ad94ca 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
@@ -18,11 +18,11 @@
package org.apache.zeppelin.interpreter;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class InterpreterFactoryTest extends AbstractInterpreterTest {
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
index def1000ff7..365546eee6 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
@@ -24,8 +24,8 @@ import org.apache.zeppelin.display.AngularObjectRegistryListener;
import org.apache.zeppelin.helium.ApplicationEventListener;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcessListener;
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 org.eclipse.aether.RepositoryException;
import org.eclipse.aether.repository.RemoteRepository;
@@ -35,10 +35,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
@@ -48,7 +48,7 @@ public class InterpreterSettingManagerTest extends AbstractInterpreterTest {
private String note2Id;
private String note3Id;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingTest.java
index de2f41c97d..82df374b94 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingTest.java
@@ -21,8 +21,8 @@ import com.google.common.collect.Lists;
import org.apache.zeppelin.dep.Dependency;
import org.apache.zeppelin.dep.DependencyResolver;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,11 +30,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -48,7 +48,7 @@ public class InterpreterSettingTest extends AbstractInterpreterTest{
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
interpreterSettingManager = mock(InterpreterSettingManager.class);
@@ -578,8 +578,9 @@ public class InterpreterSettingTest extends AbstractInterpreterTest{
Thread.sleep(1000);
LOGGER.warn("Downloading dependency");
}
- assertTrue(interpreterSetting.getErrorReason(),
- interpreterSetting.getErrorReason().contains("Cannot fetch dependencies"));
+ assertTrue(
+ interpreterSetting.getErrorReason().contains("Cannot fetch dependencies"),
+ interpreterSetting.getErrorReason());
// clean dependency
interpreterSetting.setDependencies(new ArrayList<>());
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroupTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroupTest.java
index fd417cf6da..af9bb78210 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroupTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroupTest.java
@@ -17,23 +17,23 @@
package org.apache.zeppelin.interpreter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
import org.eclipse.aether.RepositoryException;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ManagedInterpreterGroupTest {
private InterpreterSetting interpreterSetting;
- @Before
+ @BeforeEach
public void setUp() throws IOException, RepositoryException {
InterpreterOption interpreterOption = new InterpreterOption();
interpreterOption.setPerUser(InterpreterOption.SCOPED);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SessionConfInterpreterTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SessionConfInterpreterTest.java
index e0f54f01e7..ab04d569b1 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SessionConfInterpreterTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SessionConfInterpreterTest.java
@@ -19,13 +19,13 @@
package org.apache.zeppelin.interpreter;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/install/InstallInterpreterTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/install/InstallInterpreterTest.java
index 04161b96ba..800dc5b627 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/install/InstallInterpreterTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/install/InstallInterpreterTest.java
@@ -2,16 +2,16 @@ package org.apache.zeppelin.interpreter.install;
import org.apache.commons.io.FileUtils;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-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;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,7 +34,7 @@ public class InstallInterpreterTest {
private InstallInterpreter installer;
private File interpreterBaseDir;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
tmpDir = new File(System.getProperty("java.io.tmpdir")+"/ZeppelinLTest_"+System.currentTimeMillis());
new File(tmpDir, "conf").mkdirs();
@@ -59,7 +59,7 @@ public class InstallInterpreterTest {
.getAbsolutePath());
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
FileUtils.deleteDirectory(tmpDir);
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
index b1d13da736..dc6407d102 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
@@ -23,8 +23,8 @@ import org.apache.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.integration.DownloadUtils;
import org.apache.zeppelin.interpreter.remote.ExecRemoteInterpreterProcess;
import org.apache.zeppelin.util.Util;
-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;
@@ -35,9 +35,9 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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 SparkInterpreterLauncherTest {
@@ -46,7 +46,7 @@ public class SparkInterpreterLauncherTest {
private String sparkHome;
private String zeppelinHome;
- @Before
+ @BeforeEach
public void setUp() {
for (final ZeppelinConfiguration.ConfVars confVar : ZeppelinConfiguration.ConfVars.values()) {
System.clearProperty(confVar.getVarName());
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
index 7321fe4269..6912a26712 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
@@ -20,17 +20,17 @@ package org.apache.zeppelin.interpreter.launcher;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.remote.ExecRemoteInterpreterProcess;
-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.util.Properties;
-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 StandardInterpreterLauncherTest {
- @Before
+ @BeforeEach
public void setUp() {
for (final ZeppelinConfiguration.ConfVars confVar : ZeppelinConfiguration.ConfVars.values()) {
System.clearProperty(confVar.getVarName());
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/lifecycle/TimeoutLifecycleManagerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/lifecycle/TimeoutLifecycleManagerTest.java
index 8fd7279097..46bfeb5d7f 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/lifecycle/TimeoutLifecycleManagerTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/lifecycle/TimeoutLifecycleManagerTest.java
@@ -25,21 +25,24 @@ import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.apache.zeppelin.scheduler.Job;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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 TimeoutLifecycleManagerTest extends AbstractInterpreterTest {
+class TimeoutLifecycleManagerTest extends AbstractInterpreterTest {
private File zeppelinSiteFile = new File("zeppelin-site.xml");
@Override
+ @BeforeEach
public void setUp() throws Exception {
ZeppelinConfiguration zConf = ZeppelinConfiguration.create();
zConf.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_LIFECYCLE_MANAGER_CLASS.getVarName(),
@@ -51,12 +54,13 @@ public class TimeoutLifecycleManagerTest extends AbstractInterpreterTest {
}
@Override
+ @AfterEach
public void tearDown() {
zeppelinSiteFile.delete();
}
@Test
- public void testTimeout_1() throws InterpreterException, InterruptedException, IOException {
+ void testTimeout_1() throws InterpreterException, InterruptedException, IOException {
assertTrue(interpreterFactory.getInterpreter("test.echo", new ExecutionContext("user1", "note1", "test")) instanceof RemoteInterpreter);
RemoteInterpreter remoteInterpreter = (RemoteInterpreter) interpreterFactory.getInterpreter("test.echo", new ExecutionContext("user1", "note1", "test"));
assertFalse(remoteInterpreter.isOpened());
@@ -79,7 +83,7 @@ public class TimeoutLifecycleManagerTest extends AbstractInterpreterTest {
}
@Test
- public void testTimeout_2() throws InterpreterException, InterruptedException, IOException {
+ void testTimeout_2() throws InterpreterException, InterruptedException, IOException {
assertTrue(interpreterFactory.getInterpreter("test.sleep", new ExecutionContext("user1", "note1", "test")) instanceof RemoteInterpreter);
final RemoteInterpreter remoteInterpreter = (RemoteInterpreter) interpreterFactory.getInterpreter("test.sleep", new ExecutionContext("user1", "note1", "test"));
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorageTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorageTest.java
index f320930688..d099bc1c5d 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorageTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorageTest.java
@@ -28,15 +28,15 @@ import org.apache.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class FileSystemRecoveryStorageTest extends AbstractInterpreterTest {
@@ -45,7 +45,7 @@ public class FileSystemRecoveryStorageTest extends AbstractInterpreterTest {
private String note2Id;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_RECOVERY_STORAGE_CLASS.getVarName(),
FileSystemRecoveryStorage.class.getName());
@@ -58,7 +58,7 @@ public class FileSystemRecoveryStorageTest extends AbstractInterpreterTest {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
FileUtils.deleteDirectory(recoveryDir);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorageTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorageTest.java
index 08c015a1f2..cce4a48a5e 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorageTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorageTest.java
@@ -29,14 +29,14 @@ import org.apache.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LocalRecoveryStorageTest extends AbstractInterpreterTest {
private File recoveryDir = null;
@@ -44,7 +44,7 @@ public class LocalRecoveryStorageTest extends AbstractInterpreterTest {
private String note2Id;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_RECOVERY_STORAGE_CLASS.getVarName(),
LocalRecoveryStorage.class.getName());
@@ -58,7 +58,7 @@ public class LocalRecoveryStorageTest extends AbstractInterpreterTest {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
FileUtils.deleteDirectory(recoveryDir);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java
index 0bd086978f..992ebddb08 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java
@@ -21,8 +21,8 @@ import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -33,8 +33,8 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.atMost;
@@ -55,7 +55,7 @@ public class AppendOutputRunnerTest {
*/
private volatile static int numInvocations = 0;
- @After
+ @AfterEach
public void afterEach() {
if (future != null) {
future.cancel(true);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java
index 492377de33..04849761d7 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java
@@ -27,12 +27,12 @@ import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.resource.LocalResourcePool;
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.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RemoteAngularObjectTest extends AbstractInterpreterTest
implements AngularObjectRegistryListener {
@@ -49,7 +49,7 @@ public class RemoteAngularObjectTest extends AbstractInterpreterTest
private String note1Id;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
note1Id = notebook.createNote("/note_1", AuthenticationInfo.ANONYMOUS);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java
index e73f79ef7b..1e36eaa7b4 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java
@@ -23,15 +23,15 @@ import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.interpreter.thrift.ParagraphInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
@@ -43,13 +43,13 @@ public class RemoteInterpreterOutputTestStream extends AbstractInterpreterTest
private InterpreterSetting interpreterSetting;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
interpreterSetting = interpreterSettingManager.get("test");
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
interpreterSetting.close();
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
index ef999d0798..a899dbea3a 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
@@ -33,8 +33,8 @@ import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.interpreter.InterpreterSetting;
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.util.ArrayList;
@@ -42,14 +42,14 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class RemoteInterpreterTest extends AbstractInterpreterTest {
@@ -57,7 +57,7 @@ public class RemoteInterpreterTest extends AbstractInterpreterTest {
private String note1Id;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
interpreterSetting = interpreterSettingManager.getInterpreterSettingByName("test");
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/CredentialInjectorTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/CredentialInjectorTest.java
index 205ea8a02d..9a17969238 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/CredentialInjectorTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/CredentialInjectorTest.java
@@ -17,8 +17,8 @@
package org.apache.zeppelin.notebook;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -26,7 +26,7 @@ import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.user.UserCredentials;
import org.apache.zeppelin.user.UsernamePassword;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CredentialInjectorTest {
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteAuthTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteAuthTest.java
index 9536e21c3a..b8dff58067 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteAuthTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteAuthTest.java
@@ -19,9 +19,10 @@ package org.apache.zeppelin.notebook;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteManagerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteManagerTest.java
index f825a97b37..c0044c926b 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteManagerTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteManagerTest.java
@@ -21,10 +21,9 @@ import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.notebook.exception.NotePathAlreadyExistsException;
import org.apache.zeppelin.notebook.repo.InMemoryNotebookRepo;
import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Map;
@@ -34,18 +33,18 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class NoteManagerTest {
private NoteManager noteManager;
private ZeppelinConfiguration conf;
- @Rule
- public ExpectedException thrown = ExpectedException.none();
- @Before
+
+ @BeforeEach
public void setUp() throws IOException {
conf = ZeppelinConfiguration.create();
this.noteManager = new NoteManager(new InMemoryNotebookRepo(), conf);
@@ -72,10 +71,10 @@ public class NoteManagerTest {
// move note
this.noteManager.moveNote(note1.getId(), "/dev/project_1/my_note1",
- AuthenticationInfo.ANONYMOUS);
+ AuthenticationInfo.ANONYMOUS);
assertEquals(3, this.noteManager.getNotesInfo().size());
assertEquals("/dev/project_1/my_note1",
- this.noteManager.processNote(note1.getId(), n -> n).getPath());
+ this.noteManager.processNote(note1.getId(), n -> n).getPath());
// move folder
this.noteManager.moveFolder("/dev", "/staging", AuthenticationInfo.ANONYMOUS);
@@ -96,28 +95,31 @@ public class NoteManagerTest {
@Test
public void testAddNoteRejectsDuplicatePath() throws IOException {
- thrown.expect(NotePathAlreadyExistsException.class);
- thrown.expectMessage("Note '/prod/note' existed");
- Note note1 = createNote("/prod/note");
- Note note2 = createNote("/prod/note");
+ assertThrows(NotePathAlreadyExistsException.class,
+ () -> {
+ Note note1 = createNote("/prod/note");
+ Note note2 = createNote("/prod/note");
- noteManager.addNote(note1, AuthenticationInfo.ANONYMOUS);
- noteManager.addNote(note2, AuthenticationInfo.ANONYMOUS);
+ noteManager.addNote(note1, AuthenticationInfo.ANONYMOUS);
+ noteManager.addNote(note2, AuthenticationInfo.ANONYMOUS);
+ },
+ "Note '/prod/note' existed");
}
@Test
public void testMoveNoteRejectsDuplicatePath() throws IOException {
- thrown.expect(NotePathAlreadyExistsException.class);
- thrown.expectMessage("Note '/prod/note-1' existed");
-
- Note note1 = createNote("/prod/note-1");
- Note note2 = createNote("/prod/note-2");
+ assertThrows(NotePathAlreadyExistsException.class,
+ () -> {
+ Note note1 = createNote("/prod/note-1");
+ Note note2 = createNote("/prod/note-2");
- noteManager.addNote(note1, AuthenticationInfo.ANONYMOUS);
- noteManager.addNote(note2, AuthenticationInfo.ANONYMOUS);
+ noteManager.addNote(note1, AuthenticationInfo.ANONYMOUS);
+ noteManager.addNote(note2, AuthenticationInfo.ANONYMOUS);
- noteManager.moveNote(note2.getId(), "/prod/note-1", AuthenticationInfo.ANONYMOUS);
+ noteManager.moveNote(note2.getId(), "/prod/note-1", AuthenticationInfo.ANONYMOUS);
+ },
+ "Note '/prod/note-1' existed");
}
private Note createNote(String notePath) {
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java
index 1bdee1a036..4ed2a2cd1c 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java
@@ -30,69 +30,63 @@ import org.apache.zeppelin.notebook.repo.NotebookRepo;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.user.Credentials;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.mockito.junit.MockitoJUnitRunner;
-@RunWith(MockitoJUnitRunner.class)
-public class NoteTest {
- @Mock
- NotebookRepo repo;
- @Mock
- ParagraphJobListener paragraphJobListener;
+class NoteTest {
- @Mock
+ NotebookRepo repo;
+ ParagraphJobListener paragraphJobListener;
Credentials credentials;
-
- @Mock
Interpreter interpreter;
-
- @Mock
ManagedInterpreterGroup interpreterGroup;
-
- @Mock
InterpreterSetting interpreterSetting;
-
- @Mock
Scheduler scheduler;
List<NoteEventListener> noteEventListener = new ArrayList<>();
- @Mock
InterpreterFactory interpreterFactory;
-
- @Mock
InterpreterSettingManager interpreterSettingManager;
private AuthenticationInfo anonymous = new AuthenticationInfo("anonymous");
- @Before
+ @BeforeEach
public void setUp() {
- when(interpreter.getInterpreterGroup()).thenReturn(interpreterGroup);
- when(interpreterGroup.getInterpreterSetting()).thenReturn(interpreterSetting);
+ repo = mock(NotebookRepo.class);
+ paragraphJobListener = mock(ParagraphJobListener.class);
+ credentials = mock(Credentials.class);
+ interpreter = mock(Interpreter.class);
+ interpreterGroup = mock(ManagedInterpreterGroup.class);
+ interpreterSetting = mock(InterpreterSetting.class);
+ scheduler = mock(Scheduler.class);
+ interpreterFactory = mock(InterpreterFactory.class);
+ interpreterSettingManager = mock(InterpreterSettingManager.class);
}
@Test
- public void runNormalTest() throws InterpreterNotFoundException {
+ void runNormalTest() throws InterpreterNotFoundException {
when(interpreterFactory.getInterpreter(eq("spark"), any())).thenReturn(interpreter);
when(interpreter.getScheduler()).thenReturn(scheduler);
+ when(interpreter.getInterpreterGroup()).thenReturn(interpreterGroup);
+ when(interpreterGroup.getInterpreterSetting()).thenReturn(interpreterSetting);
String pText = "%spark sc.version";
Note note = new Note("test", "test", interpreterFactory, interpreterSettingManager, paragraphJobListener, credentials, noteEventListener);
@@ -106,18 +100,18 @@ public class NoteTest {
verify(scheduler, only()).submit(pCaptor.capture());
verify(interpreterFactory, times(1)).getInterpreter(eq("spark"), any());
- assertEquals("Paragraph text", pText, pCaptor.getValue().getText());
+ assertEquals( pText, pCaptor.getValue().getText(), "Paragraph text");
}
@Test
- public void addParagraphWithEmptyReplNameTest() {
+ void addParagraphWithEmptyReplNameTest() {
Note note = new Note("test", "", interpreterFactory, interpreterSettingManager, paragraphJobListener, credentials, noteEventListener);
Paragraph p = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
assertNull(p.getText());
}
@Test
- public void addParagraphWithLastReplNameTest() throws InterpreterNotFoundException {
+ void addParagraphWithLastReplNameTest() throws InterpreterNotFoundException {
when(interpreterFactory.getInterpreter(eq("spark"), any())).thenReturn(interpreter);
Note note = new Note("test", "", interpreterFactory, interpreterSettingManager, paragraphJobListener, credentials, noteEventListener);
Paragraph p1 = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -128,7 +122,7 @@ public class NoteTest {
}
@Test
- public void insertParagraphWithLastReplNameTest() throws InterpreterNotFoundException {
+ void insertParagraphWithLastReplNameTest() throws InterpreterNotFoundException {
when(interpreterFactory.getInterpreter(eq("spark"), any())).thenReturn(interpreter);
Note note = new Note("test", "", interpreterFactory, interpreterSettingManager, paragraphJobListener, credentials, noteEventListener);
Paragraph p1 = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -139,7 +133,7 @@ public class NoteTest {
}
@Test
- public void insertParagraphWithInvalidReplNameTest() throws InterpreterNotFoundException {
+ void insertParagraphWithInvalidReplNameTest() throws InterpreterNotFoundException {
when(interpreterFactory.getInterpreter(eq("invalid"), any())).thenReturn(null);
Note note = new Note("test", "", interpreterFactory, interpreterSettingManager, paragraphJobListener, credentials, noteEventListener);
Paragraph p1 = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -150,14 +144,14 @@ public class NoteTest {
}
@Test
- public void insertParagraphwithUser() {
+ void insertParagraphwithUser() {
Note note = new Note("test", "", interpreterFactory, interpreterSettingManager, paragraphJobListener, credentials, noteEventListener);
Paragraph p = note.insertNewParagraph(note.getParagraphs().size(), AuthenticationInfo.ANONYMOUS);
assertEquals("anonymous", p.getUser());
}
@Test
- public void clearAllParagraphOutputTest() throws InterpreterNotFoundException {
+ void clearAllParagraphOutputTest() throws InterpreterNotFoundException {
Note note = new Note("test", "", interpreterFactory, interpreterSettingManager, paragraphJobListener, credentials, noteEventListener);
Paragraph p1 = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -175,7 +169,7 @@ public class NoteTest {
@Test
- public void personalizedModeReturnDifferentParagraphInstancePerUser() {
+ void personalizedModeReturnDifferentParagraphInstancePerUser() {
Note note = new Note("test", "", interpreterFactory, interpreterSettingManager, paragraphJobListener, credentials, noteEventListener);
String user1 = "user1";
String user2 = "user2";
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
index b53d780ebb..1ca37e62f6 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
@@ -40,9 +40,9 @@ import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.user.Credentials;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.quartz.SchedulerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,13 +66,13 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
@@ -89,7 +89,7 @@ public class NotebookTest extends AbstractInterpreterTest implements ParagraphJo
private QuartzSchedulerService schedulerService;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_PUBLIC.getVarName(), "true");
System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_CRON_ENABLE.getVarName(), "true");
@@ -109,7 +109,7 @@ public class NotebookTest extends AbstractInterpreterTest implements ParagraphJo
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
System.clearProperty(ConfVars.ZEPPELIN_NOTEBOOK_PUBLIC.getVarName());
@@ -124,13 +124,12 @@ public class NotebookTest extends AbstractInterpreterTest implements ParagraphJo
notebookRepo = new DummyNotebookRepo();
notebook = new Notebook(conf, mock(AuthorizationService.class), notebookRepo, new NoteManager(notebookRepo, conf), interpreterFactory,
interpreterSettingManager, credentials, null);
- assertFalse("Revision is not supported in DummyNotebookRepo", notebook.isRevisionSupported());
+ assertFalse( notebook.isRevisionSupported(), "Revision is not supported in DummyNotebookRepo");
notebookRepo = new DummyNotebookRepoWithVersionControl();
notebook = new Notebook(conf, mock(AuthorizationService.class), notebookRepo, new NoteManager(notebookRepo, conf), interpreterFactory,
interpreterSettingManager, credentials, null);
- assertTrue("Revision is supported in DummyNotebookRepoWithVersionControl",
- notebook.isRevisionSupported());
+ assertTrue(notebook.isRevisionSupported(), "Revision is supported in DummyNotebookRepoWithVersionControl");
}
public static class DummyNotebookRepo implements NotebookRepo {
@@ -1879,7 +1878,7 @@ public class NotebookTest extends AbstractInterpreterTest implements ParagraphJo
return new File(conf.getNotebookDir() + "/" + notebookRepo.buildNoteFileName(note));
});
String noteJson = IOUtils.toString(new FileInputStream(noteFile), StandardCharsets.UTF_8);
- assertTrue(noteJson, noteJson.contains("note2"));
+ assertTrue(noteJson.contains("note2"), noteJson);
} finally {
if (noteId != null) {
notebook.removeNote(noteId, anonymous);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
index 35322bcd88..612ee2f728 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
@@ -18,26 +18,6 @@
package org.apache.zeppelin.notebook;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.lang3.tuple.Triple;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectBuilder;
@@ -61,13 +41,31 @@ import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.user.Credentials;
import org.apache.zeppelin.user.UserCredentials;
import org.apache.zeppelin.user.UsernamePassword;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class ParagraphTest extends AbstractInterpreterTest {
@Test
@@ -136,17 +134,15 @@ public class ParagraphTest extends AbstractInterpreterTest {
assertEquals(0, paragraph.getLocalProperties().size());
}
- @Rule
- public ExpectedException expectedEx = ExpectedException.none();
-
@Test
public void testInvalidProperties() {
- expectedEx.expect(RuntimeException.class);
- expectedEx.expectMessage("Invalid paragraph properties format");
-
- Note note = createNote();
- Paragraph paragraph = new Paragraph(note, null);
- paragraph.setText("%test(p1=v1=v2) a");
+ assertThrows(RuntimeException.class,
+ () -> {
+ Note note = createNote();
+ Paragraph paragraph = new Paragraph(note, null);
+ paragraph.setText("%test(p1=v1=v2) a");
+ },
+ "Invalid paragraph properties format");
}
@Test
@@ -256,11 +252,11 @@ public class ParagraphTest extends AbstractInterpreterTest {
assertEquals(defaultValue, newUserParagraph.getReturn().message().get(0).getData());
}
- @Ignore
+ @Disabled
public void returnUnchangedResultsWithDifferentUser() throws Throwable {
Note mockNote = mock(Note.class);
when(mockNote.getCredentials()).thenReturn(mock(Credentials.class));
- Paragraph spyParagraph = spy(new Paragraph("para_1", mockNote, null));
+ Paragraph spyParagraph = spy(new Paragraph("para_1", mockNote, null));
Interpreter mockInterpreter = mock(Interpreter.class);
spyParagraph.setInterpreter(mockInterpreter);
@@ -362,7 +358,7 @@ public class ParagraphTest extends AbstractInterpreterTest {
UserCredentials uc = mock(UserCredentials.class);
when(creds.getUserCredentials(anyString())).thenReturn(uc);
UsernamePassword up = new UsernamePassword("user", "pwd");
- when(uc.getUsernamePassword("ent")).thenReturn(up );
+ when(uc.getUsernamePassword("ent")).thenReturn(up);
Interpreter mockInterpreter = mock(Interpreter.class);
spyParagraph.setInterpreter(mockInterpreter);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTextParserTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTextParserTest.java
index 3857a3b5a4..c1f508a351 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTextParserTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTextParserTest.java
@@ -17,11 +17,11 @@
package org.apache.zeppelin.notebook;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class ParagraphTextParserTest {
@@ -136,38 +136,32 @@ public class ParagraphTextParserTest {
assertEquals("", parseResult.getScriptText());
}
- @Rule
- public ExpectedException exceptionRule = ExpectedException.none();
@Test
public void testParagraphTextUnfinishedConfig() {
- exceptionRule.expect(RuntimeException.class);
- exceptionRule.expectMessage(
+ assertThrows(RuntimeException.class,
+ () -> ParagraphTextParser.parse("%spark.pyspark(pool="),
"Problems by parsing paragraph. Not finished interpreter configuration");
- ParagraphTextParser.parse("%spark.pyspark(pool=");
}
@Test
public void testParagraphTextUnfinishedQuote() {
- exceptionRule.expect(RuntimeException.class);
- exceptionRule.expectMessage(
+ assertThrows(RuntimeException.class,
+ () -> ParagraphTextParser.parse("%spark.pyspark(pool=\"2314234) sc.version"),
"Problems by parsing paragraph. Not finished interpreter configuration");
- ParagraphTextParser.parse("%spark.pyspark(pool=\"2314234) sc.version");
}
@Test
public void testParagraphTextUnclosedBackslash() {
- exceptionRule.expect(RuntimeException.class);
- exceptionRule.expectMessage(
+ assertThrows(RuntimeException.class,
+ () -> ParagraphTextParser.parse("%spark.pyspark(pool=\\"),
"Problems by parsing paragraph. Unfinished escape sequence");
- ParagraphTextParser.parse("%spark.pyspark(pool=\\");
}
@Test
public void testParagraphTextEmptyKey() {
- exceptionRule.expect(RuntimeException.class);
- exceptionRule.expectMessage(
+ assertThrows((RuntimeException.class),
+ () -> ParagraphTextParser.parse("%spark.pyspark(pool=123, ,)"),
"Problems by parsing paragraph. Local property key is empty");
- ParagraphTextParser.parse("%spark.pyspark(pool=123, ,)");
}
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
index bb74178f1e..54595bc69d 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
@@ -17,11 +17,11 @@
package org.apache.zeppelin.notebook.repo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import java.io.File;
@@ -43,9 +43,9 @@ import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,7 +62,7 @@ public class GitNotebookRepoTest {
private ZeppelinConfiguration conf;
private GitNotebookRepo notebookRepo;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
String zpath = System.getProperty("java.io.tmpdir") + "/ZeppelinTest_" + System.currentTimeMillis();
zeppelinDir = new File(zpath);
@@ -84,7 +84,7 @@ public class GitNotebookRepoTest {
conf = ZeppelinConfiguration.create();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (!FileUtils.deleteQuietly(zeppelinDir)) {
LOG.error("Failed to delete {} ", zeppelinDir.getName());
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
index 655b601faf..bd940017ae 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
@@ -20,18 +20,18 @@ package org.apache.zeppelin.notebook.repo;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
import org.apache.zeppelin.notebook.repo.mock.VFSNotebookRepoMock;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
//TODO(zjffdu) move it to zeppelin-zengine
public class NotebookRepoSyncInitializationTest {
@@ -45,13 +45,13 @@ public class NotebookRepoSyncInitializationTest {
private String unsupportedStorageConf = validFirstStorageClass + "," + validSecondStorageClass + "," + validSecondStorageClass;
private String emptyStorageConf = "";
- @Before
+ @BeforeEach
public void setUp(){
System.setProperty(ConfVars.ZEPPELIN_PLUGINS_DIR.getVarName(), new File("../../../plugins").getAbsolutePath());
System.setProperty("zeppelin.isTest", "true");
}
- @After
+ @AfterEach
public void tearDown() {
System.clearProperty("zeppelin.isTest");
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
index 18ed8b6301..08ff441cf0 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
@@ -17,8 +17,8 @@
package org.apache.zeppelin.notebook.repo;
-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 static org.mockito.Mockito.mock;
import com.google.common.io.Files;
@@ -44,9 +44,9 @@ import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.storage.ConfigStorage;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.user.Credentials;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.quartz.SchedulerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@ public class NotebookRepoSyncTest {
private AuthorizationService authorizationService;
private static final Logger LOG = LoggerFactory.getLogger(NotebookRepoSyncTest.class);
- @Before
+ @BeforeEach
public void setUp() throws Exception {
System.setProperty("zeppelin.isTest", "true");
ZEPPELIN_HOME = Files.createTempDir();
@@ -104,7 +104,7 @@ public class NotebookRepoSyncTest {
anonymous = new AuthenticationInfo("anonymous");
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
delete(ZEPPELIN_HOME);
System.clearProperty("zeppelin.isTest");
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
index bd925601db..6aef8c8359 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
@@ -24,9 +24,9 @@ import org.apache.zeppelin.notebook.Note;
import org.apache.zeppelin.notebook.NoteInfo;
import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.nio.file.Files;
@@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class VFSNotebookRepoTest {
@@ -43,7 +43,7 @@ public class VFSNotebookRepoTest {
private VFSNotebookRepo notebookRepo;
private File notebookDir;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
notebookDir = Files.createTempDirectory("notebookDir").toFile();
System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(),
@@ -53,7 +53,7 @@ public class VFSNotebookRepoTest {
notebookRepo.init(zConf);
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
FileUtils.deleteDirectory(notebookDir);
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/plugin/PluginManagerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/plugin/PluginManagerTest.java
index d2d54a9abb..16c14a9113 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/plugin/PluginManagerTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/plugin/PluginManagerTest.java
@@ -19,11 +19,11 @@ package org.apache.zeppelin.plugin;
import org.apache.zeppelin.notebook.repo.GitNotebookRepo;
import org.apache.zeppelin.notebook.repo.NotebookRepo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class PluginManagerTest {
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java
index b58c30cbe4..aea076b825 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java
@@ -24,13 +24,13 @@ import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.zeppelin.interpreter.InterpreterOption.ISOLATED;
-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;
/**
* Unittest for DistributedResourcePool
@@ -46,7 +46,7 @@ public class DistributedResourcePoolTest extends AbstractInterpreterTest {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
note1Id = notebook.createNote("/note_1", AuthenticationInfo.ANONYMOUS);
@@ -67,7 +67,7 @@ public class DistributedResourcePoolTest extends AbstractInterpreterTest {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
interpreterSettingManager.close();
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java
index 3aee8a9c72..de9484a38b 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java
@@ -28,18 +28,18 @@ import org.apache.zeppelin.interpreter.thrift.ParagraphInfo;
import org.apache.zeppelin.resource.LocalResourcePool;
import org.apache.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RemoteSchedulerTest extends AbstractInterpreterTest
implements RemoteInterpreterProcessListener {
@@ -51,7 +51,7 @@ public class RemoteSchedulerTest extends AbstractInterpreterTest
private String note1Id;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
note1Id = notebook.createNote("/note_1", AuthenticationInfo.ANONYMOUS);
@@ -60,7 +60,7 @@ public class RemoteSchedulerTest extends AbstractInterpreterTest
}
@Override
- @After
+ @AfterEach
public void tearDown() {
interpreterSetting.close();
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/search/LuceneSearchTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/search/LuceneSearchTest.java
index 7f5ea6109c..0e554fe218 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/search/LuceneSearchTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/search/LuceneSearchTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.zeppelin.search;
import static org.apache.zeppelin.search.LuceneSearch.formatId;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -45,9 +45,9 @@ import org.apache.zeppelin.notebook.repo.InMemoryNotebookRepo;
import org.apache.zeppelin.notebook.repo.NotebookRepo;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.user.Credentials;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class LuceneSearchTest {
@@ -57,7 +57,7 @@ public class LuceneSearchTest {
private LuceneSearch noteSearchService;
private File indexDir;
- @Before
+ @BeforeEach
public void startUp() throws IOException {
indexDir = Files.createTempDirectory("lucene").toFile();
System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_SEARCH_INDEX_PATH.getVarName(), indexDir.getAbsolutePath());
@@ -75,7 +75,7 @@ public class LuceneSearchTest {
noteSearchService = new LuceneSearch(ZeppelinConfiguration.create(), notebook);
}
- @After
+ @AfterEach
public void shutDown() throws IOException {
noteSearchService.close();
FileUtils.deleteDirectory(indexDir);
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/storage/LocalConfigStorageTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/storage/LocalConfigStorageTest.java
index 85763f9200..64a675b6a0 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/storage/LocalConfigStorageTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/storage/LocalConfigStorageTest.java
@@ -19,7 +19,7 @@ package org.apache.zeppelin.storage;
import org.apache.commons.io.IOUtils;
import org.apache.zeppelin.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.BufferedWriter;
import java.io.File;
@@ -31,7 +31,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Random;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public class LocalConfigStorageTest {
public static final String TEST_STRING = "this is a test!";
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/CredentialsTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/CredentialsTest.java
index 8b59003192..34aeab56a0 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/CredentialsTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/CredentialsTest.java
@@ -17,11 +17,11 @@
package org.apache.zeppelin.user;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class CredentialsTest {
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/EncryptorTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/EncryptorTest.java
index 9950be6a63..1e57beeaa6 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/EncryptorTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/EncryptorTest.java
@@ -19,10 +19,10 @@ package org.apache.zeppelin.user;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class EncryptorTest {
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/util/UtilTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/util/UtilTest.java
index 95dea9029c..57727f7edc 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/util/UtilTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/util/UtilTest.java
@@ -17,19 +17,20 @@
package org.apache.zeppelin.util;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class UtilTest {
@Test
public void getVersionTest() {
- Assertions.assertNotNull(Util.getVersion());
+ assertNotNull(Util.getVersion());
}
@Test
public void getGitInfoTest() {
- Assertions.assertNotNull(Util.getGitCommitId());
- Assertions.assertNotNull(Util.getGitTimestamp());
+ assertNotNull(Util.getGitCommitId());
+ assertNotNull(Util.getGitTimestamp());
}
}