You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sa...@apache.org on 2014/11/27 21:11:40 UTC
svn commit: r1642227 - in
/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test:
java/org/apache/geronimo/javamail/issues/
java/org/apache/geronimo/javamail/testserver/ resources/
Author: salyh
Date: Thu Nov 27 20:11:40 2014
New Revision: 1642227
URL: http://svn.apache.org/r1642227
Log:
Again some fixes for testcases
Removed:
geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/resources/encoded_filename_ÄÜÖ(test).pdf
Modified:
geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/issues/IssuesTest.java
geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/testserver/MailServer.java
Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/issues/IssuesTest.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/issues/IssuesTest.java?rev=1642227&r1=1642226&r2=1642227&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/issues/IssuesTest.java (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/issues/IssuesTest.java Thu Nov 27 20:11:40 2014
@@ -73,11 +73,29 @@ public class IssuesTest extends Abstract
}
}
-
+
public void testGERONIMO4594() throws Exception {
+ Assert.assertTrue(doGERONIMO4594(true, true));
+ }
+
+ public void testGERONIMO4594Fail0() throws Exception {
+ Assert.assertFalse(doGERONIMO4594(false, true));
+ }
+
+ public void testGERONIMO4594Fail1() throws Exception {
+ Assert.assertFalse(doGERONIMO4594(false, false));
+ }
+
+ public void testGERONIMO4594Fail2() throws Exception {
+ Assert.assertFalse(doGERONIMO4594(true, false));
+ }
+
+ private boolean doGERONIMO4594(boolean decode, boolean encode) throws Exception {
- System.setProperty("mail.mime.decodefilename", "true");
- System.setProperty("mail.mime.encodefilename", "true");
+ final String specialFileName = "encoded_filename_\u00C4\u00DC\u00D6\u0226(test).pdf";
+
+ System.setProperty("mail.mime.decodefilename", String.valueOf(decode));
+ System.setProperty("mail.mime.encodefilename", String.valueOf(encode));
try {
start();
@@ -99,11 +117,11 @@ public class IssuesTest extends Abstract
MimeBodyPart messageBodyPart = new MimeBodyPart();
Multipart multipart = new MimeMultipart();
messageBodyPart.setText("This is message body");
- File file = MailServer.getAbsoluteFilePathFromClassPath("encoded_filename_ÃÃÃ(test).pdf");
+ File file = MailServer.getAbsoluteFilePathFromClassPath("pdf-test.pdf");
Assert.assertTrue(file.exists());
DataSource source = new FileDataSource(file.getAbsoluteFile());
messageBodyPart.setDataHandler(new DataHandler(source));
- messageBodyPart.setFileName(file.getName());
+ messageBodyPart.setFileName(specialFileName);
multipart.addBodyPart(messageBodyPart);
msg.setContent(multipart);
sendMessage(msg);
@@ -117,9 +135,10 @@ public class IssuesTest extends Abstract
Assert.assertEquals(1, f.getMessageCount());
Message[] messages = new Message[2];
messages[0] = f.getMessage(1);
- Assert.assertEquals("encoded_filename_ÃÃÃ(test).pdf", ((Multipart) messages[0].getContent()).getBodyPart(0).getFileName());
+ boolean match = specialFileName.equals(((Multipart) messages[0].getContent()).getBodyPart(0).getFileName());
f.close(false);
store.close();
+ return match;
} finally {
System.setProperty("mail.mime.decodefilename", "false");
Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/testserver/MailServer.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/testserver/MailServer.java?rev=1642227&r1=1642226&r2=1642227&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/testserver/MailServer.java (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/testserver/MailServer.java Thu Nov 27 20:11:40 2014
@@ -97,6 +97,7 @@ public class MailServer {
private MailQueueFactory queueFactory;
private MailQueue queue;
private final Semaphore sem = new Semaphore(0);
+ private final Logger log = LoggerFactory.getLogger("Mock");
public void ensureMsgCount(final int count) throws InterruptedException {
sem.acquire(count);
@@ -174,8 +175,6 @@ public class MailServer {
pop3Server.setFileSystem(fileSystem);
smtpServer.setFileSystem(fileSystem);
- final Logger log = LoggerFactory.getLogger("Mock");
-
imapServer.setLog(log);
pop3Server.setLog(log);
smtpServer.setLog(log);
@@ -327,6 +326,7 @@ public class MailServer {
protocolHandlerChain.put("org.apache.james.smtpserver.protocol.DNSService", dnsService);
final FileMailQueueFactory ff = new FileMailQueueFactory();// MockMailQueueFactory();
+ ff.setLog(log);
ff.setFileSystem(fileSystem);
queueFactory = ff;