diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-28 15:10:47 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-28 15:10:47 +0200 |
commit | 9bf664ba9a153a404f03c39d5ba0f99eb32c4419 (patch) | |
tree | 1eeda1293a2d453c9acd11deb736be4e53e58975 /container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java | |
parent | 147fa8c912c8748a9b4eb25c67420841363f3be0 (diff) |
Convert container-core to junit5
Diffstat (limited to 'container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java b/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java index e7f12d3f228..4383bd08f71 100644 --- a/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java +++ b/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java @@ -7,10 +7,12 @@ import com.yahoo.config.FileReference; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.container.di.ContainerTest.ComponentTakingConfig; import com.yahoo.container.di.componentgraph.core.ComponentGraph; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.io.TempDir; import org.osgi.framework.Bundle; +import java.io.File; import java.util.Collection; import java.util.Set; @@ -26,17 +28,20 @@ public class ContainerTestBase { private ComponentGraph componentGraph; protected DirConfigSource dirConfigSource = null; - @Before + @TempDir + File tmpDir; + + @BeforeEach public void setup() { - dirConfigSource = new DirConfigSource("ContainerTest-"); + dirConfigSource = new DirConfigSource(tmpDir, "ContainerTest-"); } - @After + @AfterEach public void cleanup() { dirConfigSource.cleanup(); } - @Before + @BeforeEach public void createGraph() { componentGraph = new ComponentGraph(0); } |