diff options
3 files changed, 9 insertions, 7 deletions
diff --git a/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/FSTest.java b/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/FSTest.java index ec9e66a..04e95ce 100644 --- a/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/FSTest.java +++ b/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/FSTest.java @@ -22,7 +22,7 @@ public class FSTest @Test public void testIsTestingDirInvalid() { - assertInvalidTestingDir(MavenTestingUtils.getBasedir()); + assertInvalidTestingDir(MavenTestingUtils.getBaseDir()); String tmpdir = System.getProperty("java.io.tmpdir"); assertInvalidTestingDir(new File(tmpdir)); @@ -56,7 +56,7 @@ public class FSTest PathAssert.assertDirExists("pre-delete",testdir); FS.deleteDirectory(testdir); - PathAssert.assertNotExists("post-delete",testdir); + PathAssert.assertNotPathExists("post-delete",testdir); } private void createDummyDirectoryContent(File testdir) throws IOException diff --git a/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/OSTest.java b/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/OSTest.java index 3104dd1..25ed2b5 100644 --- a/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/OSTest.java +++ b/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/OSTest.java @@ -1,6 +1,6 @@ package org.eclipse.jetty.toolchain.test; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/TestingDirTest.java b/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/TestingDirTest.java index 552b0b9..b49f424 100644 --- a/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/TestingDirTest.java +++ b/jetty-test-helper/src/test/java/org/eclipse/jetty/toolchain/test/TestingDirTest.java @@ -1,7 +1,9 @@ package org.eclipse.jetty.toolchain.test; import static org.hamcrest.CoreMatchers.*; -import java.io.File; + +import java.io.IOException; +import java.nio.file.Path; import org.junit.Assert; import org.junit.Rule; @@ -13,11 +15,11 @@ public class TestingDirTest public TestingDir testingdir = new TestingDir(); @Test - public void testGetDir() + public void testGetPath() throws IOException { String expected = OS.separators("/target/tests/"); - File dir = testingdir.getDir(); - String fullpath = dir.getAbsolutePath(); + Path dir = testingdir.getPath(); + String fullpath = dir.toString(); Assert.assertThat(fullpath,containsString(expected)); } |