github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-20 00:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated temporary data directory logic as the previous implementation did not work correctly

Browse Source
This commit is contained in:
Jeremy Long
2017-07-26 09:59:21 -04:00
parent d24dac26ea
commit 8a8d4fb994
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java
View File

@@ -11,6 +11,7 @@ import org.owasp.dependencycheck.dependency.Dependency;
import org.owasp.dependencycheck.utils.Settings; import org.owasp.dependencycheck.utils.Settings;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
@@ -21,6 +22,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is; import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Assume;
import org.owasp.dependencycheck.utils.FileUtils;
/** /**
* @author Mark Rekveld * @author Mark Rekveld
@@ -43,9 +46,12 @@ public class EngineModeIT extends BaseTest {
} }
@After @After
public void tearDown() { public void tearDown() throws IOException {
//delete temp files
FileUtils.delete(Settings.getDataDirectory());
//Reset system property to original value just to be safe for other tests. //Reset system property to original value just to be safe for other tests.
System.setProperty(Settings.KEYS.DATA_DIRECTORY, originalDataDir); System.setProperty(Settings.KEYS.DATA_DIRECTORY, originalDataDir);
} }
@Test @Test
@@ -105,6 +111,7 @@ public class EngineModeIT extends BaseTest {
} }
private void assertDatabase(boolean exists) throws Exception { private void assertDatabase(boolean exists) throws Exception {
Assume.assumeThat(Settings.getString(Settings.KEYS.DB_DRIVER_NAME), is("org.h2.Driver"));
Path directory = Settings.getDataDirectory().toPath(); Path directory = Settings.getDataDirectory().toPath();
assertThat(Files.exists(directory), is(true)); assertThat(Files.exists(directory), is(true));
assertThat(Files.isDirectory(directory), is(true)); assertThat(Files.isDirectory(directory), is(true));