github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-04-29 19:58:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflicts

Browse Source 
Former-commit-id: d0ce45a374336184101179b73b6019fb1240b9b3
This commit is contained in:
Jeremy Long
2013-09-02 15:42:24 -04:00
parent f166ef9313 119804794f
commit fc52462df4
58 changed files with 2872 additions and 1563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dependency-check-ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java
View File

@@ -26,6 +26,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.tools.ant.BuildFileTest;
import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase;
/**
*
@@ -47,9 +48,7 @@ public class DependencyCheckTaskTest extends BuildFileTest {
@Before
@Override
public void setUp() throws Exception {
org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase.ensureDBExists(DependencyCheckTaskTest.class);
org.owasp.dependencycheck.data.cpe.BaseIndexTestCase.ensureIndexExists(this.getClass());
BaseDBTestCase.ensureDBExists();
final String buildFile = this.getClass().getClassLoader().getResource("build.xml").getPath();
configureProject(buildFile);
}