Migrate tests to JUnit5 (maven)

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

Author: strangelookingnerd

maven/pom.xml

@@ -116,7 +116,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactScopeExcludedTest.java

@@ -17,9 +17,8 @@
  */
 package org.owasp.dependencycheck.maven;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.owasp.dependencycheck.utils.Filter;
 
 import java.util.Arrays;
@@ -38,18 +37,9 @@
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.owasp.dependencycheck.maven.ArtifactScopeExcludedTest.ArtifactScopeExcludedTestBuilder.pluginDefaults;
 
-@RunWith(Parameterized.class)
-public class ArtifactScopeExcludedTest {
+class ArtifactScopeExcludedTest {
 
-	private final boolean skipTestScope;
-	private final boolean skipProvidedScope;
-	private final boolean skipSystemScope;
-	private final boolean skipRuntimeScope;
-	private final String testString;
-	private final boolean expectedResult;
-
-	@Parameterized.Parameters(name = "{0}")
-	public static Collection<Object[]> getParameters() {
+	static Collection<Object[]> getParameters() {
 		return Arrays.asList(new Object[][]{
 				{pluginDefaults().withTestString(SCOPE_COMPILE).withExpectedResult(false)},
 				{pluginDefaults().withTestString(SCOPE_COMPILE_PLUS_RUNTIME).withExpectedResult(false)},
@@ -66,19 +56,12 @@ public static Collection<Object[]> getParameters() {
 		});
 	}
 
-	public ArtifactScopeExcludedTest(final ArtifactScopeExcludedTestBuilder builder) {
-		this.skipTestScope = builder.skipTestScope;
-		this.skipProvidedScope = builder.skipProvidedScope;
-		this.skipSystemScope = builder.skipSystemScope;
-		this.skipRuntimeScope = builder.skipRuntimeScope;
-		this.testString = builder.testString;
-		this.expectedResult = builder.expectedResult;
-	}
-
-	@Test
-	public void shouldExcludeArtifact() {
-		final Filter<String> artifactScopeExcluded = new ArtifactScopeExcluded(skipTestScope, skipProvidedScope, skipSystemScope, skipRuntimeScope);
-		assertThat(expectedResult, is(equalTo(artifactScopeExcluded.passes(testString))));
+    @ParameterizedTest(name = "{0}")
+	@MethodSource("getParameters")
+    void shouldExcludeArtifact(final ArtifactScopeExcludedTestBuilder builder) {
+		final Filter<String> artifactScopeExcluded = new ArtifactScopeExcluded(
+				builder.skipTestScope, builder.skipProvidedScope, builder.skipSystemScope, builder.skipRuntimeScope);
+		assertThat(builder.expectedResult, is(equalTo(artifactScopeExcluded.passes(builder.testString))));
 	}
 
 	public static final class ArtifactScopeExcludedTestBuilder {

maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactTypeExcludedTest.java

@@ -17,20 +17,21 @@
  */
 package org.owasp.dependencycheck.maven;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
  * @author Jeremy Long
  */
-public class ArtifactTypeExcludedTest {
+class ArtifactTypeExcludedTest {
 
     /**
      * Test of passes method, of class ArtifactTypeExcluded.
      */
     @Test
-    public void testPasses() {
+    void testPasses() {
         String artifactType = null;
         ArtifactTypeExcluded instance = new ArtifactTypeExcluded(null);
         boolean expResult = false;

maven/src/test/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.java

@@ -17,36 +17,33 @@
  */
 package org.owasp.dependencycheck.maven;
 
-import java.io.File;
-import java.util.Locale;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.doReturn;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.owasp.dependencycheck.Engine;
 import org.owasp.dependencycheck.exception.ExceptionCollection;
 
+import java.io.File;
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.doReturn;
+
 /**
  *
  * @author Jeremy Long
  */
-@RunWith(MockitoJUnitRunner.class)
-public class BaseDependencyCheckMojoTest extends BaseTest {
+@ExtendWith(MockitoExtension.class)
+class BaseDependencyCheckMojoTest extends BaseTest {
 
     @Spy
     MavenProject project;
 
     @Test
-    public void should_newDependency_get_pom_from_base_dir() {
+    void should_newDependency_get_pom_from_base_dir() {
         // Given
         BaseDependencyCheckMojo instance = new BaseDependencyCheckMojoImpl();
 
@@ -62,7 +59,7 @@ public void should_newDependency_get_pom_from_base_dir() {
     }
 
     @Test
-    public void should_newDependency_get_default_virtual_dependency() {
+    void should_newDependency_get_default_virtual_dependency() {
         // Given
         BaseDependencyCheckMojo instance = new BaseDependencyCheckMojoImpl();
 
@@ -77,7 +74,7 @@ public void should_newDependency_get_default_virtual_dependency() {
     }
 
     @Test
-    public void should_newDependency_get_pom_declared_as_module() {
+    void should_newDependency_get_pom_declared_as_module() {
         // Given
         BaseDependencyCheckMojo instance = new BaseDependencyCheckMojoImpl();
 
@@ -99,7 +96,7 @@ public void should_newDependency_get_pom_declared_as_module() {
     public static class BaseDependencyCheckMojoImpl extends BaseDependencyCheckMojo {
 
         @Override
-        protected void runCheck() throws MojoExecutionException, MojoFailureException {
+        protected void runCheck() {
             throw new UnsupportedOperationException("Operation not supported");
         }
 
@@ -119,11 +116,11 @@ public boolean canGenerateReport() {
         }
 
         @Override
-        protected ExceptionCollection scanDependencies(Engine engine) throws MojoExecutionException {
+        protected ExceptionCollection scanDependencies(Engine engine) {
             throw new UnsupportedOperationException("Operation not supported");
         }
         @Override
-        protected ExceptionCollection scanPlugins(Engine engine, ExceptionCollection exCollection) throws MojoExecutionException {
+        protected ExceptionCollection scanPlugins(Engine engine, ExceptionCollection exCollection) {
             throw new UnsupportedOperationException("Operation not supported");
         }
     }

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

@@ -17,11 +17,12 @@
  */
 package org.owasp.dependencycheck.maven;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.owasp.dependencycheck.utils.Settings;
+
 import java.io.IOException;
 import java.io.InputStream;
-import org.junit.After;
-import org.junit.Before;
-import org.owasp.dependencycheck.utils.Settings;
 
 /**
  *
@@ -42,7 +43,7 @@ public abstract class BaseTest {
     /**
      * Initialize the {@link Settings}.
      */
-    @Before
+    @BeforeEach
     public void setUp() throws IOException {
         settings = new Settings();
         try (InputStream mojoProperties = BaseTest.class.getClassLoader().getResourceAsStream(BaseTest.PROPERTIES_FILE)) {
@@ -53,7 +54,7 @@ public void setUp() throws IOException {
     /**
      * Clean the {@link Settings}.
      */
-    @After
+    @AfterEach
     public void tearDown() {
         settings.cleanup(true);
     }

maven/src/test/resources/maven_project_base_dir/pom.xml

@@ -48,9 +48,9 @@
             <version>2.1.2</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.12.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>