Migrate tests to JUnit5 (#109)

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

Author: strangelookingnerd

src/test/java/org/jenkinsci/plugin/gitea/GiteaBrowserTest.java

@@ -27,58 +27,58 @@
 import hudson.plugins.git.GitChangeSet;
 import hudson.plugins.git.GitChangeSet.Path;
 import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 
-public class GiteaBrowserTest {
+class GiteaBrowserTest {
 
     private static final String GITEA_URL = "http://gitea.test";
 
     private final GiteaBrowser instance = new GiteaBrowser(GITEA_URL);
 
     @Test
-    public void given__instance__when__getUrl__then__urlEndsWithSlash() throws Exception {
+    void given__instance__when__getUrl__then__urlEndsWithSlash() throws Exception {
         assertThat(instance.getUrl().toString(),
                 is(GITEA_URL + "/"));
     }
 
     @Test
-    public void given__instance__when__nonNormalizedUrl__then__urlNormalized() throws Exception {
+    void given__instance__when__nonNormalizedUrl__then__urlNormalized() throws Exception {
         assertThat(new GiteaBrowser("http://gitea.test:80/foo/../bar/..").getUrl().toString(),
                 is(GITEA_URL + "/"));
     }
 
     @Test
-    public void given__instance__when__repoUrl_ends_with_slash__then__no_double_slash() throws Exception {
+    void given__instance__when__repoUrl_ends_with_slash__then__no_double_slash() throws Exception {
         assertThat(new GiteaBrowser(GITEA_URL + "/").getUrl().toString(),
                 is(GITEA_URL + "/"));
     }
 
     @Test
-    public void given__changeset__when__getChangeSetLink__then__url_generater() throws Exception {
+    void given__changeset__when__getChangeSetLink__then__url_generater() throws Exception {
         assertThat(instance.getChangeSetLink(loadChangeSet("rawchangelog")).toString(),
                 is(GITEA_URL + "/commit/396fc230a3db05c427737aa5c2eb7856ba72b05d"));
     }
 
     @Test
-    public void given__changeset__when__getDiffLink_first_file__then__fragment_1() throws Exception {
+    void given__changeset__when__getDiffLink_first_file__then__fragment_1() throws Exception {
         assertThat(instance.getDiffLink(
                 findPath(loadChangeSet("rawchangelog"), "src/main/java/hudson/plugins/git/browser/GithubWeb.java")
         ).toString(), is(GITEA_URL + "/commit/396fc230a3db05c427737aa5c2eb7856ba72b05d#diff-1"));
     }
 
     @Test
-    public void given__changeset__when__getDiffLink_second_file__then__fragment_2() throws Exception {
+    void given__changeset__when__getDiffLink_second_file__then__fragment_2() throws Exception {
         assertThat(instance.getDiffLink(
                 findPath(loadChangeSet("rawchangelog"), "src/test/java/hudson/plugins/git/browser/GithubWebTest.java")
         ).toString(), is(GITEA_URL + "/commit/396fc230a3db05c427737aa5c2eb7856ba72b05d#diff-2"));
     }
 
     @Test
-    public void given__changeset__when__getDiffLink_new_file__then__no_diff_link() throws Exception {
+    void given__changeset__when__getDiffLink_new_file__then__no_diff_link() throws Exception {
         assertThat(instance.getDiffLink(
                 findPath(
                         loadChangeSet("rawchangelog"),
@@ -88,7 +88,7 @@ public void given__changeset__when__getDiffLink_new_file__then__no_diff_link() t
     }
 
     @Test
-    public void given__path__when__getFileLink_existing_file__then__file_link_points_to_file() throws Exception {
+    void given__path__when__getFileLink_existing_file__then__file_link_points_to_file() throws Exception {
         assertThat(instance.getFileLink(
                 findPath(
                         loadChangeSet("rawchangelog"),
@@ -101,19 +101,19 @@ public void given__path__when__getFileLink_existing_file__then__file_link_points
     }
 
     @Test
-    public void given__path__when__getFileLink_deleted_file__then__file_link_points_to_diff() throws Exception {
+    void given__path__when__getFileLink_deleted_file__then__file_link_points_to_diff() throws Exception {
         assertThat(instance.getFileLink(
                 findPath(loadChangeSet("rawchangelog-with-deleted-file"), "bar")
         ).toString(), is(GITEA_URL + "/commit/fc029da233f161c65eb06d0f1ed4f36ae81d1f4f#diff-1"));
     }
 
     private GitChangeSet loadChangeSet(String resourceName) throws Exception {
         try (InputStream is = GiteaBrowserTest.class.getResourceAsStream(resourceName)) {
-            return new GitChangeLogParser(false).parse(is).get(0);
+            return new GitChangeLogParser(null, false).parse(is).get(0);
         }
     }
 
-    private Path findPath(GitChangeSet changeSet, String path) throws Exception {
+    private Path findPath(GitChangeSet changeSet, String path) {
         for (final Path p : changeSet.getPaths()) {
             if (path.equals(p.getPath())) {
                 return p;

src/test/java/org/jenkinsci/plugin/gitea/GiteaCreateSCMEventTest.java

@@ -9,51 +9,51 @@
 import org.jenkinsci.plugin.gitea.client.api.GiteaCreateEvent;
 import org.jenkinsci.plugin.gitea.client.api.GiteaOwner;
 import org.jenkinsci.plugin.gitea.client.api.GiteaRepository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-public class GiteaCreateSCMEventTest {
+class GiteaCreateSCMEventTest {
 
-    GiteaSCMSource giteaSCMSource = new GiteaSCMSource("", "", "");
-    MockSCMSource scmSource = new MockSCMSource("controllerId", "giteaRepo", new ArrayList<>());
-    MockSCMNavigator scmNavigator = new MockSCMNavigator("controllerId", new ArrayList<>());
-    GiteaCreateSCMEvent branchCreateEvent = new GiteaCreateSCMEvent(withGiteaCreateEvent("feature/branch", "branch"), "?");
-    GiteaCreateSCMEvent tagCreateEvent = new GiteaCreateSCMEvent(withGiteaCreateEvent("mytag", "tag"), "?");
+    private final GiteaSCMSource giteaSCMSource = new GiteaSCMSource("", "", "");
+    private final MockSCMSource scmSource = new MockSCMSource("controllerId", "giteaRepo", new ArrayList<>());
+    private final MockSCMNavigator scmNavigator = new MockSCMNavigator("controllerId", new ArrayList<>());
+    private final GiteaCreateSCMEvent branchCreateEvent = new GiteaCreateSCMEvent(withGiteaCreateEvent("feature/branch", "branch"), "?");
+    private final GiteaCreateSCMEvent tagCreateEvent = new GiteaCreateSCMEvent(withGiteaCreateEvent("mytag", "tag"), "?");
 
     @Test
-    public void descriptionForSCMNavigator_withBranchCreateEvent() {
+    void descriptionForSCMNavigator_withBranchCreateEvent() {
         assertThat(branchCreateEvent.descriptionFor(scmNavigator), is("Create event for branch feature/branch in repository giteaRepo"));
     }
 
     @Test
-    public void descriptionForSCMNavigator_withTagCreateEvent() {
+    void descriptionForSCMNavigator_withTagCreateEvent() {
         assertThat(tagCreateEvent.descriptionFor(scmNavigator), is("Create event for tag mytag in repository giteaRepo"));
     }
 
     @Test
-    public void descriptionForSCMSource_withBranchCreateEvent() {
+    void descriptionForSCMSource_withBranchCreateEvent() {
         assertThat(branchCreateEvent.descriptionFor(scmSource), is("Create event for branch feature/branch"));
     }
 
     @Test
-    public void descriptionForSCMSource_withTagCreateEvent() {
+    void descriptionForSCMSource_withTagCreateEvent() {
         assertThat(tagCreateEvent.descriptionFor(scmSource), is("Create event for tag mytag"));
     }
 
     @Test
-    public void description_withBranchCreateEvent() {
+    void description_withBranchCreateEvent() {
         assertThat(branchCreateEvent.description(), is("Create event for branch feature/branch in repository ownerUser/giteaRepo"));
     }
 
     @Test
-    public void description_withTagCreateEvent() {
+    void description_withTagCreateEvent() {
         assertThat(tagCreateEvent.description(), is("Create event for tag mytag in repository ownerUser/giteaRepo"));
     }
 
     @Test
-    public void headsFor_withBranchCreateEvent() {
+    void headsFor_withBranchCreateEvent() {
         Map<SCMHead, SCMRevision> headsFor = branchCreateEvent.headsFor(giteaSCMSource);
 
         assertThat(headsFor.size(), is(1));
@@ -65,7 +65,7 @@ public void headsFor_withBranchCreateEvent() {
     }
 
     @Test
-    public void headsFor_withTagCreateEvent() {
+    void headsFor_withTagCreateEvent() {
         Map<SCMHead, SCMRevision> headsFor = tagCreateEvent.headsFor(giteaSCMSource);
 
         assertThat(headsFor.size(), is(1));

src/test/java/org/jenkinsci/plugin/gitea/GiteaDeleteSCMEventTest.java

@@ -9,52 +9,52 @@
 import org.jenkinsci.plugin.gitea.client.api.GiteaDeleteEvent;
 import org.jenkinsci.plugin.gitea.client.api.GiteaOwner;
 import org.jenkinsci.plugin.gitea.client.api.GiteaRepository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 
-public class GiteaDeleteSCMEventTest {
+class GiteaDeleteSCMEventTest {
 
-    GiteaSCMSource giteaSCMSource = new GiteaSCMSource("", "", "");
-    MockSCMSource scmSource = new MockSCMSource("controllerId", "giteaRepo", new ArrayList<>());
-    MockSCMNavigator scmNavigator = new MockSCMNavigator("controllerId", new ArrayList<>());
-    GiteaDeleteSCMEvent branchDeleteEvent = new GiteaDeleteSCMEvent(withGiteaDeleteEvent("feature/branch", "branch"), "?");
-    GiteaDeleteSCMEvent tagDeleteEvent = new GiteaDeleteSCMEvent(withGiteaDeleteEvent("mytag", "tag"), "?");
+    final GiteaSCMSource giteaSCMSource = new GiteaSCMSource("", "", "");
+    final MockSCMSource scmSource = new MockSCMSource("controllerId", "giteaRepo", new ArrayList<>());
+    final MockSCMNavigator scmNavigator = new MockSCMNavigator("controllerId", new ArrayList<>());
+    final GiteaDeleteSCMEvent branchDeleteEvent = new GiteaDeleteSCMEvent(withGiteaDeleteEvent("feature/branch", "branch"), "?");
+    final GiteaDeleteSCMEvent tagDeleteEvent = new GiteaDeleteSCMEvent(withGiteaDeleteEvent("mytag", "tag"), "?");
 
     @Test
-    public void descriptionForSCMNavigator_withBranchDeleteEvent() {
+    void descriptionForSCMNavigator_withBranchDeleteEvent() {
         assertThat(branchDeleteEvent.descriptionFor(scmNavigator), is("Delete event for branch feature/branch in repository giteaRepo"));
     }
 
     @Test
-    public void descriptionForSCMNavigator_withTagDeleteEvent() {
+    void descriptionForSCMNavigator_withTagDeleteEvent() {
         assertThat(tagDeleteEvent.descriptionFor(scmNavigator), is("Delete event for tag mytag in repository giteaRepo"));
     }
 
     @Test
-    public void descriptionForSCMSource_withBranchDeleteEvent() {
+    void descriptionForSCMSource_withBranchDeleteEvent() {
         assertThat(branchDeleteEvent.descriptionFor(scmSource), is("Delete event for branch feature/branch"));
     }
 
     @Test
-    public void descriptionForSCMSource_withTagDeleteEvent() {
+    void descriptionForSCMSource_withTagDeleteEvent() {
         assertThat(tagDeleteEvent.descriptionFor(scmSource), is("Delete event for tag mytag"));
     }
 
     @Test
-    public void description_withBranchDeleteEvent() {
+    void description_withBranchDeleteEvent() {
         assertThat(branchDeleteEvent.description(), is("Delete event for branch feature/branch in repository ownerUser/giteaRepo"));
     }
 
     @Test
-    public void description_withTagDeleteEvent() {
+    void description_withTagDeleteEvent() {
         assertThat(tagDeleteEvent.description(), is("Delete event for tag mytag in repository ownerUser/giteaRepo"));
     }
 
     @Test
-    public void headsFor_withBranchDeleteEvent() {
+    void headsFor_withBranchDeleteEvent() {
         Map<SCMHead, SCMRevision> headsFor = branchDeleteEvent.headsFor(giteaSCMSource);
 
         assertThat(headsFor.size(), is(1));
@@ -66,7 +66,7 @@ public void headsFor_withBranchDeleteEvent() {
     }
 
     @Test
-    public void headsFor_withTagDeleteEvent() {
+    void headsFor_withTagDeleteEvent() {
         Map<SCMHead, SCMRevision> headsFor = tagDeleteEvent.headsFor(giteaSCMSource);
 
         assertThat(headsFor.size(), is(1));

src/test/java/org/jenkinsci/plugin/gitea/authentication/GiteaAuthSourceTest.java

@@ -30,21 +30,20 @@
 import org.jenkinsci.plugin.gitea.client.api.GiteaAuthToken;
 import org.jenkinsci.plugin.gitea.client.api.GiteaAuthUser;
 import org.jenkinsci.plugin.gitea.credentials.PersonalAccessToken;
-import org.junit.ClassRule;
-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.mockito.Mockito;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
-public class GiteaAuthSourceTest {
-    @ClassRule
-    public static JenkinsRule j = new JenkinsRule();
+@WithJenkins
+class GiteaAuthSourceTest {
 
     @Test
-    public void given__tokenCredential__when__convert__then__tokenAuth() throws Exception {
+    void given__tokenCredential__when__convert__then__tokenAuth(JenkinsRule j) {
         // we use a mock to ensure that java.lang.reflect.Proxy implementations of the credential interface work
         PersonalAccessToken credential = Mockito.mock(PersonalAccessToken.class);
         Mockito.when(credential.getToken()).thenReturn(Secret.fromString("b5bc10f13665362bd61de931c731e3c74187acc4"));
@@ -54,7 +53,7 @@ public void given__tokenCredential__when__convert__then__tokenAuth() throws Exce
     }
 
     @Test
-    public void given__userPassCredential__when__convert__then__tokenAuth() throws Exception {
+    void given__userPassCredential__when__convert__then__tokenAuth(JenkinsRule j) {
         // we use a mock to ensure that java.lang.reflect.Proxy implementations of the credential interface work
         UsernamePasswordCredentials credential = Mockito.mock(UsernamePasswordCredentials.class);
         Mockito.when(credential.getUsername()).thenReturn("bob");

src/test/java/org/jenkinsci/plugin/gitea/client/api/GiteaConnectionBuilderJenkinsTest.java

@@ -2,28 +2,26 @@
 
 import org.jenkinsci.plugin.gitea.client.mock.MockGiteaConnection;
 import org.jenkinsci.plugin.gitea.client.mock.MockGiteaConnectionFactory;
-import org.junit.ClassRule;
-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 static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
 
-public class GiteaConnectionBuilderJenkinsTest {
-
-    @ClassRule
-    public static JenkinsRule j = new JenkinsRule();
+@WithJenkins
+class GiteaConnectionBuilderJenkinsTest {
 
     @Test
-    public void given__registered_mock__when__open__then__mock_returned() throws Exception {
+    void given__registered_mock__when__open__then__mock_returned(JenkinsRule j) throws Exception {
         MockGiteaConnectionFactory.reset();
         MockGiteaConnectionFactory.register(new MockGiteaConnection("bob"), "http://gitea.test/open");
         assertThat(Gitea.server("http://gitea.test/open").open(), instanceOf(MockGiteaConnection.class));
     }
 
     @Test
-    public void given__no_registered_mock__when__open__then__real_returned() throws Exception {
+    void given__no_registered_mock__when__open__then__real_returned(JenkinsRule j) throws Exception {
         MockGiteaConnectionFactory.reset();
         assertThat(Gitea.server("http://gitea.test/open").open(), not(instanceOf(MockGiteaConnection.class)));
     }

src/test/java/org/jenkinsci/plugin/gitea/client/api/GiteaConnectionBuilderTest.java

@@ -2,22 +2,23 @@
 
 import org.jenkinsci.plugin.gitea.client.mock.MockGiteaConnection;
 import org.jenkinsci.plugin.gitea.client.mock.MockGiteaConnectionFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
 
-public class GiteaConnectionBuilderTest {
+class GiteaConnectionBuilderTest {
+
     @Test
-    public void given__registered_mock__when__open__then__mock_returned() throws Exception {
+    void given__registered_mock__when__open__then__mock_returned() throws Exception {
         MockGiteaConnectionFactory.reset();
         MockGiteaConnectionFactory.register(new MockGiteaConnection("bob"), "http://gitea.test/open");
         assertThat(Gitea.server("http://gitea.test/open").open(), instanceOf(MockGiteaConnection.class));
     }
 
     @Test
-    public void given__no_registered_mock__when__open__then__real_returned() throws Exception {
+    void given__no_registered_mock__when__open__then__real_returned() throws Exception {
         MockGiteaConnectionFactory.reset();
         assertThat(Gitea.server("http://gitea.test/open").open(), not(instanceOf(MockGiteaConnection.class)));
     }