Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14b1c0c4 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #2142 from k9mail/cleanup

Clean up some of the top Checkstyle offenders
parents a357963d 2f14e6fc
Loading
Loading
Loading
Loading
+89 −107
Original line number Diff line number Diff line
package com.fsck.k9.provider;


import java.util.Arrays;
import java.util.Collections;
import java.util.GregorianCalendar;

import android.database.Cursor;
import android.database.SQLException;
import android.net.Uri;
@@ -12,14 +17,10 @@ import com.fsck.k9.Preferences;
import com.fsck.k9.mail.Message;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.internet.MimeMessage;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Arrays;
import java.util.Collections;
import java.util.GregorianCalendar;

@RunWith(AndroidJUnit4.class)
public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
@@ -28,6 +29,7 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
    private MimeMessage reply;
    private MimeMessage replyAtSameTime;


    public EmailProviderTest() {
        super(EmailProvider.class, EmailProvider.AUTHORITY);
    }
@@ -53,7 +55,6 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
        replyAtSameTime.setSentDate(new GregorianCalendar(2016, 1, 2).getTime(), false);
        replyAtSameTime.setMessageId("<uid002@email.com>");
        replyAtSameTime.setInReplyTo("<uid001@email.com>");

    }

    @Before
@@ -66,14 +67,16 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {

    @Test
    public void onCreate_shouldReturnTrue() {
        assertNotNull(this.getProvider());
        boolean returnValue = this.getProvider().onCreate();
        assertNotNull(getProvider());

        boolean returnValue = getProvider().onCreate();

        assertEquals(true, returnValue);
    }

    @Test(expected = IllegalArgumentException.class)
    public void query_withInvalidURI_throwsIllegalArgumentException() {
        this.getProvider().query(
        getProvider().query(
                Uri.parse("content://com.google.www"),
                new String[] {},
                "",
@@ -83,12 +86,13 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {

    @Test(expected = IllegalArgumentException.class)
    public void query_forMessagesWithInvalidAccount_throwsIllegalArgumentException() {
        Cursor cursor = this.getProvider().query(
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/1/messages"),
                new String[] {},
                "",
                new String[] {},
                "");

        assertNotNull(cursor);
    }

@@ -97,13 +101,13 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();

        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() + "/messages"),
                new String[] {},
                "",
                new String[] {},
                "");

        assertNotNull(cursor);
        assertTrue(cursor.isAfterLast());
    }
@@ -113,9 +117,8 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();

        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() + "/messages"),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -124,6 +127,7 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
                "",
                new String[] {},
                "");

        assertNotNull(cursor);
        assertTrue(cursor.isAfterLast());
    }
@@ -133,9 +137,8 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();

        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() + "/messages"),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -145,22 +148,19 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
                "",
                new String[] {},
                EmailProvider.MessageColumns.DATE);

        assertNotNull(cursor);
        assertFalse(cursor.moveToFirst());
    }

    @Test
    public void query_forMessagesWithAccountAndRequiredFieldsAndOrderBy_providesResult()
            throws MessagingException {
    public void query_forMessagesWithAccountAndRequiredFieldsAndOrderBy_providesResult() throws MessagingException {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();
        account.getLocalStore().getFolder("Inbox").appendMessages(Collections.singletonList(message));

        account.getLocalStore().getFolder("Inbox")
                .appendMessages(Collections.singletonList(message));

        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() + "/messages"),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -169,23 +169,20 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
                "",
                new String[] {},
                EmailProvider.MessageColumns.DATE);

        assertNotNull(cursor);
        assertTrue(cursor.moveToFirst());
        assertEquals(message.getSubject(), cursor.getString(3));
    }

    @Test
    public void query_forMessagesWithAccountAndRequiredFieldsAndOrderBy_sortsCorrectly()
            throws MessagingException {
    public void query_forMessagesWithAccountAndRequiredFieldsAndOrderBy_sortsCorrectly() throws MessagingException {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();
        account.getLocalStore().getFolder("Inbox").appendMessages(Arrays.asList(message, laterMessage));

        account.getLocalStore().getFolder("Inbox")
                .appendMessages(Arrays.asList(message, laterMessage));

        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() + "/messages"),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -195,6 +192,7 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
                "",
                new String[] {},
                EmailProvider.MessageColumns.DATE + " DESC");

        assertNotNull(cursor);
        assertTrue(cursor.moveToFirst());
        assertEquals(laterMessage.getSubject(), cursor.getString(3));
