ARTEMIS-4790: use JUnit 5 for the tests

Author: gemmellr

artemis-cdi-client/pom.xml

@@ -80,8 +80,9 @@
          <artifactId>arquillian-junit-core</artifactId>
       </dependency>
       <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
+         <groupId>org.junit.vintage</groupId>
+         <artifactId>junit-vintage-engine</artifactId>
+         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>jakarta.jms</groupId>

artemis-cli/pom.xml

@@ -150,8 +150,13 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
+         <groupId>org.junit.jupiter</groupId>
+         <artifactId>junit-jupiter-api</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.junit.jupiter</groupId>
+         <artifactId>junit-jupiter-engine</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

artemis-cli/src/test/java/org/apache/activemq/SecurityManagerHandlerTest.java

@@ -19,7 +19,7 @@
 import org.apache.activemq.artemis.cli.factory.security.SecurityManagerHandler;
 import org.apache.activemq.artemis.dto.SecurityManagerDTO;
 import org.apache.activemq.artemis.spi.core.security.ActiveMQBasicSecurityManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SecurityManagerHandlerTest {
 

artemis-cli/src/test/java/org/apache/activemq/artemis/cli/commands/CreateTest.java

@@ -16,23 +16,25 @@
  */
 package org.apache.activemq.artemis.cli.commands;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 
+import org.apache.activemq.artemis.tests.extensions.parameterized.ParameterizedTestExtension;
+import org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
 import org.apache.activemq.artemis.utils.XmlProvider;
 import org.apache.activemq.cli.test.CliTestBase;
 import org.apache.activemq.cli.test.TestActionContext;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.xml.sax.SAXException;
 
-@RunWith(Parameterized.class)
+@ExtendWith(ParameterizedTestExtension.class)
 public class CreateTest extends CliTestBase {
 
    private final String testName;
@@ -45,7 +47,7 @@ public CreateTest(String testName, String httpHost, boolean relaxJolokia) throws
       this.relaxJolokia = relaxJolokia;
    }
 
-   @Parameterized.Parameters(name = "{0}")
+   @Parameters(name = "{0}")
    public static Collection<Object[]> testData() {
       return Arrays.asList(new Object[][]{
          {"Happy path + relaxJolokia", "sampledomain.com", true},
@@ -61,10 +63,10 @@ public static Collection<Object[]> testData() {
       });
    }
 
-   @Test
+   @TestTemplate
    public void testWriteJolokiaAccessXmlCreatesValidXml() throws Exception {
       TestActionContext context = new TestActionContext();
-      File testInstance = new File(temporaryFolder.getRoot(), "test-instance");
+      File testInstance = new File(temporaryFolder, "test-instance");
 
       Create c = new Create();
       c.setNoAutoTune(true);
@@ -73,7 +75,7 @@ public void testWriteJolokiaAccessXmlCreatesValidXml() throws Exception {
       c.setRelaxJolokia(relaxJolokia);
       c.execute(context);
 
-      Assert.assertTrue(isXmlValid(new File(testInstance, "etc/" + Create.ETC_JOLOKIA_ACCESS_XML)));
+      assertTrue(isXmlValid(new File(testInstance, "etc/" + Create.ETC_JOLOKIA_ACCESS_XML)));
    }
 
    /**

artemis-cli/src/test/java/org/apache/activemq/artemis/cli/commands/messages/ConnectionAbstractTest.java

@@ -16,12 +16,13 @@
  */
 package org.apache.activemq.artemis.cli.commands.messages;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import javax.jms.JMSException;
 
 import org.apache.activemq.artemis.cli.commands.ActionAbstractAccessor;
 import org.apache.activemq.cli.test.TestActionContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
@@ -40,7 +41,7 @@ public void testDefaultAcceptor() throws Exception {
 
          connectionAbstract.execute(new TestActionContext());
 
-         Assert.assertEquals(ConnectionAbstract.DEFAULT_BROKER_URL, connectionAbstract.getBrokerURL());
+         assertEquals(ConnectionAbstract.DEFAULT_BROKER_URL, connectionAbstract.getBrokerURL());
       } finally {
          System.clearProperty("artemis.instance.etc");
       }
@@ -62,10 +63,10 @@ public void testDefaultSourceAcceptorNoArtemis() {
             connectionAbstract.execute(new TestActionContext());
          } catch (Exception e) {
             e.printStackTrace();
-            Assert.assertEquals(JMSException.class, e.getClass());
+            assertEquals(JMSException.class, e.getClass());
          }
 
-         Assert.assertEquals("tcp://localhost:3344", connectionAbstract.getBrokerURL());
+         assertEquals("tcp://localhost:3344", connectionAbstract.getBrokerURL());
       } finally {
          System.clearProperty("artemis.instance.etc");
       }
@@ -86,7 +87,7 @@ public void testAMQPAcceptor() throws Exception {
 
          connectionAbstract.execute(new TestActionContext());
 
-         Assert.assertEquals("tcp://localhost:5672", connectionAbstract.getBrokerURL());
+         assertEquals("tcp://localhost:5672", connectionAbstract.getBrokerURL());
       } finally {
          System.clearProperty("artemis.instance.etc");
       }

artemis-cli/src/test/java/org/apache/activemq/artemis/cli/commands/messages/ProducerThreadTest.java

@@ -16,25 +16,25 @@
  */
 package org.apache.activemq.artemis.cli.commands.messages;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import javax.jms.JMSException;
 import javax.jms.Message;
 
 import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.apache.activemq.artemis.utils.RandomUtil;
 import org.apache.activemq.cli.test.TestActionContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 public class ProducerThreadTest {
 
    ProducerThread producer;
    Message mockMessage;
 
-   @Before
+   @BeforeEach
    public void setUp() {
       producer = new ProducerThread(null, ActiveMQDestination.createQueue(RandomUtil.randomString()), 0, null);
       mockMessage = Mockito.mock(Message.class);

artemis-cli/src/test/java/org/apache/activemq/artemis/cli/commands/messages/TransferTest.java

@@ -16,10 +16,11 @@
  */
 package org.apache.activemq.artemis.cli.commands.messages;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.apache.activemq.artemis.cli.commands.ActionAbstractAccessor;
 import org.apache.activemq.cli.test.TestActionContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.jms.JMSException;
 import java.io.File;
@@ -40,10 +41,10 @@ public void testDefaultSourceAcceptor() {
          try {
             transfer.execute(new TestActionContext());
          } catch (Exception e) {
-            Assert.assertEquals(JMSException.class, e.getClass());
+            assertEquals(JMSException.class, e.getClass());
          }
 
-         Assert.assertEquals(ConnectionAbstract.DEFAULT_BROKER_URL, transfer.getSourceURL());
+         assertEquals(ConnectionAbstract.DEFAULT_BROKER_URL, transfer.getSourceURL());
       } finally {
          System.clearProperty("artemis.instance.etc");
       }
@@ -67,10 +68,10 @@ public void testDefaultSourceAcceptorNoArtemis() {
             transfer.execute(new TestActionContext());
          } catch (Exception e) {
             e.printStackTrace();
-            Assert.assertEquals(JMSException.class, e.getClass());
+            assertEquals(JMSException.class, e.getClass());
          }
 
-         Assert.assertEquals("tcp://localhost:3344", transfer.getSourceURL());
+         assertEquals("tcp://localhost:3344", transfer.getSourceURL());
       } finally {
          System.clearProperty("artemis.instance.etc");
       }
@@ -91,10 +92,10 @@ public void testAMQPSourceAcceptor() {
          try {
             transfer.execute(new TestActionContext());
          } catch (Exception e) {
-            Assert.assertEquals(JMSException.class, e.getClass());
+            assertEquals(JMSException.class, e.getClass());
          }
 
-         Assert.assertEquals("tcp://localhost:5672", transfer.getSourceURL());
+         assertEquals("tcp://localhost:5672", transfer.getSourceURL());
       } finally {
          System.clearProperty("artemis.instance.etc");
       }

artemis-cli/src/test/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporterTest.java

@@ -16,30 +16,30 @@
  */
 package org.apache.activemq.artemis.cli.commands.tools.xml;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.InputStream;
 
 import org.apache.activemq.artemis.api.core.Pair;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.management.ManagementContext;
 import org.apache.activemq.cli.test.CliTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class XmlDataImporterTest extends CliTestBase {
 
    ActiveMQServer server;
 
-   @Before
+   @BeforeEach
    @Override
    public void setup() throws Exception {
       super.setup();
       server = ((Pair<ManagementContext, ActiveMQServer>)startServer()).getB();
    }
 
-   @After
+   @AfterEach
    @Override
    public void tearDown() throws Exception {
       stopServer();

artemis-cli/src/test/java/org/apache/activemq/artemis/integration/bootstrap/BootstrapLogBundleTest.java

@@ -16,25 +16,25 @@
  */
 package org.apache.activemq.artemis.integration.bootstrap;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
 import org.apache.activemq.artemis.logs.AssertionLoggerHandler.LogLevel;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class BootstrapLogBundleTest {
 
    private static final String LOGGER_NAME = ActiveMQBootstrapLogger.class.getPackage().getName();
    private static LogLevel origLevel;
 
-   @BeforeClass
+   @BeforeAll
    public static void setLogLevel() {
       origLevel = AssertionLoggerHandler.setLevel(LOGGER_NAME, LogLevel.DEBUG);
    }
 
-   @AfterClass
+   @AfterAll
    public static void restoreLogLevel() throws Exception {
       AssertionLoggerHandler.setLevel(LOGGER_NAME, origLevel);
    }

artemis-cli/src/test/java/org/apache/activemq/artemis/util/JVMArgumentTest.java

@@ -17,10 +17,13 @@
 
 package org.apache.activemq.artemis.util;
 
+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 java.util.HashMap;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JVMArgumentTest {
 
@@ -34,21 +37,21 @@ public void testArgumentsWindows() {
 
       HashMap<String, String> usedArgs = new HashMap<>();
       JVMArgumentParser.parseOriginalArgs(prefix, "\"", arguments, fixedArguments, usedArgs);
-      Assert.assertEquals(2, usedArgs.size());
-      Assert.assertEquals("-Xmx77G", usedArgs.get("-Xmx"));
-      Assert.assertEquals("-Xms333M", usedArgs.get("-Xms"));
+      assertEquals(2, usedArgs.size());
+      assertEquals("-Xmx77G", usedArgs.get("-Xmx"));
+      assertEquals("-Xms333M", usedArgs.get("-Xms"));
 
       String newLine = "IF \"%JAVA_ARGS%\"==\"\" (set JAVA_ARGS= -XX:AutoBoxCacheMax=20000 -XX:+PrintClassHistogram  -XX:+UseG1GC -XX:+UseStringDeduplication -Xms512M -Xmx1G -Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\\login.config -Dhawtio.disableProxy=true -Dhawtio.offline=true -Dhawtio.realm=activemq -Dhawtio.role=amq -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%)";
 
       String resultLine = JVMArgumentParser.parseNewLine(prefix, "\"", newLine, fixedArguments, usedArgs);
 
       System.out.println("output::" + resultLine);
 
-      Assert.assertFalse(resultLine.contains("-must-go"));
-      Assert.assertTrue(resultLine.contains("-Xmx77G"));
-      Assert.assertTrue(resultLine.contains("-Xms333M"));
-      Assert.assertFalse(resultLine.contains("-Xmx1G"));
-      Assert.assertFalse(resultLine.contains("-Xmx512M"));
+      assertFalse(resultLine.contains("-must-go"));
+      assertTrue(resultLine.contains("-Xmx77G"));
+      assertTrue(resultLine.contains("-Xms333M"));
+      assertFalse(resultLine.contains("-Xmx1G"));
+      assertFalse(resultLine.contains("-Xmx512M"));
    }
 
 
@@ -62,23 +65,23 @@ public void testArgumentsLinux() {
 
       HashMap<String, String> usedArgs = new HashMap<>();
       JVMArgumentParser.parseOriginalArgs(prefix, "\"", arguments, fixedArguments, usedArgs);
-      Assert.assertEquals(2, usedArgs.size());
-      Assert.assertEquals("-Xmx77G", usedArgs.get("-Xmx"));
-      Assert.assertEquals("-Xms333M", usedArgs.get("-Xms"));
+      assertEquals(2, usedArgs.size());
+      assertEquals("-Xmx77G", usedArgs.get("-Xmx"));
+      assertEquals("-Xms333M", usedArgs.get("-Xms"));
 
       String newLine = "    JAVA_ARGS= -XX:AutoBoxCacheMax=20000 -XX:+PrintClassHistogram  -XX:+UseG1GC -XX:+UseStringDeduplication -Xms512M -Xmx1G -Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\\login.config -Dhawtio.disableProxy=true -Dhawtio.offline=true -Dhawtio.realm=activemq -Dhawtio.role=amq -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%)";
 
       String resultLine = JVMArgumentParser.parseNewLine(prefix, "\"", newLine, fixedArguments, usedArgs);
 
       System.out.println("output::" + resultLine);
 
-      Assert.assertFalse(resultLine.contains("-must-go"));
-      Assert.assertTrue(resultLine.contains("-Xmx77G"));
-      Assert.assertTrue(resultLine.contains("-Xms333M"));
-      Assert.assertFalse(resultLine.contains("-Xmx1G"));
-      Assert.assertFalse(resultLine.contains("-Xmx512M"));
+      assertFalse(resultLine.contains("-must-go"));
+      assertTrue(resultLine.contains("-Xmx77G"));
+      assertTrue(resultLine.contains("-Xms333M"));
+      assertFalse(resultLine.contains("-Xmx1G"));
+      assertFalse(resultLine.contains("-Xmx512M"));
 
-      Assert.assertTrue(resultLine.startsWith("    "));
+      assertTrue(resultLine.startsWith("    "));
    }
 
 }