Author: lhein
Date: Wed Apr 9 23:19:28 2008
New Revision: 646663
URL: http://svn.apache.org/viewvc?rev=646663&view=rev
Log:
fixed jira SM-1311
the check for the name of the datahandler was not needed as we check for the
attachment name just the line above. The name of the handler is not relevant in
any way.
Modified:
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-mail/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java
Modified:
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-mail/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-mail/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java?rev=646663&r1=646662&r2=646663&view=diff
==============================================================================
---
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-mail/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java
(original)
+++
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-mail/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java
Wed Apr 9 23:19:28 2008
@@ -522,7 +522,6 @@
assertNotNull("No attachment part found!",
((MimeMultipart)mail.getContent()).getBodyPart(1));
BodyPart att = ((MimeMultipart)mail.getContent()).getBodyPart(1);
assertEquals("Attachment file name is invalid!", FILE,
att.getFileName());
- assertEquals("DataHandler name is invalid!", FILE,
att.getDataHandler().getName());
if (att.getDataHandler().getInputStream().available() != new
File(PATH, FILE).length()) {
fail("Attachment size wrong. Expected: " + new File(PATH,
FILE).length() + " Found: "
+ att.getDataHandler().getInputStream().available());
@@ -573,7 +572,6 @@
assertNotNull("No attachment part found!",
((MimeMultipart)mail.getContent()).getBodyPart(1));
BodyPart att = ((MimeMultipart)mail.getContent()).getBodyPart(1);
assertEquals("Attachment file name is invalid!", FILE,
att.getFileName());
- assertEquals("DataHandler name is invalid!", FILE,
att.getDataHandler().getName());
if (att.getDataHandler().getInputStream().available() != new
File(PATH, FILE).length()) {
fail("Attachment size wrong. Expected: " + new File(PATH,
FILE).length() + " Found: "
+ att.getDataHandler().getInputStream().available());
@@ -627,7 +625,6 @@
assertNotNull("No attachment part found!",
((MimeMultipart)mail.getContent()).getBodyPart(2));
BodyPart att = ((MimeMultipart)mail.getContent()).getBodyPart(2);
assertEquals("Attachment file name is invalid!", FILE,
att.getFileName());
- assertEquals("DataHandler name is invalid!", FILE,
att.getDataHandler().getName());
if (att.getDataHandler().getInputStream().available() != new
File(PATH, FILE).length()) {
fail("Attachment size wrong. Expected: " + new File(PATH,
FILE).length() + " Found: "
+ att.getDataHandler().getInputStream().available());
@@ -678,7 +675,6 @@
assertNotNull("No attachment part found!",
((MimeMultipart)mail.getContent()).getBodyPart(1));
BodyPart att = ((MimeMultipart)mail.getContent()).getBodyPart(1);
assertEquals("Attachment file name is invalid!", FILE,
att.getFileName());
- assertEquals("DataHandler name is invalid!", FILE,
att.getDataHandler().getName());
if (att.getDataHandler().getInputStream().available() != new
File(PATH, FILE).length()) {
fail("Attachment size wrong. Expected: " + new File(PATH,
FILE).length() + " Found: "
+ att.getDataHandler().getInputStream().available());
@@ -729,7 +725,6 @@
assertNotNull("No attachment part found!",
((MimeMultipart)mail.getContent()).getBodyPart(1));
BodyPart att = ((MimeMultipart)mail.getContent()).getBodyPart(1);
assertEquals("Attachment file name is invalid!", FILE,
att.getFileName());
- assertEquals("DataHandler name is invalid!", FILE,
att.getDataHandler().getName());
if (att.getDataHandler().getInputStream().available() != new
File(PATH, FILE).length()) {
fail("Attachment size wrong. Expected: " + new File(PATH,
FILE).length() + " Found: "
+ att.getDataHandler().getInputStream().available());
