Migrate tests to JUnit5 (#184)

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

Author: strangelookingnerd

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.3</version>
+    <version>5.17</version>
     <relativePath />
   </parent>
 
@@ -46,7 +46,7 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
     <jenkins.baseline>2.479</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
     <spotbugs.effort>Max</spotbugs.effort>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
@@ -56,7 +56,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3790.va_b_a_2d26d2b_69</version>
+        <version>4770.v9a_2b_7a_9d8b_7f</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/test/java/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealmTest.java

@@ -5,64 +5,58 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import hudson.security.SecurityRealm;
 import hudson.util.Secret;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Collections;
-import java.util.concurrent.Callable;
 import jenkins.model.Jenkins;
 import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-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.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 import org.jvnet.hudson.test.recipes.LocalData;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
 
-public class ReverseProxySecurityRealmTest {
-    @Rule
-    public final JenkinsRule jenkinsRule = new JenkinsRule();
+@WithJenkins
+class ReverseProxySecurityRealmTest {
 
-    private Jenkins jenkins;
+    private JenkinsRule j;
 
-    @Before
-    public void setUp() {
-        jenkins = jenkinsRule.jenkins;
+    @BeforeEach
+    void setUp(JenkinsRule rule) {
+        j = rule;
     }
 
     @Test
-    public void basicGetUserDetails() {
+    void basicGetUserDetails() {
         final ReverseProxySecurityRealm realm = createBasicRealm();
         final UserDetails userDetails = realm.loadUserByUsername2("[email protected]");
-        Assert.assertEquals("[email protected]", userDetails.getUsername());
+        assertEquals("[email protected]", userDetails.getUsername());
     }
 
     @Test
     @Issue("JENKINS-49274")
-    public void basicAuthenticate() throws Exception {
+    void basicAuthenticate() throws Exception {
         final ReverseProxySecurityRealm realm = createBasicRealm();
-        jenkins.setSecurityRealm(realm);
+        j.jenkins.setSecurityRealm(realm);
 
-        final JenkinsRule.WebClient client = jenkinsRule.createWebClient();
-        client.addRequestHeader(realm.getForwardedUser(), "[email protected]");
-        final Authentication authentication = client.executeOnServer(new Callable<Authentication>() {
-            @Override
-            public Authentication call() {
-                return Jenkins.getAuthentication2();
-            }
-        });
-        Assert.assertEquals(
-                "Authentication should match",
-                new UsernamePasswordAuthenticationToken(
-                        "[email protected]", "", Collections.singleton(SecurityRealm.AUTHENTICATED_AUTHORITY2)),
-                authentication);
+        try (JenkinsRule.WebClient client = j.createWebClient()) {
+            client.addRequestHeader(realm.getForwardedUser(), "[email protected]");
+            final Authentication authentication = client.executeOnServer(Jenkins::getAuthentication2);
+            assertEquals(
+                    new UsernamePasswordAuthenticationToken(
+                            "[email protected]", "", Collections.singleton(SecurityRealm.AUTHENTICATED_AUTHORITY2)),
+                    authentication,
+                    "Authentication should match");
+        }
     }
 
     private ReverseProxySecurityRealm createBasicRealm() {
@@ -94,8 +88,8 @@ private ReverseProxySecurityRealm createBasicRealm() {
 
     @Test
     @LocalData
-    public void testPasswordMigration() throws IOException {
-        final SecurityRealm securityRealm = jenkinsRule.jenkins.getSecurityRealm();
+    void testPasswordMigration() throws IOException {
+        final SecurityRealm securityRealm = j.jenkins.getSecurityRealm();
         assertThat(securityRealm, instanceOf(ReverseProxySecurityRealm.class));
         ReverseProxySecurityRealm reverseProxySecurityRealm = (ReverseProxySecurityRealm) securityRealm;
         assertThat(reverseProxySecurityRealm.getManagerPassword().getPlainText(), is("theManagerPassw0rd"));

src/test/java/org/jenkinsci/plugins/reverse_proxy_auth/data/ForwardedUserDataTest.java

@@ -1,24 +1,27 @@
 package org.jenkinsci.plugins.reverse_proxy_auth.data;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import hudson.model.User;
 import hudson.tasks.Mailer;
 import jenkins.model.Jenkins;
-import org.junit.Assert;
-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.MockAuthorizationStrategy;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
+
+@WithJenkins
+class ForwardedUserDataTest {
 
-public class ForwardedUserDataTest {
     private ForwardedUserData forwardedUserData;
     private User user;
 
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
+    private JenkinsRule j;
 
-    @Before
-    public void setup() {
+    @BeforeEach
+    void setUp(JenkinsRule rule) {
+        j = rule;
         j.jenkins.setAuthorizationStrategy(
                 new MockAuthorizationStrategy().grant(Jenkins.READ).everywhere().to("Max Mustermann"));
 
@@ -27,24 +30,24 @@ public void setup() {
     }
 
     @Test
-    public void basicForwardedUserData() {
+    void basicForwardedUserData() {
         forwardedUserData.setEmail("[email protected]");
-        Assert.assertEquals("[email protected]", forwardedUserData.getEmail());
+        assertEquals("[email protected]", forwardedUserData.getEmail());
 
         forwardedUserData.setDisplayName("Max Mustermann");
-        Assert.assertEquals("Max Mustermann", forwardedUserData.getDisplayName());
+        assertEquals("Max Mustermann", forwardedUserData.getDisplayName());
     }
 
     @Test
-    public void testUpdate() {
+    void testUpdate() {
         user.setFullName("John Doe");
         forwardedUserData.setDisplayName("Max Mustermann");
         forwardedUserData.update(user);
-        Assert.assertEquals("Max Mustermann", user.getFullName());
+        assertEquals("Max Mustermann", user.getFullName());
 
         forwardedUserData.setEmail("[email protected]");
         forwardedUserData.update(user);
         Mailer.UserProperty emailProp = user.getProperty(Mailer.UserProperty.class);
-        Assert.assertEquals("[email protected]", emailProp.getAddress());
+        assertEquals("[email protected]", emailProp.getAddress());
     }
 }