Skip to content

IMAPMockFolder should return null for unknown UID #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
golovnin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

IMAPMockFolder should return null for unknown UID #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions src/main/java/de/saly/javamail/mock2/IMAPMockFolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
**********************************************************************************************************************/
package de.saly.javamail.mock2;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Semaphore;
import com.sun.mail.iap.ProtocolException;
import com.sun.mail.iap.Response;
import com.sun.mail.imap.AppendUID;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.ResyncData;
import com.sun.mail.imap.SortTerm;
import de.saly.javamail.mock2.MailboxFolder.MailboxEventListener;

import javax.mail.FetchProfile;
import javax.mail.Flags;
Expand All @@ -46,15 +48,11 @@
import javax.mail.event.MessageChangedEvent;
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;

import com.sun.mail.iap.ProtocolException;
import com.sun.mail.iap.Response;
import com.sun.mail.imap.AppendUID;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.ResyncData;
import com.sun.mail.imap.SortTerm;

import de.saly.javamail.mock2.MailboxFolder.MailboxEventListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Semaphore;

public class IMAPMockFolder extends IMAPFolder implements MailboxEventListener {

Expand Down Expand Up @@ -396,7 +394,8 @@ public synchronized Message getMessageByUID(final long uid) throws MessagingExce
abortIdle();
checkExists();
checkOpened();
return new MockMessage(mailboxFolder.getById(uid), this);
Message message = mailboxFolder.getById(uid);
return message != null ? new MockMessage(message, this) : null;
}

@Override
Expand Down
33 changes: 20 additions & 13 deletions src/test/java/de/saly/javamail/mock2/test/IMAPTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,14 @@
**********************************************************************************************************************/
package de.saly.javamail.mock2.test;

import java.util.Arrays;
import java.util.Properties;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
import de.saly.javamail.mock2.MailboxFolder;
import de.saly.javamail.mock2.MockMailbox;
import de.saly.javamail.mock2.Providers;
import de.saly.javamail.mock2.test.support.MockTestException;
import org.junit.Assert;
import org.junit.Test;

import javax.mail.Flags.Flag;
import javax.mail.Folder;
Expand All @@ -40,17 +46,8 @@
import javax.mail.event.MessageCountListener;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;

import org.junit.Assert;
import org.junit.Test;

import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;

import de.saly.javamail.mock2.MailboxFolder;
import de.saly.javamail.mock2.MockMailbox;
import de.saly.javamail.mock2.Providers;
import de.saly.javamail.mock2.test.support.MockTestException;
import java.util.Arrays;
import java.util.Properties;

public class IMAPTestCase extends AbstractTestCase {

Expand Down Expand Up @@ -462,4 +459,14 @@ public void testRenameWithSubfolder() throws Exception {
Assert.assertEquals(2, root.list().length);
}

@Test
public void testGetMessageByUnknownUID() throws Exception {
final Store store = session.getStore("mock_imap");
store.connect("[email protected]", null);
final Folder inbox = store.getFolder("INBOX");
inbox.open(Folder.READ_WRITE);
final IMAPFolder imapInbox = (IMAPFolder) inbox;
Assert.assertNull(imapInbox.getMessageByUID(666));
}

}