@@ -203,17 +201,14 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
    }

    @Test
    public void query_forThreadedMessages_sortsCorrectly()
            throws MessagingException {
    public void query_forThreadedMessages_sortsCorrectly() throws MessagingException {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();
        account.getLocalStore().getFolder("Inbox").appendMessages(Arrays.asList(message, laterMessage));

        account.getLocalStore().getFolder("Inbox")
                .appendMessages(Arrays.asList(message, laterMessage));

        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages/threaded"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() +
                        "/messages/threaded"),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -232,20 +227,15 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
    }

    @Test
    public void query_forThreadedMessages_showsThreadOfEmailOnce()
            throws MessagingException {
    public void query_forThreadedMessages_showsThreadOfEmailOnce() throws MessagingException {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();
        account.getLocalStore().getFolder("Inbox").appendMessages(Collections.singletonList(message));
        account.getLocalStore().getFolder("Inbox").appendMessages(Collections.singletonList(reply));

        account.getLocalStore().getFolder("Inbox")
                .appendMessages(Collections.singletonList(message));

        account.getLocalStore().getFolder("Inbox")
                .appendMessages(Collections.singletonList(reply));

        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages/threaded"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() +
                        "/messages/threaded"),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -257,6 +247,7 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
                "",
                new String[] {},
                EmailProvider.MessageColumns.DATE + " DESC");

        assertNotNull(cursor);
        assertTrue(cursor.moveToFirst());
        assertEquals(2, cursor.getInt(5));
@@ -264,20 +255,15 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
    }

    @Test
    public void query_forThreadedMessages_showsThreadOfEmailWithSameSendTimeOnce()
            throws MessagingException {
    public void query_forThreadedMessages_showsThreadOfEmailWithSameSendTimeOnce() throws MessagingException {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();
        account.getLocalStore().getFolder("Inbox").appendMessages(Collections.singletonList(message));
        account.getLocalStore().getFolder("Inbox").appendMessages(Collections.singletonList(replyAtSameTime));

        account.getLocalStore().getFolder("Inbox")
                .appendMessages(Collections.singletonList(message));

        account.getLocalStore().getFolder("Inbox")
                .appendMessages(Collections.singletonList(replyAtSameTime));

        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages/threaded"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() +
                        "/messages/threaded"),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -289,6 +275,7 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
                "",
                new String[] {},
                EmailProvider.MessageColumns.DATE + " DESC");
        
        assertNotNull(cursor);
        assertTrue(cursor.moveToFirst());
        assertEquals(2, cursor.getInt(5));
@@ -296,22 +283,17 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
    }

    @Test
    public void query_forAThreadOfMessages_returnsMessage()
            throws MessagingException {
    public void query_forAThreadOfMessages_returnsMessage() throws MessagingException {
        Account account = Preferences.getPreferences(getContext()).newAccount();
        account.getUuid();

        Message message = new MimeMessage();
        message.setSubject("Test Subject");
        message.setSentDate(new GregorianCalendar(2016, 1, 2).getTime(), false);

        account.getLocalStore().getFolder("Inbox")
                .appendMessages(Collections.singletonList(message));
        account.getLocalStore().getFolder("Inbox").appendMessages(Collections.singletonList(message));

        //Now get the thread id we just put in.
        Cursor cursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/messages"),
        Cursor cursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() + "/messages"),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -326,10 +308,9 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
        String threadId = cursor.getString(2);

        //Now check the message is listed under that thread

        Cursor threadCursor = this.getProvider().query(
                Uri.parse("content://"+EmailProvider.AUTHORITY
                        +"/account/"+account.getUuid()+"/thread/"+threadId),
        Cursor threadCursor = getProvider().query(
                Uri.parse("content://" + EmailProvider.AUTHORITY + "/account/" + account.getUuid() +
                        "/thread/" + threadId),
                new String[] {
                        EmailProvider.MessageColumns.ID,
                        EmailProvider.MessageColumns.FOLDER_ID,
@@ -340,6 +321,7 @@ public class EmailProviderTest extends ProviderTestCase2<EmailProvider> {
                "",
                new String[] {},
                EmailProvider.MessageColumns.DATE);

        assertNotNull(threadCursor);
        assertTrue(threadCursor.moveToFirst());
        assertEquals(message.getSubject(), threadCursor.getString(3));
+116 −144

File changed.

Preview size limit exceeded, changes collapsed.

+363 −433

File changed.

Preview size limit exceeded, changes collapsed.