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 3fb52a5 Fix tests since Apache site switch from HTTP to HTTPS. 3fb52a5 is described below commit 3fb52a5bdc634c8fb852579d594d47e400e2d190 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sat Mar 12 08:01:08 2022 -0500 Fix tests since Apache site switch from HTTP to HTTPS. Also, fix a typo. --- .../apache/commons/mail/resolver/AbstractDataSourceResolverTest.java | 2 +- .../apache/commons/mail/resolver/DataSourceCompositeResolverTest.java | 4 ++-- .../org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java b/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java index fc4caf9..59f0103 100644 --- a/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java +++ b/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java @@ -29,7 +29,7 @@ public abstract class AbstractDataSourceResolverTest { protected byte[] toByteArray(final DataSource dataSource) throws IOException { - if(dataSource != null) + if (dataSource != null) { try (InputStream is = dataSource.getInputStream()) { return IOUtils.toByteArray(is); 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 df7644f..6c47ab0 100644 --- a/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java +++ b/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java @@ -39,8 +39,8 @@ public class DataSourceCompositeResolverTest extends AbstractDataSourceResolverT @Before public void setUp() throws Exception { - final DataSourceUrlResolver urlResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false); - final DataSourceUrlResolver urlResolverMissing = new DataSourceUrlResolver(new URL("http://does.not.exist"), false); + final DataSourceUrlResolver urlResolver = new DataSourceUrlResolver(new URL("https://www.apache.org"), false); + final DataSourceUrlResolver urlResolverMissing = new DataSourceUrlResolver(new URL("https://does.not.exist"), false); final DataSourceClassPathResolver classPathResolver = new DataSourceClassPathResolver("/images", false); dataSourceResolvers = new DataSourceResolver[] { urlResolver, classPathResolver }; dataSourceResolversMissing = new DataSourceResolver[] { urlResolverMissing }; diff --git a/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java b/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java index 5355412..873305b 100644 --- a/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java +++ b/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java @@ -57,8 +57,8 @@ public class DataSourceUrlResolverTest extends AbstractDataSourceResolverTest @Test public void testResolvingHttpLenient() throws Exception { - final DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), true); - assertTrue(toByteArray(dataSourceResolver.resolve("http://www.apache.org/images/feather-small.gif")).length > 1); + final DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new URL("https://www.apache.org"), true); + assertTrue(toByteArray(dataSourceResolver.resolve("https://www.apache.org/images/feather-small.gif")).length > 1); assertTrue(toByteArray(dataSourceResolver.resolve("images/feather-small.gif")).length > 1); assertTrue(toByteArray(dataSourceResolver.resolve("./images/feather-small.gif")).length > 1); assertTrue(toByteArray(dataSourceResolver.resolve("/images/feather-small.gif")).length > 1);