From 09f065c3afc81bab79512e37325fcf0850aa1a3d Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Thu, 29 Aug 2013 06:42:16 -0400 Subject: [PATCH] code reorganization, moved files around to better seperate functionality Former-commit-id: 2a524807bb28ff4b60576c13b5e6737fd97f553a --- .../nvdcve => analyzer}/NvdCveAnalyzer.java | 4 +- .../{xml => }/InvalidDataException.java | 2 +- .../nvdcve/{xml => }/NvdCve12Handler.java | 2 +- .../nvdcve/{xml => }/NvdCve20Handler.java | 4 +- .../xml => update}/DataStoreMetaInfo.java | 4 +- .../xml => update}/DatabaseUpdater.java | 27 +++--- .../NvdCveUrl.java => update/NvdCveInfo.java} | 4 +- .../{nvdcve/xml => update}/package-info.java | 2 +- ...rg.owasp.dependencycheck.analyzer.Analyzer | 2 +- ...p.dependencycheck.data.CachedWebDataSource | 2 +- .../{xml => }/NvdCve_1_2_HandlerTest.java | 4 +- .../{xml => }/NvdCve_2_0_HandlerTest.java | 4 +- .../xml/DatabaseUpdaterIntegrationTest.java | 80 ----------------- .../data/nvdcve/xml/DatabaseUpdaterTest.java | 85 ------------------- 14 files changed, 33 insertions(+), 193 deletions(-) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{data/nvdcve => analyzer}/NvdCveAnalyzer.java (97%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/{xml => }/InvalidDataException.java (96%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/{xml => }/NvdCve12Handler.java (99%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/{xml => }/NvdCve20Handler.java (99%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/{nvdcve/xml => update}/DataStoreMetaInfo.java (98%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/{nvdcve/xml => update}/DatabaseUpdater.java (95%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/{nvdcve/xml/NvdCveUrl.java => update/NvdCveInfo.java} (97%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/{nvdcve/xml => update}/package-info.java (91%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/{xml => }/NvdCve_1_2_HandlerTest.java (94%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/{xml => }/NvdCve_2_0_HandlerTest.java (94%) delete mode 100644 dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdaterIntegrationTest.java delete mode 100644 dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdaterTest.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCveAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java similarity index 97% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCveAnalyzer.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java index 9e6285dbe..d7e1f7c74 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCveAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java @@ -16,7 +16,7 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve; +package org.owasp.dependencycheck.analyzer; import java.io.IOException; import java.sql.SQLException; @@ -29,6 +29,8 @@ import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Vulnerability; import org.owasp.dependencycheck.dependency.Identifier; import org.owasp.dependencycheck.analyzer.Analyzer; +import org.owasp.dependencycheck.data.nvdcve.CveDB; +import org.owasp.dependencycheck.data.nvdcve.DatabaseException; /** * NvdCveAnalyzer is a utility class that takes a project dependency and diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/InvalidDataException.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/InvalidDataException.java similarity index 96% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/InvalidDataException.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/InvalidDataException.java index 498e9427c..133d17cec 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/InvalidDataException.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/InvalidDataException.java @@ -16,7 +16,7 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.nvdcve; /** * An InvalidDataDataException is a generic exception used when trying to load diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCve12Handler.java similarity index 99% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCve12Handler.java index 3c4a8856a..baca54635 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCve12Handler.java @@ -16,7 +16,7 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.nvdcve; import java.util.ArrayList; import java.util.HashMap; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCve20Handler.java similarity index 99% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCve20Handler.java index 3f5808466..0a4b439f9 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/NvdCve20Handler.java @@ -16,7 +16,7 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.nvdcve; import java.io.IOException; import java.util.List; @@ -281,7 +281,7 @@ public class NvdCve20Handler extends DefaultHandler { * * @param index the CPE Lucene Index */ - void setCpeIndex(CpeIndexWriter index) { + public void setCpeIndex(CpeIndexWriter index) { cpeIndex = index; } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DataStoreMetaInfo.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DataStoreMetaInfo.java similarity index 98% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DataStoreMetaInfo.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DataStoreMetaInfo.java index a6fd31a94..08500dea2 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DataStoreMetaInfo.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DataStoreMetaInfo.java @@ -16,7 +16,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.update; import java.io.File; import java.io.FileInputStream; @@ -135,7 +135,7 @@ public class DataStoreMetaInfo { * @param updatedValue the updated nvdcve entry * @throws UpdateException is thrown if there is an update exception */ - public void save(NvdCveUrl updatedValue) throws UpdateException { + public void save(NvdCveInfo updatedValue) throws UpdateException { if (updatedValue == null) { return; } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java similarity index 95% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java index 9d452500b..0cdf531c2 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java @@ -16,8 +16,11 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.update; +import org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler; +import org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler; +import org.owasp.dependencycheck.data.nvdcve.InvalidDataException; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -47,7 +50,7 @@ import org.owasp.dependencycheck.utils.Downloader; import org.owasp.dependencycheck.utils.FileUtils; import org.owasp.dependencycheck.utils.Settings; import org.owasp.dependencycheck.data.nvdcve.DatabaseException; -import static org.owasp.dependencycheck.data.nvdcve.xml.DataStoreMetaInfo.MODIFIED; +import static org.owasp.dependencycheck.data.update.DataStoreMetaInfo.MODIFIED; import org.owasp.dependencycheck.utils.InvalidSettingException; /** @@ -103,9 +106,9 @@ public class DatabaseUpdater implements CachedWebDataSource { doBatchUpdate = false; properties = new DataStoreMetaInfo(); try { - final Map update = updateNeeded(); + final Map update = updateNeeded(); int maxUpdates = 0; - for (NvdCveUrl cve : update.values()) { + for (NvdCveInfo cve : update.values()) { if (cve.getNeedsUpdate()) { maxUpdates += 1; } @@ -128,7 +131,7 @@ public class DatabaseUpdater implements CachedWebDataSource { } int count = 0; - for (NvdCveUrl cve : update.values()) { + for (NvdCveInfo cve : update.values()) { if (cve.getNeedsUpdate()) { count += 1; Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.INFO, @@ -354,9 +357,9 @@ public class DatabaseUpdater implements CachedWebDataSource { * @throws UpdateException Is thrown if there is an issue with the last * updated properties file. */ - private Map updateNeeded() throws MalformedURLException, DownloadFailedException, UpdateException { + private Map updateNeeded() throws MalformedURLException, DownloadFailedException, UpdateException { - Map currentlyPublished; + Map currentlyPublished; try { currentlyPublished = retrieveCurrentTimestampsFromWeb(); } catch (InvalidDataException ex) { @@ -436,7 +439,7 @@ public class DatabaseUpdater implements CachedWebDataSource { } else { //we figure out which of the several XML files need to be downloaded. currentlyPublished.get(MODIFIED).setNeedsUpdate(false); for (int i = start; i <= end; i++) { - final NvdCveUrl cve = currentlyPublished.get(String.valueOf(i)); + final NvdCveInfo cve = currentlyPublished.get(String.valueOf(i)); long currentTimestamp = 0; try { currentTimestamp = Long.parseLong(properties.getProperty(DataStoreMetaInfo.LAST_UPDATED_BASE + String.valueOf(i), "0")); @@ -489,13 +492,13 @@ public class DatabaseUpdater implements CachedWebDataSource { * timestamps * @throws InvalidSettingException thrown if the settings are invalid */ - protected Map retrieveCurrentTimestampsFromWeb() + protected Map retrieveCurrentTimestampsFromWeb() throws MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException { - final Map map = new TreeMap(); + final Map map = new TreeMap(); String retrieveUrl = Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL); - NvdCveUrl item = new NvdCveUrl(); + NvdCveInfo item = new NvdCveInfo(); item.setNeedsUpdate(false); //the others default to true, to make life easier later this should default to false. item.setId(MODIFIED); item.setUrl(retrieveUrl); @@ -512,7 +515,7 @@ public class DatabaseUpdater implements CachedWebDataSource { final String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2); for (int i = start; i <= end; i++) { retrieveUrl = String.format(baseUrl20, i); - item = new NvdCveUrl(); + item = new NvdCveInfo(); item.setId(Integer.toString(i)); item.setUrl(retrieveUrl); item.setOldSchemaVersionUrl(String.format(baseUrl12, i)); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCveUrl.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveInfo.java similarity index 97% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCveUrl.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveInfo.java index 1b0914be3..76af51cf3 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCveUrl.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveInfo.java @@ -16,12 +16,12 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.update; /** * A pojo that contains the Url and timestamp of the current NvdCve XML files. */ -public class NvdCveUrl { +public class NvdCveInfo { /** * an id. diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/package-info.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/package-info.java similarity index 91% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/package-info.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/package-info.java index c04c24a6a..a6251592d 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/package-info.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/package-info.java @@ -15,4 +15,4 @@ * */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.update; diff --git a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer b/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer index bf33320c8..9cab62e1e 100644 --- a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer +++ b/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer @@ -5,4 +5,4 @@ org.owasp.dependencycheck.analyzer.HintAnalyzer org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer org.owasp.dependencycheck.analyzer.CPEAnalyzer -org.owasp.dependencycheck.data.nvdcve.NvdCveAnalyzer \ No newline at end of file +org.owasp.dependencycheck.analyzer.NvdCveAnalyzer \ No newline at end of file diff --git a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource b/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource index 4c400f8ac..c42a832ed 100644 --- a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource +++ b/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource @@ -1 +1 @@ -org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater \ No newline at end of file +org.owasp.dependencycheck.data.update.DatabaseUpdater \ No newline at end of file diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve_1_2_HandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/NvdCve_1_2_HandlerTest.java similarity index 94% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve_1_2_HandlerTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/NvdCve_1_2_HandlerTest.java index 3a5dc92f2..443239f4e 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve_1_2_HandlerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/NvdCve_1_2_HandlerTest.java @@ -16,9 +16,9 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.nvdcve; -import org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler; +import org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler; import java.io.File; import java.util.List; import java.util.Map; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve_2_0_HandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/NvdCve_2_0_HandlerTest.java similarity index 94% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve_2_0_HandlerTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/NvdCve_2_0_HandlerTest.java index d9d46dd5e..acec690b0 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve_2_0_HandlerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/NvdCve_2_0_HandlerTest.java @@ -16,9 +16,9 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve.xml; +package org.owasp.dependencycheck.data.nvdcve; -import org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler; +import org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler; import java.io.File; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdaterIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdaterIntegrationTest.java deleted file mode 100644 index 2f66e43b6..000000000 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdaterIntegrationTest.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is part of dependency-check-core. - * - * Dependency-check-core is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Dependency-check-core is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * dependency-check-core. If not, see http://www.gnu.org/licenses/. - * - * Copyright (c) 2012 Jeremy Long. All Rights Reserved. - */ -package org.owasp.dependencycheck.data.nvdcve.xml; - -import java.io.File; -import java.net.URL; -import org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.owasp.dependencycheck.utils.Settings; - -/** - * - * @author Jeremy Long (jeremy.long@owasp.org) - */ -public class DatabaseUpdaterIntegrationTest { - - public DatabaseUpdaterIntegrationTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - /** - * Test of update method, of class DatabaseUpdater. - * - * @throws Exception - */ - @Test - public void testUpdate() throws Exception { - DatabaseUpdater instance = new DatabaseUpdater(); - instance.update(); - } - - /** - * Test of update method (when in batch mode), of class DatabaseUpdater. - * - * @throws Exception - */ - @Test - public void testBatchUpdate() throws Exception { - File file = new File("target/test-classes/nvdcve-2.0-2012.xml"); - String path = "file:///" + file.getCanonicalPath(); - Settings.setString(Settings.KEYS.BATCH_UPDATE_URL, path); - DatabaseUpdater instance = new DatabaseUpdater(); - instance.update(); - } -} diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdaterTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdaterTest.java deleted file mode 100644 index ab0ab2e3b..000000000 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdaterTest.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * This file is part of dependency-check-core. - * - * Dependency-check-core is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Dependency-check-core is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * dependency-check-core. If not, see http://www.gnu.org/licenses/. - * - * Copyright (c) 2012 Jeremy Long. All Rights Reserved. - */ -package org.owasp.dependencycheck.data.nvdcve.xml; - -import org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater; -import java.io.File; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.owasp.dependencycheck.utils.Settings; - -/** - * - * @author Jeremy Long (jeremy.long@owasp.org) - */ -public class DatabaseUpdaterTest { - - public DatabaseUpdaterTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - private String old12; - private String old20; - - @Before - public void setUp() throws Exception { - old12 = Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL); - old20 = Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL); - - File file = new File("target/test-classes/nvdcve-2012.xml"); - String path = "file:///" + file.getCanonicalPath(); - Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, path); - - file = new File("target/test-classes/nvdcve-2.0-2012.xml"); - path = "file:///" + file.getCanonicalPath(); - Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, path); - - file = new File("target/test-classes/data.zip"); - path = "file:///" + file.getCanonicalPath(); - Settings.setString(Settings.KEYS.BATCH_UPDATE_URL, path); - } - - @After - public void tearDown() { - Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, old12); - Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, old20); - Settings.setString(Settings.KEYS.BATCH_UPDATE_URL, ""); - } - - /** - * Test of update method (when in batch mode), of class DatabaseUpdater. - * - * @throws Exception - */ - @Test - public void testBatchUpdate() throws Exception { - DatabaseUpdater instance = new DatabaseUpdater(); - instance.deleteExistingData(); - instance.update(); - } -}