summaryrefslogtreecommitdiffstats
path: root/node-maintainer
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2017-08-18 16:26:34 +0200
committerGitHub <noreply@github.com>2017-08-18 16:26:34 +0200
commit93d6a109c835f4e04ccad48d9ec1f6865e5854d9 (patch)
tree7a7e3db11b991e914ba64cf195f7cb658213b8e2 /node-maintainer
parent0a8ea48cdd0c27b337c05e01c5e1a087f21f5b1a (diff)
parent51e0ccf6bd0277696fa7cbc13626c06a9db6c56c (diff)
Merge pull request #3161 from vespa-engine/bjorncs/fix-filehelpertest
Adapt to junit 4.12 changes
Diffstat (limited to 'node-maintainer')
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/FileHelperTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/FileHelperTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/FileHelperTest.java
index 4bbf57a23f8..4bbfe3e5b25 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/FileHelperTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/FileHelperTest.java
@@ -196,7 +196,7 @@ public class FileHelperTest {
// also older than maxAge inside the sub directory, create some files which are newer than maxAge.
// deleteDirectories() should NOT delete folder3
File subFolder3 = folder.newFolder("test_folder3");
- File subSubFolder3 = folder.newFolder("test_folder3/subSubFolder3");
+ File subSubFolder3 = folder.newFolder("test_folder3", "subSubFolder3");
for (int j=0; j<11; j++) {
File.createTempFile("test_", ".json", subSubFolder3);
@@ -274,7 +274,7 @@ public class FileHelperTest {
private void initSubDirectories() throws IOException {
File subFolder1 = folder.newFolder("test_folder1");
File subFolder2 = folder.newFolder("test_folder2");
- File subSubFolder2 = folder.newFolder("test_folder2/subSubFolder2");
+ File subSubFolder2 = folder.newFolder("test_folder2", "subSubFolder2");
for (int j=0; j<6; j++) {
File temp = File.createTempFile("test_", ".json", subFolder1);