refactoring update tasks

Former-commit-id: d9b72f31b3df06106414bb3de925311f9acfc0d5

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/AbstractUpdateTaskTest.java

@@ -38,9 +38,9 @@ import org.owasp.dependencycheck.utils.DownloadFailedException;
  *
  * @author Jeremy Long (jeremy.long@owasp.org)
  */
-public class AbstractUpdateTest {
+public class AbstractUpdateTaskTest {
 
-    public AbstractUpdateTest() {
+    public AbstractUpdateTaskTest() {
     }
 
     @BeforeClass
@@ -59,25 +59,31 @@ public class AbstractUpdateTest {
     public void tearDown() {
     }
 
+    public AbstractUpdateTask getAbstractUpdateImpl() throws Exception {
+        DataStoreMetaInfo props = new DataStoreMetaInfo();
+        AbstractUpdateTask instance = new AbstractUpdateImpl(props);
+        return instance;
+    }
+
     /**
-     * Test of setDeleteAndRecreate method, of class AbstractUpdate.
+     * Test of setDeleteAndRecreate method, of class AbstractUpdateTask.
      */
     @Test
     public void testSetDeleteAndRecreate() throws Exception {
         boolean deleteAndRecreate = false;
         boolean expResult = false;
-        AbstractUpdate instance = new AbstractUpdateImpl();
+        AbstractUpdateTask instance = getAbstractUpdateImpl();
         instance.setDeleteAndRecreate(deleteAndRecreate);
         boolean result = instance.shouldDeleteAndRecreate();
         assertEquals(expResult, result);
     }
 
     /**
-     * Test of deleteExistingData method, of class AbstractUpdate.
+     * Test of deleteExistingData method, of class AbstractUpdateTask.
      */
     @Test
     public void testDeleteExistingData() throws Exception {
-        AbstractUpdate instance = new AbstractUpdateImpl();
+        AbstractUpdateTask instance = getAbstractUpdateImpl();
         Exception result = null;
         try {
             instance.deleteExistingData();
@@ -88,17 +94,17 @@ public class AbstractUpdateTest {
     }
 
     /**
-     * Test of openDataStores method, of class AbstractUpdate.
+     * Test of openDataStores method, of class AbstractUpdateTask.
      */
     @Test
     public void testOpenDataStores() throws Exception {
-        AbstractUpdate instance = new AbstractUpdateImpl();
+        AbstractUpdateTask instance = getAbstractUpdateImpl();
         instance.openDataStores();
         instance.closeDataStores();
     }
 
     /**
-     * Test of withinRange method, of class AbstractUpdate.
+     * Test of withinRange method, of class AbstractUpdateTask.
      */
     @Test
     public void testWithinRange() throws Exception {
@@ -107,7 +113,7 @@ public class AbstractUpdateTest {
         long current = c.getTimeInMillis();
         long lastRun = c.getTimeInMillis() - (3 * (1000 * 60 * 60 * 24));
         int range = 7; // 7 days
-        AbstractUpdate instance = new AbstractUpdateImpl();
+        AbstractUpdateTask instance = getAbstractUpdateImpl();
         boolean expResult = true;
         boolean result = instance.withinRange(lastRun, current, range);
         assertEquals(expResult, result);
@@ -118,10 +124,10 @@ public class AbstractUpdateTest {
         assertEquals(expResult, result);
     }
 
-    public class AbstractUpdateImpl extends AbstractUpdate {
+    public class AbstractUpdateImpl extends AbstractUpdateTask {
 
-        public AbstractUpdateImpl() throws Exception {
-            super();
+        public AbstractUpdateImpl(DataStoreMetaInfo props) throws Exception {
+            super(props);
         }
 
         public Updateable updatesNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/BatchUpdateTaskTest.java

@@ -35,9 +35,9 @@ import org.owasp.dependencycheck.utils.Settings;
  *
  * @author Jeremy Long (jeremy.long@owasp.org)
  */
-public class BatchUpdateTest {
+public class BatchUpdateTaskTest {
 
-    public BatchUpdateTest() {
+    public BatchUpdateTaskTest() {
     }
 
     @BeforeClass
@@ -86,24 +86,30 @@ public class BatchUpdateTest {
         Settings.setString(Settings.KEYS.BATCH_UPDATE_URL, "");
     }
 
+    public BatchUpdateTask getBatchUpdateTask() throws MalformedURLException, DownloadFailedException, UpdateException {
+        DataStoreMetaInfo props = new DataStoreMetaInfo();
+        BatchUpdateTask instance = new BatchUpdateTask(props);
+        return instance;
+    }
+
     /**
-     * Test of setDoBatchUpdate method, of class BatchUpdate.
+     * Test of setDoBatchUpdate method, of class BatchUpdateTask.
      */
     @Test
     public void testSetDoBatchUpdate() throws DownloadFailedException, MalformedURLException, UpdateException {
         boolean expected = false;
-        BatchUpdate instance = new BatchUpdate();
+        BatchUpdateTask instance = getBatchUpdateTask();
         instance.setDoBatchUpdate(expected);
         boolean results = instance.isDoBatchUpdate();
         assertEquals(results, expected);
     }
 
     /**
-     * Test of update method, of class BatchUpdate.
+     * Test of update method, of class BatchUpdateTask.
      */
     @Test
     public void testUpdate() throws Exception {
-        BatchUpdate instance = new BatchUpdate();
+        BatchUpdateTask instance = getBatchUpdateTask();
 
         //do some setup
         instance.setDoBatchUpdate(true);

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateTaskIntegrationTest.java

@@ -18,20 +18,23 @@
  */
 package org.owasp.dependencycheck.data.update;
 
+import java.net.MalformedURLException;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import org.owasp.dependencycheck.data.UpdateException;
+import org.owasp.dependencycheck.utils.DownloadFailedException;
 
 /**
  *
  * @author Jeremy Long (jeremy.long@owasp.org)
  */
-public class StandardUpdateIntegrationTest {
+public class StandardUpdateTaskIntegrationTest {
 
-    public StandardUpdateIntegrationTest() {
+    public StandardUpdateTaskIntegrationTest() {
     }
 
     @BeforeClass
@@ -50,22 +53,28 @@ public class StandardUpdateIntegrationTest {
     public void tearDown() {
     }
 
+    public StandardUpdateTask getStandardUpdateTask() throws MalformedURLException, DownloadFailedException, UpdateException {
+        DataStoreMetaInfo props = new DataStoreMetaInfo();
+        StandardUpdateTask instance = new StandardUpdateTask(props);
+        return instance;
+    }
+
     /**
-     * Test of update method, of class StandardUpdate.
+     * Test of update method, of class StandardUpdateTask.
      */
     @Test
     public void testUpdate() throws Exception {
-        StandardUpdate instance = new StandardUpdate();
+        StandardUpdateTask instance = getStandardUpdateTask();
         instance.update();
         //TODO make this an actual test
     }
 
     /**
-     * Test of updatesNeeded method, of class StandardUpdate.
+     * Test of updatesNeeded method, of class StandardUpdateTask.
      */
     @Test
     public void testUpdatesNeeded() throws Exception {
-        StandardUpdate instance = new StandardUpdate();
+        StandardUpdateTask instance = getStandardUpdateTask();
         Updateable result = instance.updatesNeeded();
         assertNotNull(result);
     }