general updates

src/test/java/org/codesecure/dependencycheck/data/LuceneUtilsTest.java

@@ -48,7 +48,17 @@ public class LuceneUtilsTest {
         LuceneUtils.appendEscapedLuceneQuery(buf, text);
         assertEquals(expResult, buf.toString());
     }
-
+/**
+     * Test of appendEscapedLuceneQuery method, of class LuceneUtils.
+     */
+    @Test
+    public void testAppendEscapedLuceneQuery_null() {
+        System.out.println("appendEscapedLuceneQuery");
+        StringBuilder buf = new StringBuilder();
+        CharSequence text = null;
+        LuceneUtils.appendEscapedLuceneQuery(buf, text);
+        assertEquals(0, buf.length());
+    }
     /**
      * Test of escapeLuceneQuery method, of class LuceneUtils.
      */
@@ -60,4 +70,16 @@ public class LuceneUtilsTest {
         String result = LuceneUtils.escapeLuceneQuery(text);
         assertEquals(expResult, result);
     }
+    
+    /**
+     * Test of escapeLuceneQuery method, of class LuceneUtils.
+     */
+    @Test
+    public void testEscapeLuceneQuery_null() {
+        System.out.println("escapeLuceneQuery");
+        CharSequence text = null;
+        String expResult = null;
+        String result = LuceneUtils.escapeLuceneQuery(text);
+        assertEquals(expResult, result);
+    }
 }

src/test/java/org/codesecure/dependencycheck/data/cpe/CPEQueryTest.java

@@ -95,7 +95,7 @@ public class CPEQueryTest extends BaseIndexTestCase {
         CPEQuery instance = new CPEQuery();
 
         String queryText = instance.buildSearch(vendor, product, version, null, null);
-        String expResult = " product:( struts 2 core )  vendor:( apache software foundation ) version:(2.1.2)";
+        String expResult = " product:( struts 2 core )  vendor:( apache software foundation ) version:(2.1.2^0.7 )";
         assertTrue(expResult.equals(queryText));
 
         queryText = instance.buildSearch(vendor, product, version, null, productWeightings);

src/test/java/org/codesecure/dependencycheck/data/cpe/xml/CPEHandlerTest.java

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.codesecure.dependencycheck.cpe.xml;
+package org.codesecure.dependencycheck.data.cpe.xml;
 
 import java.io.File;
 import junit.framework.TestCase;

src/test/java/org/codesecure/dependencycheck/utils/CliParserTest.java

@@ -331,6 +331,11 @@ public class CliParserTest extends TestCase {
         System.setOut(new PrintStream(baos));
 
         CliParser instance = new CliParser();
+        String[] args = {"-h"};
+        instance.parse(args);
+        instance.printHelp();
+        args[0] = "-ah";
+        instance.parse(args);
         instance.printHelp();
         try {
             baos.flush();

src/test/java/org/codesecure/dependencycheck/utils/SettingsTest.java

@@ -4,6 +4,10 @@
  */
 package org.codesecure.dependencycheck.utils;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
 import junit.framework.TestCase;
 import org.junit.Test;
 
@@ -38,4 +42,97 @@ public class SettingsTest extends TestCase {
         String result = Settings.getString(key);
         assertTrue(result.endsWith(expResult));
     }
+
+    /**
+     * Test of mergeProperties method, of class Settings.
+     */
+    @Test
+    public void testMergeProperties_String() throws IOException, URISyntaxException {
+        System.out.println("getString");
+        String key = Settings.KEYS.PROXY_PORT;
+        String expResult = Settings.getString(key);
+        File f = new File(this.getClass().getClassLoader().getResource("test.properties").toURI());
+        //InputStream in = this.getClass().getClassLoader().getResourceAsStream("test.properties");
+        Settings.mergeProperties(f.getAbsolutePath());
+        String result = Settings.getString(key);
+        assertTrue("setting didn't change?", (expResult == null && result != null) || !expResult.equals(result));
+    }
+
+    /**
+     * Test of setString method, of class Settings.
+     */
+    @Test
+    public void testSetString() {
+        System.out.println("setString");
+        String key = "newProperty";
+        String value = "someValue";
+        Settings.setString(key, value);
+        String expResults = Settings.getString(key);
+        assertEquals(expResults, value);
+    }
+
+    /**
+     * Test of getString method, of class Settings.
+     */
+    @Test
+    public void testGetString_String_String() {
+        System.out.println("getString");
+        String key = "key That Doesn't Exist";
+        String defaultValue = "blue bunny";
+        String expResult = "blue bunny";
+        String result = Settings.getString(key);
+        assertTrue(result == null);
+        result = Settings.getString(key, defaultValue);
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of getString method, of class Settings.
+     */
+    @Test
+    public void testGetString_String() {
+        System.out.println("getString");
+        String key = Settings.KEYS.CONNECTION_TIMEOUT;
+        String result = Settings.getString(key);
+        assertTrue(result == null);
+    }
+
+    /**
+     * Test of getInt method, of class Settings.
+     */
+    @Test
+    public void testGetInt() {
+        System.out.println("getInt");
+        String key = "SomeNumber";
+        int expResult = 85;
+        Settings.setString(key, "85");
+        int result = Settings.getInt(key);
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of getLong method, of class Settings.
+     */
+    @Test
+    public void testGetLong() {
+        System.out.println("getLong");
+        String key = "SomeNumber";
+        long expResult = 300L;
+        Settings.setString(key, "300");
+        long result = Settings.getLong(key);
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of getBoolean method, of class Settings.
+     */
+    @Test
+    public void testGetBoolean() {
+        System.out.println("getBoolean");
+        String key = "SomeBoolean";
+        Settings.setString(key, "false");
+        boolean expResult = false;
+        boolean result = Settings.getBoolean(key);
+        assertEquals(expResult, result);
+    }
 }

src/test/java/org/codesecure/dependencycheck/xml/CPEEntryTest.java

@@ -1,47 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.codesecure.dependencycheck.cpe.xml;
-
-import org.codesecure.dependencycheck.data.cpe.Entry;
-import junit.framework.TestCase;
-
-/**
- *
- * @author Jeremy Long
- */
-public class CPEEntryTest extends TestCase {
-    
-    public CPEEntryTest(String testName) {
-        super(testName);
-    }
-    
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    /**
-     * Test of setName method, of class Entry.
-     */
-    public void testSetName() throws Exception {
-        System.out.println("setName");
-        String name = "cpe:/a:apache:struts:1.1:rc2";
-        
-        Entry instance = new Entry();
-        instance.setName(name);
-        
-        assertEquals(name,instance.getName());
-        assertEquals("apache", instance.getVendor());
-        assertEquals("struts", instance.getProduct());
-        assertEquals("1.1", instance.getVersion());
-        assertEquals("rc2", instance.getRevision());
-        
-    }
-}