You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/11/27 15:44:49 UTC
[commons-email] branch master updated: JUnit5 assertThrows DataSourceCompositeResolverTest
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-email.git
The following commit(s) were added to refs/heads/master by this push:
new ed3a608 JUnit5 assertThrows DataSourceCompositeResolverTest
new 01c4091 Merge pull request #109 from nhojpatrick/junit5-assertThrows-DataSourceCompositeResolverTest
ed3a608 is described below
commit ed3a6087fa4564cd34aea944a8d6e73d98186734
Author: John Patrick <14...@users.noreply.github.com>
AuthorDate: Thu Oct 20 21:00:35 2022 +0100
JUnit5 assertThrows DataSourceCompositeResolverTest
---
.../commons/mail/resolver/DataSourceCompositeResolverTest.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java b/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
index 6c47ab0..d59cfe1 100644
--- a/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
+++ b/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.commons.mail.resolver;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.Assert.*;
import org.apache.commons.mail.DataSourceResolver;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.function.Executable;
import java.io.IOException;
import java.net.URL;
@@ -58,12 +60,12 @@ public class DataSourceCompositeResolverTest extends AbstractDataSourceResolverT
assertTrue(toByteArray(dataSourceResolver.resolve("/contentTypeTest.gif")).length > 0);
}
- @Test(expected = IOException.class)
- public void testResolvingFilesNonLenient() throws Exception
+ @Test
+ public void testResolvingFilesNonLenient()
{
final DataSourceResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolversMissing, false);
- dataSourceResolver.resolve("./image/does-not-exist.gif");
+ assertThrows(IOException.class, () -> dataSourceResolver.resolve("./image/does-not-exist.gif"));
}
@Test