Migrate tests to JUnit5 (cli)

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

Author: strangelookingnerd

cli/src/test/java/org/owasp/dependencycheck/AppTest.java

@@ -17,35 +17,34 @@
  */
 package org.owasp.dependencycheck;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.UnrecognizedOptionException;
+import org.junit.jupiter.api.Test;
+import org.owasp.dependencycheck.utils.InvalidSettingException;
+import org.owasp.dependencycheck.utils.Settings;
+import org.owasp.dependencycheck.utils.Settings.KEYS;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.UnrecognizedOptionException;
 import static org.hamcrest.MatcherAssert.assertThat;
-import org.junit.Assert;
-import org.junit.Test;
-import org.owasp.dependencycheck.utils.InvalidSettingException;
-import org.owasp.dependencycheck.utils.Settings;
-import org.owasp.dependencycheck.utils.Settings.KEYS;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests for the {@link AppTest} class.
  */
-public class AppTest extends BaseTest {
+class AppTest extends BaseTest {
 
     /**
      * Test of ensureCanonicalPath method, of class App.
      */
     @Test
-    public void testEnsureCanonicalPath() {
+    void testEnsureCanonicalPath() {
         String file = "../*.jar";
         App instance = new App(getSettings());
         String result = instance.ensureCanonicalPath(file);
@@ -55,7 +54,7 @@ public void testEnsureCanonicalPath() {
         file = "../some/skip/../path/file.txt";
         String expResult = "/some/path/file.txt";
         result = instance.ensureCanonicalPath(file);
-        assertTrue("result=" + result, result.endsWith(expResult));
+        assertTrue(result.endsWith(expResult), "result=" + result);
     }
 
     /**
@@ -65,7 +64,7 @@ public void testEnsureCanonicalPath() {
      * @throws Exception the unexpected {@link Exception}.
      */
     @Test
-    public void testPopulateSettings() throws Exception {
+    void testPopulateSettings() throws Exception {
         File prop = new File(this.getClass().getClassLoader().getResource("sample.properties").toURI().getPath());
         String[] args = {"-P", prop.getAbsolutePath()};
         Map<String, Boolean> expected = new HashMap<>();
@@ -115,13 +114,12 @@ public void testPopulateSettings() throws Exception {
      * Assert that an {@link UnrecognizedOptionException} is thrown when a
      * property that is not supported is specified on the CLI.
      *
-     * @throws Exception the unexpected {@link Exception}.
      */
     @Test
-    public void testPopulateSettingsException() throws Exception {
+    void testPopulateSettingsException() {
         String[] args = {"-invalidPROPERTY"};
-        Exception exception = Assert.assertThrows(UnrecognizedOptionException.class, () -> testBooleanProperties(args, null));
-        Assert.assertTrue(exception.getMessage().contains("Unrecognized option: -invalidPROPERTY"));
+        Exception exception = assertThrows(UnrecognizedOptionException.class, () -> testBooleanProperties(args, null));
+        assertTrue(exception.getMessage().contains("Unrecognized option: -invalidPROPERTY"));
     }
 
     /**
@@ -130,7 +128,7 @@ public void testPopulateSettingsException() throws Exception {
      * @throws Exception the unexpected {@link Exception}.
      */
     @Test
-    public void testPopulatingSuppressionSettingsWithASingleFile() throws Exception {
+    void testPopulatingSuppressionSettingsWithASingleFile() throws Exception {
         // GIVEN CLI properties with the mandatory arguments
         File prop = new File(this.getClass().getClassLoader().getResource("sample.properties").toURI().getPath());
 
@@ -154,7 +152,7 @@ public void testPopulatingSuppressionSettingsWithASingleFile() throws Exception
      * @throws Exception the unexpected {@link Exception}.
      */
     @Test
-    public void testPopulatingSuppressionSettingsWithMultipleFiles() throws Exception {
+    void testPopulatingSuppressionSettingsWithMultipleFiles() throws Exception {
         // GIVEN CLI properties with the mandatory arguments
         File prop = new File(this.getClass().getClassLoader().getResource("sample.properties").toURI().getPath());
 
@@ -172,7 +170,7 @@ public void testPopulatingSuppressionSettingsWithMultipleFiles() throws Exceptio
     }
 
 
-    private boolean testBooleanProperties(String[] args, Map<String, Boolean> expected) throws URISyntaxException, FileNotFoundException, ParseException, InvalidSettingException {
+    private boolean testBooleanProperties(String[] args, Map<String, Boolean> expected) throws FileNotFoundException, ParseException, InvalidSettingException {
         this.reloadSettings();
         final CliParser cli = new CliParser(getSettings());
         cli.parse(args);

cli/src/test/java/org/owasp/dependencycheck/BaseTest.java

@@ -15,8 +15,8 @@
  */
 package org.owasp.dependencycheck;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.owasp.dependencycheck.utils.Settings;
 
 /**
@@ -33,15 +33,15 @@ public abstract class BaseTest {
     /**
      * Initialize the {@link Settings}.
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         settings = new Settings();
     }
 
     /**
      * Clean the {@link Settings}.
      */
-    @After
+    @AfterEach
     public void tearDown() {
         settings.cleanup(true);
     }