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

Commit 03189fae authored by cketti's avatar cketti
Browse files

Replace usages of the deprecated `RuntimeEnvironment.application`

parent 46ca47fa

app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ public class AutocryptHeaderParserTest extends RobolectricTest { 


    @Before

    public void setUp() throws Exception {

        BinaryTempFileBody.setTempDirectory(RuntimeEnvironment.application.getCacheDir());

        BinaryTempFileBody.setTempDirectory(RuntimeEnvironment.getApplication().getCacheDir());

    }



    // Test cases taken from: https://github.com/mailencrypt/autocrypt/tree/master/src/tests/data

app/core/src/test/java/com/fsck/k9/cache/EmailProviderCacheTest.java

+7 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ package com.fsck.k9.cache; 
import java.util.Collections;

import java.util.UUID;



import android.content.Context;

import android.net.Uri;



import com.fsck.k9.RobolectricTest;
@@ -26,6 +27,7 @@ import static org.mockito.Mockito.when; 




public class EmailProviderCacheTest extends RobolectricTest {

    private final Context context = RuntimeEnvironment.getApplication();



    private EmailProviderCache cache;

    @Mock
@@ -40,7 +42,7 @@ public class EmailProviderCacheTest extends RobolectricTest { 
        MockitoAnnotations.initMocks(this);

        EmailProvider.CONTENT_URI = Uri.parse("content://test.provider.email");



        cache = EmailProviderCache.getCache(UUID.randomUUID().toString(), RuntimeEnvironment.application);

        cache = EmailProviderCache.getCache(UUID.randomUUID().toString(), context);

        when(mockLocalMessage.getDatabaseId()).thenReturn(localMessageId);

        when(mockLocalMessage.getFolder()).thenReturn(mockLocalMessageFolder);

        when(mockLocalMessageFolder.getDatabaseId()).thenReturn(localMessageFolderId);
@@ -48,16 +50,16 @@ public class EmailProviderCacheTest extends RobolectricTest { 


    @Test

    public void getCache_returnsDifferentCacheForEachUUID() {

        EmailProviderCache cache = EmailProviderCache.getCache("u001", RuntimeEnvironment.application);

        EmailProviderCache cache2 = EmailProviderCache.getCache("u002", RuntimeEnvironment.application);

        EmailProviderCache cache = EmailProviderCache.getCache("u001", context);

        EmailProviderCache cache2 = EmailProviderCache.getCache("u002", context);



        assertNotEquals(cache, cache2);

    }



    @Test

    public void getCache_returnsSameCacheForAUUID() {

        EmailProviderCache cache = EmailProviderCache.getCache("u001", RuntimeEnvironment.application);

        EmailProviderCache cache2 = EmailProviderCache.getCache("u001", RuntimeEnvironment.application);

        EmailProviderCache cache = EmailProviderCache.getCache("u001", context);

        EmailProviderCache cache2 = EmailProviderCache.getCache("u001", context);



        assertSame(cache, cache2);

    }

app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class MessagingControllerTest extends K9RobolectricTest { 
    public void setUp() throws MessagingException {

        ShadowLog.stream = System.out;

        MockitoAnnotations.initMocks(this);

        appContext = RuntimeEnvironment.application;

        appContext = RuntimeEnvironment.getApplication();



        preferences = Preferences.getPreferences();

app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ public class MessageHelperTest extends RobolectricTest { 


    @Before

    public void setUp() throws Exception {

        Context context = RuntimeEnvironment.application;

        Context context = RuntimeEnvironment.getApplication();

        contacts = new Contacts(context);

        contactsWithFakeContact = new Contacts(context) {

            @Override public String getNameForAddress(String address) {

app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class MessageViewInfoExtractorTest extends K9RobolectricTest { 


    @Before

    public void setUp() throws Exception {

        context = RuntimeEnvironment.application;

        context = RuntimeEnvironment.getApplication();



        HtmlProcessor htmlProcessor = createFakeHtmlProcessor();

        attachmentInfoExtractor = spy(DI.get(AttachmentInfoExtractor.class));