From 6cd4bf337ee87f2777c2da155dfda23e176c987f Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Wed, 16 Apr 2014 08:02:50 -0400 Subject: [PATCH] updated to support the new Settings implementation Former-commit-id: a530f8ae502e47345f36c1e563c001797b223280 --- .../data/cpe/AbstractDatabaseTestCase.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.java index 45f47c8b3..af863a03a 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.java @@ -17,11 +17,8 @@ */ package org.owasp.dependencycheck.data.cpe; -import junit.framework.TestCase; -import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; +import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase; /** @@ -30,26 +27,11 @@ import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase; * * @author Jeremy Long */ -public abstract class AbstractDatabaseTestCase extends TestCase { - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } +public abstract class AbstractDatabaseTestCase extends BaseTest { @Before - @Override public void setUp() throws Exception { BaseDBTestCase.ensureDBExists(); - super.setUp(); } - @After - @Override - public void tearDown() throws Exception { - super.tearDown(); - } }