Migrate tests to JUnit5 (#147)

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

Author: strangelookingnerd

src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/BasicTests.java

@@ -3,8 +3,8 @@
 import static net.uaznia.lukanus.hudson.plugins.gitparameter.Constants.DEFAULT_VALUE;
 import static net.uaznia.lukanus.hudson.plugins.gitparameter.Constants.NAME;
 import static net.uaznia.lukanus.hudson.plugins.gitparameter.Constants.PT_REVISION;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -13,18 +13,19 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import net.sf.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kohsuke.stapler.StaplerRequest2;
 
 /**
- * This test don't use jenkis rule
+ * This test don't use jenkins rule
  */
-public class BasicTests {
+class BasicTests {
+
     /**
      * Test of createValue method, of class GitParameterDefinition.
      */
     @Test
-    public void testCreateValue_StaplerRequest2() {
+    void testCreateValue_StaplerRequest2() {
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
                 PT_REVISION,
@@ -41,25 +42,25 @@ public void testCreateValue_StaplerRequest2() {
         StaplerRequest2 request = mock(StaplerRequest2.class);
         ParameterValue result = instance.createValue(request);
 
-        assertEquals(result, new GitParameterValue(NAME, DEFAULT_VALUE));
+        assertEquals(new GitParameterValue(NAME, DEFAULT_VALUE), result);
     }
 
     @Test
-    public void matchesWithBitbucketPullRequestRefs() {
+    void matchesWithBitbucketPullRequestRefs() {
         Matcher matcher = Consts.PULL_REQUEST_REFS_PATTERN.matcher("refs/pull-requests/186/from");
         assertTrue(matcher.find());
-        assertEquals(matcher.group(1), "186");
+        assertEquals("186", matcher.group(1));
     }
 
     @Test
-    public void matchesWithGithubPullRequestRefs() {
+    void matchesWithGithubPullRequestRefs() {
         Matcher matcher = Consts.PULL_REQUEST_REFS_PATTERN.matcher("refs/pull/45/head");
         assertTrue(matcher.find());
-        assertEquals(matcher.group(1), "45");
+        assertEquals("45", matcher.group(1));
     }
 
     @Test
-    public void testCreateValue_StaplerRequest2_ValueInRequest() {
+    void testCreateValue_StaplerRequest2_ValueInRequest() {
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
                 PT_REVISION,
@@ -77,11 +78,11 @@ public void testCreateValue_StaplerRequest2_ValueInRequest() {
         when(request.getParameterValues(instance.getName())).thenReturn(new String[] {"master"});
         ParameterValue result = instance.createValue(request);
 
-        assertEquals(result, new GitParameterValue(NAME, "master"));
+        assertEquals(new GitParameterValue(NAME, "master"), result);
     }
 
     @Test
-    public void testConstructorInitializesTagFilterToAsteriskWhenNull() {
+    void testConstructorInitializesTagFilterToAsteriskWhenNull() {
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
                 PT_REVISION,
@@ -99,7 +100,7 @@ public void testConstructorInitializesTagFilterToAsteriskWhenNull() {
     }
 
     @Test
-    public void testConstructorInitializesTagFilterToAsteriskWhenWhitespace() {
+    void testConstructorInitializesTagFilterToAsteriskWhenWhitespace() {
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
                 PT_REVISION,
@@ -117,7 +118,7 @@ public void testConstructorInitializesTagFilterToAsteriskWhenWhitespace() {
     }
 
     @Test
-    public void testConstructorInitializesTagFilterToAsteriskWhenEmpty() {
+    void testConstructorInitializesTagFilterToAsteriskWhenEmpty() {
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
                 PT_REVISION,
@@ -135,7 +136,7 @@ public void testConstructorInitializesTagFilterToAsteriskWhenEmpty() {
     }
 
     @Test
-    public void testConstructorInitializesTagToGivenValueWhenNotNullOrWhitespace() {
+    void testConstructorInitializesTagToGivenValueWhenNotNullOrWhitespace() {
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
                 PT_REVISION,
@@ -156,7 +157,7 @@ public void testConstructorInitializesTagToGivenValueWhenNotNullOrWhitespace() {
      * Test of createValue method, of class GitParameterDefinition.
      */
     @Test
-    public void testCreateValue_StaplerRequest2_JSONObject() {
+    void testCreateValue_StaplerRequest2_JSONObject() {
         System.out.println("createValue");
         StaplerRequest2 request = mock(StaplerRequest2.class);
 
@@ -181,24 +182,14 @@ public void testCreateValue_StaplerRequest2_JSONObject() {
 
         ParameterValue result = instance.createValue(request, jO);
 
-        assertEquals(result, new GitParameterValue("Git_param_name", "Git_param_value"));
-    }
-
-    /**
-     * Test of getDefaultParameterValue method, of class GitParameterDefinition.
-     */
-    @Test
-    public void testGetDefaultParameterValue() {
-
-        // TODO review the generated test code and remove the default call to fail.
-        // fail("The test case is a prototype.");
+        assertEquals(new GitParameterValue("Git_param_name", "Git_param_value"), result);
     }
 
     /**
      * Test of getType method, of class GitParameterDefinition.
      */
     @Test
-    public void testGetParameterType() {
+    void testGetParameterType() {
         String expResult = PT_REVISION;
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
@@ -224,7 +215,7 @@ public void testGetParameterType() {
      * Test of setType method, of class GitParameterDefinition.
      */
     @Test
-    public void testSetParameterType() {
+    void testSetParameterType() {
         String expResult = PT_REVISION;
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
@@ -245,7 +236,7 @@ public void testSetParameterType() {
     }
 
     @Test
-    public void testWrongType() {
+    void testWrongType() {
         GitParameterDefinition instance = new GitParameterDefinition(
                 NAME,
                 "asdf",
@@ -267,7 +258,7 @@ public void testWrongType() {
      * Test of getDefaultValue method, of class GitParameterDefinition.
      */
     @Test
-    public void testGetDefaultValue() {
+    void testGetDefaultValue() {
         System.out.println("getDefaultValue");
         String expResult = DEFAULT_VALUE;
 
@@ -291,7 +282,7 @@ public void testGetDefaultValue() {
      * Test of setDefaultValue method, of class GitParameterDefinition.
      */
     @Test
-    public void testSetDefaultValue() {
+    void testSetDefaultValue() {
         System.out.println("getDefaultValue");
         String expResult = DEFAULT_VALUE;
 
@@ -312,10 +303,4 @@ public void testSetDefaultValue() {
         String result = instance.getDefaultValue();
         assertEquals(expResult, result);
     }
-
-    /**
-     * Test of generateContents method, of class GitParameterDefinition.
-     */
-    @Test
-    public void testGenerateContents() {}
 }

src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/Constants.java

@@ -1,6 +1,7 @@
 package net.uaznia.lukanus.hudson.plugins.gitparameter;
 
 public class Constants {
+
     static final String GIT_PARAMETER_REPOSITORY_URL = "https://github.com/jenkinsci/git-parameter-plugin.git";
     static final String GIT_CLIENT_REPOSITORY_URL = "https://github.com/jenkinsci/git-client-plugin.git";
     static final String EXAMPLE_REPOSITORY_A_URL = "https://github.com/klimas7/exampleA.git";