diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-07-29 15:44:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-29 15:44:31 +0200 |
commit | 372f6d7371d42ef23b543d4349cfeabf25ac400b (patch) | |
tree | 9af9d03b14f4a3cf4747428071574ec668e3f3f7 /configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java | |
parent | 5aa9bb607b7d4262c8ea13d20671f7264c3c59c5 (diff) | |
parent | 4b53d0d135fcacc5964b2720678642f182fd15d1 (diff) |
Merge pull request #23555 from vespa-engine/bjorncs/more-junit5v8.26.15
Bjorncs/more junit5
Diffstat (limited to 'configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java')
-rw-r--r-- | configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java b/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java index 9b3e9c31363..d967e16ba0b 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java @@ -1,26 +1,26 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.codegen; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.File; import java.io.IOException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MakeConfigTest { private File dest; - @Before + @BeforeEach public void setUp() { dest = new File("/tmp/"+System.currentTimeMillis()+File.separator); dest.mkdir(); } - @After + @AfterEach public void tearDown() { recursiveDeleteDir(dest); } @@ -40,9 +40,9 @@ public class MakeConfigTest { // The directory is now empty so delete it return dir.delete(); } - + @Test - public void testProps() throws PropertyException { + void testProps() throws PropertyException { System.setProperty("config.dumpTree", "true"); System.setProperty("config.useFramework", "true"); System.setProperty("config.dest", dest.getAbsolutePath()); @@ -53,7 +53,7 @@ public class MakeConfigTest { assertTrue(p.generateFrameworkCode); assertEquals(p.specFiles.size(), 1); assertEquals(p.specFiles.get(0).getAbsolutePath(), new File("src/test/resources/configgen.allfeatures.def").getAbsolutePath()); - + System.setProperty("config.dumpTree", "false"); System.setProperty("config.useFramework", "false"); System.setProperty("config.dest", dest.getAbsolutePath()); @@ -66,7 +66,7 @@ public class MakeConfigTest { } @Test - public void testMake() throws IOException { + void testMake() throws IOException { System.setProperty("config.dumpTree", "true"); System.setProperty("config.useFramework", "true"); System.setProperty("config.dest", dest.getAbsolutePath()); |