From d24dac26ea1bfe11f52d778d3703e3f8687a1a66 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Tue, 25 Jul 2017 13:07:16 -0400 Subject: [PATCH] updated setup/teardown so that the settings are properly set --- .../org/owasp/dependencycheck/EngineModeIT.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java index dcc18c56d..7a4d6154f 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java @@ -1,6 +1,7 @@ package org.owasp.dependencycheck; import org.junit.Before; +import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -31,9 +32,20 @@ public class EngineModeIT extends BaseTest { @Rule public TestName testName = new TestName(); + private String originalDataDir = null; + @Before public void setUp() throws Exception { - Settings.setString(Settings.KEYS.DATA_DIRECTORY, tempDir.newFolder().getAbsolutePath()); + // Have to use System properties as the Settings object pulls from the + // system properties before configured properties + originalDataDir = Settings.getString(Settings.KEYS.DATA_DIRECTORY); + System.setProperty(Settings.KEYS.DATA_DIRECTORY, tempDir.newFolder().getAbsolutePath()); + } + + @After + public void tearDown() { + //Reset system property to original value just to be safe for other tests. + System.setProperty(Settings.KEYS.DATA_DIRECTORY, originalDataDir); } @Test