Author: bago
Date: Sat Sep 27 08:42:25 2008
New Revision: 699670
URL: http://svn.apache.org/viewvc?rev=699670&view=rev
Log:
Make sure we specify charset when trying to get bytes for an UTF-8 string.
Modified:
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
Modified:
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java?rev=699670&r1=699669&r2=699670&view=diff
==============================================================================
---
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
(original)
+++
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
Sat Sep 27 08:42:25 2008
@@ -265,14 +265,14 @@
mm.addBodyPart(mp);
String body = "\u0023\u00A4\u00E3\u00E0\u00E9";
MimeBodyPart mp2 = new MimeBodyPart(new ByteArrayInputStream(
- ("Content-Transfer-Encoding: 8bit\r\n\r\n" +
body).getBytes()));
+ ("Content-Transfer-Encoding: 8bit\r\nContent-Type:
application/octet-stream; charset=utf-8\r\n\r\n" + body).getBytes("UTF-8")));
mp2.setDisposition("attachment");
mp2
.setFileName("=?iso-8859-15?Q?=E9_++++Pubblicit=E0_=E9_vietata____Milano9052.tmp?=");
mm.addBodyPart(mp2);
String body2 = "\u0014\u00A3\u00E1\u00E2\u00E4";
MimeBodyPart mp3 = new MimeBodyPart(new ByteArrayInputStream(
- ("Content-Transfer-Encoding: 8bit\r\n\r\n" +
body2).getBytes()));
+ ("Content-Transfer-Encoding: 8bit\r\nContent-Type:
application/octet-stream; charset=utf-8\r\n\r\n" + body2).getBytes("UTF-8")));
mp3.setDisposition("attachment");
mp3.setFileName("temp.zip");
mm.addBodyPart(mp3);
@@ -295,6 +295,8 @@
onlyText.service(mail);
assertFalse(mail.getMessage().getContent() instanceof MimeMultipart);
+
+ assertEquals("simple text", mail.getMessage().getContent());
// prova per caricare il mime message da input stream che altrimenti
// javamail si comporta differentemente.
@@ -302,18 +304,24 @@
MimeMessage mmNew = new MimeMessage(Session
.getDefaultInstance(new Properties()),
- new ByteArrayInputStream(mimeSource.getBytes()));
+ new ByteArrayInputStream(mimeSource.getBytes("UTF-8")));
mmNew.writeTo(System.out);
-
+ mail.setMessage(mmNew);
+
recover.service(mail);
assertTrue(mail.getMessage().getContent() instanceof MimeMultipart);
assertEquals(2, ((MimeMultipart) mail.getMessage().getContent())
.getCount());
- assertEquals(body2, (((MimeMultipart) mail.getMessage().getContent())
- .getBodyPart(1).getContent()));
+ Object actual = ((MimeMultipart) mail.getMessage().getContent())
+ .getBodyPart(1).getContent();
+ if (actual instanceof ByteArrayInputStream) {
+ assertEquals(body2, toString((ByteArrayInputStream) actual));
+ } else {
+ assertEquals(body2, actual);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
