Migrate tests to JUnit5

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

Author: strangelookingnerd

Diff for: pom.xml

@@ -20,7 +20,7 @@
   <licenses>
     <license>
       <name>MIT License</name>
-      <url>http://opensource.org/licenses/MIT</url>
+      <url>https://opensource.org/licenses/MIT</url>
     </license>
   </licenses>
 

Diff for: src/test/java/hudson/plugins/locale/ConfigurationAsCodeTest.java

@@ -1,23 +1,22 @@
 package hudson.plugins.locale;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.jenkins.plugins.casc.misc.ConfiguredWithCode;
 import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
+import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode;
 import jenkins.model.Jenkins;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ConfigurationAsCodeTest {
-
-    @Rule
-    public JenkinsConfiguredWithCodeRule r = new JenkinsConfiguredWithCodeRule();
+@WithJenkinsConfiguredWithCode
+class ConfigurationAsCodeTest {
 
     @Test
     @ConfiguredWithCode("configuration-as-code.yml")
-    public void should_support_configuration_as_code() throws Exception {
+    void should_support_configuration_as_code(JenkinsConfiguredWithCodeRule r) {
         PluginImpl plugin = Jenkins.get().getExtensionList(PluginImpl.class).get(0);
         assertEquals("fr", plugin.getSystemLocale());
-        assertEquals(true, plugin.isIgnoreAcceptLanguage());
+        assertTrue(plugin.isIgnoreAcceptLanguage());
     }
 }

Diff for: src/test/java/hudson/plugins/locale/MigrationTest.java

@@ -1,34 +1,33 @@
 package hudson.plugins.locale;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+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 jenkins.model.Jenkins;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 import org.jvnet.hudson.test.recipes.LocalData;
 
 /**
  * Tests data loading from Locale Plugin 1.3.
  * @author Oleg Nenashev
  */
-public class MigrationTest {
-
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
+@WithJenkins
+class MigrationTest {
 
     @LocalData
     @Test
-    public void dataMigration_13() {
+    void dataMigration_13(JenkinsRule j) {
         PluginImpl plugin = Jenkins.get().getExtensionList(PluginImpl.class).get(0);
         assertEquals("en-US", plugin.getSystemLocale());
-        assertEquals(true, plugin.isIgnoreAcceptLanguage());
+        assertTrue(plugin.isIgnoreAcceptLanguage());
     }
 
     @LocalData
     @Test
-    public void dataMigration_UnsetLocale() {
+    void dataMigration_UnsetLocale(JenkinsRule j) {
         PluginImpl plugin = Jenkins.get().getExtensionList(PluginImpl.class).get(0);
 
         // Assuming the default behavior if systemLocale is unset

Diff for: src/test/java/hudson/plugins/locale/PluginImplTest.java

@@ -1,28 +1,27 @@
 package hudson.plugins.locale;
 
-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.junit.jupiter.api.Assertions.assertTrue;
 
 import hudson.util.ListBoxModel;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 import jenkins.model.Jenkins;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 
-public class PluginImplTest {
-
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
+@WithJenkins
+class PluginImplTest {
 
     private PluginImpl plugin;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp(JenkinsRule j) {
         plugin = Jenkins.get().getExtensionList(PluginImpl.class).get(0);
     }
 
@@ -33,26 +32,26 @@ public void setUp() {
             "zh_TW"));
 
     @Test
-    public void testDoFillSystemLocaleItems() {
+    void testDoFillSystemLocaleItems() {
         // Invoke the method
         ListBoxModel model = plugin.doFillSystemLocaleItems();
 
         // Expected size of the ListBoxModel
         int expectedSize = ALLOWED_LOCALES.size() + 1; // +1 for the "Use Default Locale" option
 
         // Verify the returned ListBoxModel size
-        assertEquals("The returned ListBoxModel size is not as expected", expectedSize, model.size());
+        assertEquals(expectedSize, model.size(), "The returned ListBoxModel size is not as expected");
 
         // Verify that the first option is "Use Default Locale"
         String expectedFirstOption = String.format(
                 "Use Default Locale - %s (%s)",
                 Locale.getDefault().getDisplayName(), Locale.getDefault().toString());
-        assertEquals("The first option should be 'Use Default Locale'", expectedFirstOption, model.get(0).name);
+        assertEquals(expectedFirstOption, model.get(0).name, "The first option should be 'Use Default Locale'");
 
         // Verify that the allowed locales are correctly added to the ListBoxModel, excluding the first option
         for (String localeStr : ALLOWED_LOCALES) {
             Locale locale = Locale.forLanguageTag(localeStr.replace('_', '-'));
-            String expectedOption = String.format("%s - %s", locale.getDisplayName(), locale.toString());
+            String expectedOption = String.format("%s - %s", locale.getDisplayName(), locale);
 
             boolean found = false;
             for (int i = 1; i < model.size(); i++) { // Start from 1 to skip the "Use Default Locale" option
@@ -61,37 +60,37 @@ public void testDoFillSystemLocaleItems() {
                     break;
                 }
             }
-            assertEquals("The ListBoxModel does not contain the expected locale: " + locale, true, found);
+            assertTrue(found, "The ListBoxModel does not contain the expected locale: " + locale);
         }
     }
 
     @Test
-    public void testSetSystemLocale() {
+    void testSetSystemLocale() {
         // Test setting systemLocale
         String systemLocale = "en_US";
         plugin.setSystemLocale(systemLocale);
         assertEquals(systemLocale, plugin.getSystemLocale());
     }
 
     @Test
-    public void testSetIgnoreAcceptLanguage() {
+    void testSetIgnoreAcceptLanguage() {
         // Test setting ignoreAcceptLanguage
         boolean ignoreAcceptLanguage = true;
         plugin.setIgnoreAcceptLanguage(ignoreAcceptLanguage);
         assertEquals(ignoreAcceptLanguage, plugin.isIgnoreAcceptLanguage());
     }
 
     @Test
-    public void testNullSystemLocale() {
+    void testNullSystemLocale() {
         // Test setting systemLocale to null
         plugin.setSystemLocale(null);
-        assertNull("System locale should be null", plugin.getSystemLocale());
+        assertNull(plugin.getSystemLocale(), "System locale should be null");
     }
 
     @Test
-    public void testEmptySystemLocale() {
+    void testEmptySystemLocale() {
         // Test setting systemLocale to empty string
         plugin.setSystemLocale("");
-        assertNull("System locale should be empty", plugin.getSystemLocale());
+        assertNull(plugin.getSystemLocale(), "System locale should be empty");
     }
 }