From c9132de1ea7ea7ad57df5abdc0bbffc882502d52 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 17 Jan 2014 10:09:37 -0500
Subject: [PATCH] added tests for new methods

Former-commit-id: f641622221f2519ed7798af7c1fc071525aa106c
---
 .../data/nvdcve/DatabasePropertiesTest.java   | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesTest.java
index f613265f0..ff6f53243 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesTest.java
@@ -17,9 +17,9 @@
  */
 package org.owasp.dependencycheck.data.nvdcve;
 
+import java.util.Properties;
 import org.junit.After;
 import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -29,10 +29,7 @@ import org.owasp.dependencycheck.data.update.NvdCveInfo;
  *
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
-public class DatabasePropertiesTest {
-
-    public DatabasePropertiesTest() {
-    }
+public class DatabasePropertiesTest extends BaseDBTestCase {
 
     @BeforeClass
     public static void setUpClass() {
@@ -43,11 +40,15 @@ public class DatabasePropertiesTest {
     }
 
     @Before
-    public void setUp() {
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
     }
 
     @After
-    public void tearDown() {
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
     }
 
     /**
@@ -85,7 +86,7 @@ public class DatabasePropertiesTest {
         cveDB.open();
         instance = cveDB.getDatabaseProperties();
         cveDB.close();
-        long results = Long.parseLong(instance.getProperty("lastupdated." + key));
+        long results = Long.parseLong(instance.getProperty("NVD CVE " + key));
         assertEquals(expected, results);
     }
 
@@ -104,4 +105,33 @@ public class DatabasePropertiesTest {
         String result = instance.getProperty(key, defaultValue);
         assertEquals(expResult, result);
     }
+
+    /**
+     * Test of getProperty method, of class DatabaseProperties.
+     */
+    @Test
+    public void testGetProperty_String() throws DatabaseException {
+        String key = "version";
+        CveDB cveDB = new CveDB();
+        cveDB.open();
+        DatabaseProperties instance = cveDB.getDatabaseProperties();
+        cveDB.close();
+        String result = instance.getProperty(key);
+        double version = Double.parseDouble(result);
+        assertTrue(version >= 2.8);
+        assertTrue(version <= 10);
+    }
+
+    /**
+     * Test of getProperties method, of class DatabaseProperties.
+     */
+    @Test
+    public void testGetProperties() throws DatabaseException {
+        CveDB cveDB = new CveDB();
+        cveDB.open();
+        DatabaseProperties instance = cveDB.getDatabaseProperties();
+        cveDB.close();
+        Properties result = instance.getProperties();
+        assertTrue(result.size() > 0);
+    }
 }