wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove redundant checks and ones that make tests needlessly brittle

Browse source
This commit is contained in:
cketti 2016-05-20 23:52:21 +02:00
parent 7e829bbfb7
commit 56e8fc1d77
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
k9mail/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.java
View file

@ -17,7 +17,6 @@ import com.fsck.k9.view.RecipientSelectView.Recipient;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.internal.verification.VerificationModeFactory;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
@ -26,7 +25,6 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ -44,6 +42,7 @@ public class RecipientPresenterTest {
private Account account; private Account account;
private RecipientMvpView recipientMvpView; private RecipientMvpView recipientMvpView;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
Context context = ShadowApplication.getInstance().getApplicationContext(); Context context = ShadowApplication.getInstance().getApplicationContext();
@ -60,36 +59,24 @@ public class RecipientPresenterTest {
@Test @Test
public void testInitFromReplyToMessage() throws Exception { public void testInitFromReplyToMessage() throws Exception {
Message message = mock(Message.class); Message message = mock(Message.class);
when(replyToParser.getRecipientsToReplyTo(message, account)).thenReturn(TO_ADDRESSES); when(replyToParser.getRecipientsToReplyTo(message, account)).thenReturn(TO_ADDRESSES);
recipientPresenter.initFromReplyToMessage(message, false); recipientPresenter.initFromReplyToMessage(message, false);
verify(replyToParser).getRecipientsToReplyTo(message, account);
verifyNoMoreInteractions(replyToParser);
verify(composePgpInlineDecider).shouldReplyInline(message); verify(composePgpInlineDecider).shouldReplyInline(message);
verifyNoMoreInteractions(composePgpInlineDecider);
verify(recipientMvpView).addRecipients(eq(RecipientType.TO), any(Recipient[].class)); verify(recipientMvpView).addRecipients(eq(RecipientType.TO), any(Recipient[].class));
} }
@Test @Test
public void testInitFromReplyToAllMessage() throws Exception { public void testInitFromReplyToAllMessage() throws Exception {
Message message = mock(Message.class); Message message = mock(Message.class);
when(replyToParser.getRecipientsToReplyTo(message, account)).thenReturn(TO_ADDRESSES); when(replyToParser.getRecipientsToReplyTo(message, account)).thenReturn(TO_ADDRESSES);
ReplyToAddresses replyToAddresses = new ReplyToAddresses(ALL_TO_ADDRESSES, ALL_CC_ADDRESSES); ReplyToAddresses replyToAddresses = new ReplyToAddresses(ALL_TO_ADDRESSES, ALL_CC_ADDRESSES);
when(replyToParser.getRecipientsToReplyAllTo(message, account)).thenReturn(replyToAddresses); when(replyToParser.getRecipientsToReplyAllTo(message, account)).thenReturn(replyToAddresses);
recipientPresenter.initFromReplyToMessage(message, true); recipientPresenter.initFromReplyToMessage(message, true);
verify(replyToParser).getRecipientsToReplyAllTo(message, account);
verifyNoMoreInteractions(replyToParser);
verify(composePgpInlineDecider).shouldReplyInline(message); verify(composePgpInlineDecider).shouldReplyInline(message);
verifyNoMoreInteractions(composePgpInlineDecider);
verify(recipientMvpView).addRecipients(eq(RecipientType.TO), any(Recipient.class)); verify(recipientMvpView).addRecipients(eq(RecipientType.TO), any(Recipient.class));
verify(recipientMvpView).addRecipients(eq(RecipientType.CC), any(Recipient.class)); verify(recipientMvpView).addRecipients(eq(RecipientType.CC), any(Recipient.class));
} }