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

Commit 65f2539e authored by Vincent Breitmoser's avatar Vincent Breitmoser
Browse files

move MessageViewInfoExtractorTest to unit tests 

(Yes, I made sure these still run successfully!)
parent 8b1c13d6

k9mail/src/main/java/com/fsck/k9/Globals.java

+3 −1
Original line number Diff line number Diff line
@@ -2,12 +2,14 @@ package com.fsck.k9; 




import android.content.Context;

import android.support.annotation.VisibleForTesting;





public class Globals {

    private static Context context;



    static void setContext(Context context) {

    @VisibleForTesting

    public static void setContext(Context context) {

        Globals.context = context;

    }

k9mail/src/androidTest/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java→k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java

+18 −12
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@ import java.util.List; 
import java.util.Locale;

import java.util.TimeZone;



import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;



import com.fsck.k9.Globals;

import com.fsck.k9.activity.K9ActivityCommon;

import com.fsck.k9.mail.Address;

import com.fsck.k9.mail.Message.RecipientType;
@@ -23,16 +21,27 @@ import com.fsck.k9.mail.internet.MimeMultipart; 
import com.fsck.k9.mail.internet.TextBody;

import com.fsck.k9.mail.internet.Viewable;

import com.fsck.k9.mailstore.MessageViewInfoExtractor.ViewableExtractedText;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricGradleTestRunner;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import static com.fsck.k9.mailstore.MessageViewInfoExtractor.extractTextFromViewables;

import static junit.framework.Assert.assertEquals;





@RunWith(AndroidJUnit4.class)

@RunWith(RobolectricTestRunner.class)

@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21)

public class MessageViewInfoExtractorTest {



    @Before

    public void setUp() throws Exception {

        Globals.setContext(RuntimeEnvironment.application);

    }



    @Test

    public void testSimplePlainTextMessage() throws MessagingException {

        String bodyText = "K-9 Mail rocks :>";
@@ -48,8 +57,7 @@ public class MessageViewInfoExtractorTest { 
        List<Part> outputNonViewableParts = new ArrayList<Part>();

        ArrayList<Viewable> outputViewableParts = new ArrayList<>();

        MessageExtractor.findViewablesAndAttachments(message, outputViewableParts, outputNonViewableParts);

        ViewableExtractedText container = extractTextFromViewables(InstrumentationRegistry.getTargetContext(),

                outputViewableParts);

        ViewableExtractedText container = extractTextFromViewables(RuntimeEnvironment.application, outputViewableParts);



        String expectedText = bodyText;

        String expectedHtml =
@@ -77,8 +85,7 @@ public class MessageViewInfoExtractorTest { 
        List<Part> attachments = new ArrayList<Part>();

        ArrayList<Viewable> outputViewableParts = new ArrayList<>();

        MessageExtractor.findViewablesAndAttachments(message, outputViewableParts, attachments);

        ViewableExtractedText container = extractTextFromViewables(InstrumentationRegistry.getTargetContext(),

                outputViewableParts);

        ViewableExtractedText container = extractTextFromViewables(RuntimeEnvironment.application, outputViewableParts);



        String expectedText = "K-9 Mail rocks :>";

        String expectedHtml =
@@ -112,8 +119,7 @@ public class MessageViewInfoExtractorTest { 
        List<Part> outputNonViewableParts = new ArrayList<Part>();

        ArrayList<Viewable> outputViewableParts = new ArrayList<>();

        MessageExtractor.findViewablesAndAttachments(message, outputViewableParts, outputNonViewableParts);

        ViewableExtractedText container = extractTextFromViewables(InstrumentationRegistry.getTargetContext(),

                outputViewableParts);

        ViewableExtractedText container = extractTextFromViewables(RuntimeEnvironment.application, outputViewableParts);



        String expectedText =

                bodyText1 + "\r\n\r\n" +
@@ -136,7 +142,7 @@ public class MessageViewInfoExtractorTest { 


    @Test

    public void testTextPlusRfc822Message() throws MessagingException {

        K9ActivityCommon.setLanguage(InstrumentationRegistry.getTargetContext(), "en");

        K9ActivityCommon.setLanguage(RuntimeEnvironment.application, "en");

        Locale.setDefault(Locale.US);

        TimeZone.setDefault(TimeZone.getTimeZone("GMT+01:00"));
@@ -173,7 +179,7 @@ public class MessageViewInfoExtractorTest { 
        List<Part> outputNonViewableParts = new ArrayList<Part>();

        ArrayList<Viewable> outputViewableParts = new ArrayList<>();

        MessageExtractor.findViewablesAndAttachments(message, outputViewableParts, outputNonViewableParts);

        ViewableExtractedText container = extractTextFromViewables(InstrumentationRegistry.getTargetContext(),

        ViewableExtractedText container = extractTextFromViewables(RuntimeEnvironment.application,

                outputViewableParts);



        String expectedText =