Apply suggestions from code review

Co-authored-by: Hans Aikema <[email protected]>

Author: strangelookingnerd

ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskIT.java

@@ -49,12 +49,12 @@ public void setUp() throws Exception {
     @AfterEach
     @Override
     public void tearDown() throws Exception {
-        super.tearDown();
         if (buildFileRule.getProject() != null) {
             if (this.buildFileRule.getProject().getTargets().containsKey("tearDown")) {
                 this.buildFileRule.getProject().executeTarget("tearDown");
             }
         }
+        super.tearDown();
     }
 
     /**

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

@@ -118,7 +118,7 @@ void testPopulateSettings() throws Exception {
     @Test
     void testPopulateSettingsException() {
         String[] args = {"-invalidPROPERTY"};
-        Exception exception = assertThrows(UnrecognizedOptionException.class, () -> testBooleanProperties(args, null));
+        UnrecognizedOptionException exception = assertThrows(UnrecognizedOptionException.class, () -> testBooleanProperties(args, null));
         assertTrue(exception.getMessage().contains("Unrecognized option: -invalidPROPERTY"));
     }
 

maven/pom.xml

@@ -117,7 +117,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

pom.xml

@@ -523,7 +523,6 @@ Copyright (c) 2012 - Jeremy Long
                     <detectJavaApiLink>false</detectJavaApiLink>
                 </configuration>
             </plugin>
-            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -578,7 +577,6 @@ Copyright (c) 2012 - Jeremy Long
                     </execution>
                 </executions>
             </plugin>
-            -->
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -958,6 +956,12 @@ Copyright (c) 2012 - Jeremy Long
                 <version>${mock-server.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-junit-jupiter</artifactId>

utils/src/test/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStreamTest.java

@@ -66,10 +66,10 @@ void testResolveClassException() throws Exception {
         ByteArrayOutputStream mem = new ByteArrayOutputStream();
         byte[] buf;
         try (ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(mem))) {
-                out.writeObject(data);
-                out.flush();
-                buf = mem.toByteArray();
-            }
+            out.writeObject(data);
+            out.flush();
+            buf = mem.toByteArray();
+        }
         ByteArrayInputStream in = new ByteArrayInputStream(buf);
         ExpectedObjectInputStream instance = new ExpectedObjectInputStream(in, "java.util.ArrayList", "org.owasp.dependencycheck.utils.SimplePojo");
         assertThrows(java.io.InvalidClassException.class, instance::readObject);