Author: sgoeschl
Date: Sun Feb 19 21:06:17 2012
New Revision: 1291060
URL: http://svn.apache.org/viewvc?rev=1291060&view=rev
Log:
[EMAIL-112] DataSourceFileResolverTest fails under IBM JDK 1.4 and 1.6 running
on Windows
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1291060&r1=1291059&r2=1291060&view=diff
==============================================================================
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Sun Feb 19 21:06:17 2012
@@ -22,7 +22,16 @@
</properties>
<body>
- <release version="1.3" date="2011-12-04">
+ <release version="1.3" date="as in SVN">
+ <action dev="sgoeschl" type="add" issue="EMAIL-112" date="2012-02-19"
due-to="Peter Kofler">
+ DataSourceFileResolverTest fails under IBM JDK 1.4 and 1.6 running
on Windows.
+ </action>
+ <action dev="sgoeschl" type="add" issue="EMAIL-111" date="2012-02-18"
due-to="Florian Pirchner">
+ Update the current trunk to be binary compatible with the
commons-email-1.2 release.
+ </action>
+ <action dev="sgoeschl" type="add" issue="EMAIL-110" date="2012-02-18"
due-to="Thomas Pummer">
+ Added unit test to ensure that parsing the broken mime message does
not cause an OutOfMemoryException.
+ </action>
<action dev="sgoeschl" type="add" issue="EMAIL-108" date="2011-11-10"
due-to="Elisabeth Kasimir, Alexander Kasimir">
HtmlmageEmail should support class path resources
</action>
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java?rev=1291060&r1=1291059&r2=1291060&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
Sun Feb 19 21:06:17 2012
@@ -16,15 +16,16 @@
*/
package org.apache.commons.mail.resolver;
-import junit.framework.TestCase;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.mail.DataSourceResolver;
-
-import javax.activation.DataSource;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
+
+import javax.activation.DataSource;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.mail.DataSourceResolver;
/**
* JUnit test case for DateSourceResolver.
@@ -47,7 +48,7 @@ public class DataSourceFileResolverTest
assertTrue(toByteArray(dataSourceResolver.resolve("images/asf_logo_wide.gif")).length
== IMG_SIZE);
assertTrue(toByteArray(dataSourceResolver.resolve("./images/asf_logo_wide.gif")).length
== IMG_SIZE);
assertTrue(toByteArray(dataSourceResolver.resolve("../test/images/asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertNull(toByteArray(dataSourceResolver.resolve("/images/asf_logo_wide.gif")));
+
assertNull(toByteArray(dataSourceResolver.resolve("/images/does-not-exist.gif")));
assertNull(dataSourceResolver.resolve("./images/does-not-exist.gif"));
}
