Issue #730: Add CLI test for single suppresion file

Added @Before and @After for cleaning the singleton
Cleaned class to ensure I can add further tests easily

I would suggest that AppTest#testPopulateSettings() be split into tests which fail for a single reason.
I have avoided that ATM to minimise code I'm meddling with

dependency-check-cli/src/test/java/org/owasp/dependencycheck/AppTest.java

@@ -13,28 +13,57 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Copyright (c) 2017 The OWASP Foundatio. All Rights Reserved.
+ * Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
  */
 package org.owasp.dependencycheck;
 
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 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 org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.rules.ExpectedException;
 import org.owasp.dependencycheck.utils.InvalidSettingException;
 import org.owasp.dependencycheck.utils.Settings;
+import org.owasp.dependencycheck.utils.Settings.KEYS;
 
 /**
- *
+ * Tests for the {@link AppTest} class.
- * @author jeremy
  */
 public class AppTest {
 
+    /** Test rule for asserting exceptions and their contents. */
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    /**
+     * Initialize the {@link Settings} singleton.
+     */
+    @Before
+    public void setUp() {
+        Settings.initialize();
+    }
+
+    /**
+     * Clean the {@link Settings} singleton.
+     */
+    @After
+    public void tearDown() {
+        Settings.cleanup();
+    }
+
     /**
      * Test of ensureCanonicalPath method, of class App.
      */
@@ -52,59 +81,93 @@ public class AppTest {
         assertTrue("result=" + result, result.endsWith(expResult));
     }
 
-    @Test(expected = UnrecognizedOptionException.class)
+    /**
-    public void testPopulateSettingsException() throws FileNotFoundException, ParseException, InvalidSettingException, URISyntaxException {
+     * Assert that boolean properties can be set on the CLI and parsed into the {@link Settings} singleton.
-        String[] args = {"-invalidPROPERTY"};
+     *
-        assertTrue(testBooleanProperties(args, null));
+     * @throws Exception the unexpected {@link Exception}.
-    }
+     */
-
     @Test
-    public void testPopulateSettings() throws FileNotFoundException, ParseException, InvalidSettingException, URISyntaxException {
+    public void testPopulateSettings() throws Exception {
         File prop = new File(this.getClass().getClassLoader().getResource("sample.properties").toURI().getPath());
-        String[] args = {"-P", prop.getAbsolutePath()};
+        String[] args = { "-P", prop.getAbsolutePath() };
         Map<String, Boolean> expected = new HashMap<>();
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE);
         expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.TRUE);
 
         assertTrue(testBooleanProperties(args, expected));
 
-        String[] args2 = {"-n"};
+        String[] args2 = { "-n" };
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE);
         expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.TRUE);
         assertTrue(testBooleanProperties(args2, expected));
 
-        String[] args3 = {"-h"};
+        String[] args3 = { "-h" };
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.TRUE);
         expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.TRUE);
         assertTrue(testBooleanProperties(args3, expected));
 
-        String[] args4 = {"--disableArchive"};
+        String[] args4 = { "--disableArchive" };
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.TRUE);
         expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.FALSE);
         assertTrue(testBooleanProperties(args4, expected));
 
-        String[] args5 = {"-P", prop.getAbsolutePath(), "--disableArchive"};
+        String[] args5 = { "-P", prop.getAbsolutePath(), "--disableArchive" };
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE);
         expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.FALSE);
         assertTrue(testBooleanProperties(args5, expected));
 
         prop = new File(this.getClass().getClassLoader().getResource("sample2.properties").toURI().getPath());
-        String[] args6 = {"-P", prop.getAbsolutePath(), "--disableArchive"};
+        String[] args6 = { "-P", prop.getAbsolutePath(), "--disableArchive" };
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.TRUE);
         expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.FALSE);
         assertTrue(testBooleanProperties(args6, expected));
 
-        String[] args7 = {"-P", prop.getAbsolutePath(), "--noupdate"};
+        String[] args7 = { "-P", prop.getAbsolutePath(), "--noupdate" };
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE);
         expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.FALSE);
         assertTrue(testBooleanProperties(args7, expected));
 
-        String[] args8 = {"-P", prop.getAbsolutePath(), "--noupdate", "--disableArchive"};
+        String[] args8 = { "-P", prop.getAbsolutePath(), "--noupdate", "--disableArchive" };
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE);
         expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.FALSE);
         assertTrue(testBooleanProperties(args8, expected));
+    }
 
+    /**
+     * 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 {
+        String[] args = { "-invalidPROPERTY" };
 
+        expectedException.expect(UnrecognizedOptionException.class);
+        expectedException.expectMessage("Unrecognized option: -invalidPROPERTY");
+        testBooleanProperties(args, null);
+    }
+
+    /**
+     * Assert that a single suppression file can be set using the CLI.
+     *
+     * @throws Exception the unexpected {@link Exception}.
+     */
+    @Test
+    public void testPopulatingSuppressionSettings() throws Exception {
+        // GIVEN CLI properties with the mandatory arguments
+        File prop = new File(this.getClass().getClassLoader().getResource("sample.properties").toURI().getPath());
+
+        // AND a single suppression file
+        String[] args = { "-P", prop.getAbsolutePath(), "--suppression", "another-file.xml" };
+
+        // WHEN parsing the CLI arguments
+        final CliParser cli = new CliParser();
+        cli.parse(args);
+        final App classUnderTest = new App();
+        classUnderTest.populateSettings(cli);
+
+        // THEN the suppression file is set in the settings singleton for use in the application core
+        assertThat("Expected the suppression file to be set in the Settings singleton", Settings.getString(KEYS.SUPPRESSION_FILE), is("another-file.xml"));
     }
 
     private boolean testBooleanProperties(String[] args, Map<String, Boolean> expected) throws URISyntaxException, FileNotFoundException, ParseException, InvalidSettingException {
@@ -124,4 +187,5 @@ public class AppTest {
             Settings.cleanup();
         }
     }
+
 }