This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push: new cdc70218 Assert replace (#571) cdc70218 is described below commit cdc7021809f1f081b46cacdd80b5408b2650a58e Author: Sebb <sebb...@users.noreply.github.com> AuthorDate: Mon Jul 29 23:38:12 2024 +0100 Assert replace (#571) * Replace assert with JUnit5 Assertions * Don't allow jobs to go on too long --- .github/workflows/maven.yml | 1 + .../org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java | 4 ++-- .../org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java | 2 +- .../org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0b8e4833..8b417ac2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,6 +24,7 @@ jobs: build: runs-on: ${{ matrix.os }} + timeout-minutes: 20 # jobs generally take 10 mins continue-on-error: ${{ matrix.experimental }} strategy: matrix: diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java index 150ea48b..1c137f6e 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java @@ -137,8 +137,8 @@ public class HttpProviderTestCase extends AbstractProviderTestConfig { public void ignoreTestHttp405() throws FileSystemException { try (FileObject fileObject = VFS.getManager() .resolveFile("http://www.w3schools.com/webservices/tempconvert.asmx?action=WSDL")) { - assert fileObject.getContent().getSize() > 0; - assert !fileObject.getContent().isEmpty(); + Assertions.assertTrue(fileObject.getContent().getSize() > 0, "Content size should be > 0"); + Assertions.assertFalse(fileObject.getContent().isEmpty(), "Content should not be empty"); } } diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java index 938e5612..7747616e 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java @@ -139,7 +139,7 @@ public class Http4ProviderTestCase extends AbstractProviderTestConfig { @SuppressWarnings("resource") // getManager() returns a global. final FileObject fileObject = VFS.getManager() .resolveFile("http4://www.w3schools.com/webservices/tempconvert.asmx?action=WSDL"); - assert !fileObject.getContent().isEmpty(); + Assertions.assertFalse(fileObject.getContent().isEmpty(), "Content should not be empty"); } /** diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java index 957a6d7a..c0f816bf 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java @@ -137,7 +137,7 @@ public class Http5ProviderTestCase extends AbstractProviderTestConfig { public void ignoreTestHttp405() throws FileSystemException { final FileObject fileObject = VFS.getManager() .resolveFile("http5://www.w3schools.com/webservices/tempconvert.asmx?action=WSDL"); - assert !fileObject.getContent().isEmpty(); + Assertions.assertFalse(fileObject.getContent().isEmpty(), "Content should not be empty"); } /**