Migrate tests to JUnit5

* Migrate annotations and imports
* Migrate assertions
* Remove public visibility for test classes and methods
* Minor code cleanup

Author: strangelookingnerd

src/test/java/hudson/plugins/logparser/LineToStatusTest.java

@@ -1,18 +1,18 @@
 package hudson.plugins.logparser;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.regex.Pattern;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class LineToStatusTest {
+class LineToStatusTest {
     private LineToStatus toStatus;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         toStatus = new LineToStatus(Arrays.asList(
                 new ParsingRulePattern("my-rule", Pattern.compile("abc")),
                 new ParsingRulePattern("my-second-rule", Pattern.compile("bc")),
@@ -21,19 +21,19 @@ public void setUp() {
     }
 
     @Test
-    public void shouldHandleEmpty() {
+    void shouldHandleEmpty() {
         String actual = toStatus.apply("");
         assertThat(actual).isEqualTo(LogParserConsts.NONE);
     }
 
     @Test
-    public void shouldSkipCommentedRule() {
+    void shouldSkipCommentedRule() {
         String actual = toStatus.apply("xyz");
         assertThat(actual).isEqualTo(LogParserConsts.NONE);
     }
 
     @Test
-    public void shouldFindOnlyFirstMatchingRule() {
+    void shouldFindOnlyFirstMatchingRule() {
         String actual = toStatus.apply("abc");
         assertThat(actual).isEqualTo("my-rule");
     }

src/test/java/hudson/plugins/logparser/ParsingStrategyLocatorTest.java

@@ -1,16 +1,16 @@
 package hudson.plugins.logparser;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ParsingStrategyLocatorTest {
+class ParsingStrategyLocatorTest {
 
     @Test
-    public void shouldDefaultToClassic() {
+    void shouldDefaultToClassic() {
         Map<String, String> systemProperties = new HashMap<>();
         ParsingStrategyLocator locator = new ParsingStrategyLocator(systemProperties);
 
@@ -20,7 +20,7 @@ public void shouldDefaultToClassic() {
     }
 
     @Test
-    public void shouldAllowOverridingToStream() {
+    void shouldAllowOverridingToStream() {
         Map<String, String> systemProperties = new HashMap<>();
         systemProperties.put(ParsingStrategy.class.getName(), StreamParsingStrategy.class.getName());
         ParsingStrategyLocator locator = new ParsingStrategyLocator(systemProperties);
@@ -31,7 +31,7 @@ public void shouldAllowOverridingToStream() {
     }
 
     @Test
-    public void shouldFallbackToClassic() {
+    void shouldFallbackToClassic() {
         Map<String, String> systemProperties = new HashMap<>();
         systemProperties.put(ParsingStrategy.class.getName(), "does.not.match");
         ParsingStrategyLocator locator = new ParsingStrategyLocator(systemProperties);

src/test/java/org/jenkinsci/plugins/logparser/ConfigurationAsCodeTest.java

@@ -3,31 +3,29 @@
 import jenkins.model.Jenkins;
 import hudson.plugins.logparser.LogParserPublisher;
 import hudson.plugins.logparser.ParserRuleFile;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import io.jenkins.plugins.casc.ConfigurationAsCode;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Ignore;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 
 import java.util.List;
 
-public class ConfigurationAsCodeTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-    @Rule
-    public JenkinsRule r = new JenkinsRule();
+@WithJenkins
+class ConfigurationAsCodeTest {
 
     @Test
-    public void LegacyFormattingTest() throws Exception {
+    void legacyFormattingTest(JenkinsRule r) {
         final LogParserPublisher.DescriptorImpl descriptor = (LogParserPublisher.DescriptorImpl) Jenkins.get().getDescriptor(LogParserPublisher.class);
         ConfigurationAsCode.get().configure(ConfigurationAsCodeTest.class.getResource("configuration-as-code-legacy-formatting.yaml").toString());
-        assertEquals(true, descriptor.getLegacyFormatting());
+        assertTrue(descriptor.getLegacyFormatting());
     }
 
     @Test
-    public void ParsingRulesTest() throws Exception {
+    void parsingRulesTest(JenkinsRule r) {
         final LogParserPublisher.DescriptorImpl descriptor = (LogParserPublisher.DescriptorImpl) Jenkins.get().getDescriptor(LogParserPublisher.class);
         ConfigurationAsCode.get().configure(ConfigurationAsCodeTest.class.getResource("configuration-as-code-parsing-rules.yaml").toString());
         List<ParserRuleFile> parseRuleFiles = descriptor.getParsingRulesGlobal();
@@ -37,9 +35,9 @@ public void ParsingRulesTest() throws Exception {
         assertEquals("./maven-project1.zip", parseRuleFiles.get(0).getPath());
     }
 
-    @Ignore("Not finished")
+    @Disabled("Not finished")
     @Test
-    public void export_configuration() throws Exception {
+    void export_configuration(JenkinsRule r) throws Exception {
         ConfigurationAsCode.get().configure(ConfigurationAsCodeTest.class.getResource("configuration-as-code.yaml").toString());
         ConfigurationAsCode.get().export(System.out);
     }

src/test/java/org/jenkinsci/plugins/logparser/LogParserWorkflowTest.java

@@ -8,31 +8,32 @@
 import hudson.tasks.Maven;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.ToolInstallations;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 
 import java.io.File;
 import java.net.URL;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * In this test suite we initialize the Job workspaces with a resource (maven-project1.zip) that contains a Maven
  * project.
  */
-public class LogParserWorkflowTest {
+@WithJenkins
+class LogParserWorkflowTest {
 
-    @ClassRule
-    public static JenkinsRule jenkinsRule = new JenkinsRule();
+    private static JenkinsRule jenkinsRule;
 
     private static LogParserAction result;
 
-    @BeforeClass
-    public static void init() throws Exception {
+    @BeforeAll
+    static void init(JenkinsRule rule) throws Exception {
+        jenkinsRule = rule;
         Maven.MavenInstallation mavenInstallation = ToolInstallations.configureMaven35();
         WorkflowJob job = jenkinsRule.jenkins.createProject(WorkflowJob.class, "logParserPublisherWorkflowStep");
         DumbSlave agent = jenkinsRule.createOnlineSlave();
@@ -56,7 +57,7 @@ public static void init() throws Exception {
      * Run a workflow job using {@link LogParserPublisher} and check for success.
      */
     @Test
-    public void logParserPublisherWorkflowStep() throws Exception {
+    void logParserPublisherWorkflowStep() {
        assertEquals(0, result.getResult().getTotalErrors());
        assertEquals(2, result.getResult().getTotalWarnings());
        assertEquals(0, result.getResult().getTotalInfos());
@@ -66,15 +67,15 @@ public void logParserPublisherWorkflowStep() throws Exception {
      * Run a workflow job using {@link LogParserPublisher} and check for number of debug tags
      */
     @Test
-    public void logParserPublisherWorkflowStepDebugTags() throws Exception {
+    void logParserPublisherWorkflowStepDebugTags() {
         assertEquals(0, result.getResult().getTotalDebugs());
     }
 
     /**
      * Run a workflow job using {@link LogParserPublisher} and check for number of example arbitrary tags
      */
     @Test
-    public void logParserPublisherWorkflowStepArbitraryTags() throws Exception {
+    void logParserPublisherWorkflowStepArbitraryTags() {
         assertEquals(0, result.getResult().getTotalCountsByExtraTag("jenkins"));
         assertEquals(1, result.getResult().getTotalCountsByExtraTag("logParserPublisherWorkflowStep"));
     }