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

Commit 9dfe1b28 authored by cketti's avatar cketti
Browse files

Fix Robolectric tests

parent 15cf1dff

k9mail/src/test/java/com/fsck/k9/RobolectricTest.kt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
package com.fsck.k9



import android.app.Application

import org.junit.runner.RunWith

import org.robolectric.RobolectricTestRunner

import org.robolectric.annotation.Config



/**

 * A Robolectric test that does not create an instance of our [Application] class [K9].

 *

 * See also [K9RobolectricTest].

 */

@RunWith(RobolectricTestRunner::class)

@Config(application = EmptyApplication::class)

abstract class RobolectricTest



class EmptyApplication : Application()

k9mail/src/test/java/com/fsck/k9/account/AccountCreatorTest.java

+2 −4
Original line number Diff line number Diff line
@@ -2,17 +2,15 @@ package com.fsck.k9.account; 




import com.fsck.k9.Account.DeletePolicy;

import com.fsck.k9.RobolectricTest;

import com.fsck.k9.mail.ConnectionSecurity;

import com.fsck.k9.mail.ServerSettings.Type;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;



import static org.junit.Assert.assertEquals;





@RunWith(RobolectricTestRunner.class)

public class AccountCreatorTest {

public class AccountCreatorTest extends RobolectricTest {



    @Test

    public void getDefaultDeletePolicy_withImap_shouldReturn_ON_DELETE() {

k9mail/src/test/java/com/fsck/k9/activity/ActivityListenerTest.java

+2 −4
Original line number Diff line number Diff line
@@ -5,11 +5,10 @@ import android.content.Context; 


import com.fsck.k9.Account;

import com.fsck.k9.K9;

import com.fsck.k9.RobolectricTest;

import com.fsck.k9.mail.Message;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



import static junit.framework.Assert.assertEquals;
@@ -17,8 +16,7 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.when;





@RunWith(RobolectricTestRunner.class)

public class ActivityListenerTest {

public class ActivityListenerTest extends RobolectricTest {

    private static final String FOLDER_SERVER_ID = ":folder:123";

    private static final String FOLDER_NAME = "folder";

    private static final String ERROR_MESSAGE = "errorMessage";

k9mail/src/test/java/com/fsck/k9/activity/compose/RecipientLoaderTest.java

+2 −4
Original line number Diff line number Diff line
@@ -10,13 +10,12 @@ import android.net.Uri; 
import android.provider.ContactsContract;

import android.provider.ContactsContract.CommonDataKinds.Email;



import com.fsck.k9.RobolectricTest;

import com.fsck.k9.mail.Address;

import com.fsck.k9.view.RecipientSelectView.Recipient;

import com.fsck.k9.view.RecipientSelectView.RecipientCryptoStatus;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



import static android.provider.ContactsContract.CommonDataKinds.Email.TYPE_HOME;
@@ -30,8 +29,7 @@ import static org.mockito.Mockito.when; 




@SuppressWarnings("WeakerAccess")

@RunWith(RobolectricTestRunner.class)

public class RecipientLoaderTest {

public class RecipientLoaderTest extends RobolectricTest {

    static final String CRYPTO_PROVIDER = "cryptoProvider";

    static final String[] PROJECTION = {

            ContactsContract.CommonDataKinds.Email._ID,

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

+2 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import android.os.ParcelFileDescriptor; 


import com.fsck.k9.Account;

import com.fsck.k9.K9;

import com.fsck.k9.K9RobolectricTest;

import com.fsck.k9.activity.compose.RecipientMvpView.CryptoSpecialModeDisplayType;

import com.fsck.k9.activity.compose.RecipientMvpView.CryptoStatusDisplayType;

import com.fsck.k9.activity.compose.RecipientPresenter.CryptoMode;
@@ -27,13 +28,11 @@ import com.fsck.k9.message.ComposePgpInlineDecider; 
import com.fsck.k9.view.RecipientSelectView.Recipient;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.openintents.openpgp.IOpenPgpService2;

import org.openintents.openpgp.util.OpenPgpApi;

import org.openintents.openpgp.util.OpenPgpServiceConnection;

import org.openintents.openpgp.util.ShadowOpenPgpAsyncTask;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowApplication;
@@ -49,9 +48,8 @@ import static org.mockito.Mockito.when; 




@SuppressWarnings("ConstantConditions")

@RunWith(RobolectricTestRunner.class)

@Config(shadows = { ShadowOpenPgpAsyncTask.class })

public class RecipientPresenterTest {

public class RecipientPresenterTest extends K9RobolectricTest {

    private static final ReplyToAddresses TO_ADDRESSES = new ReplyToAddresses(Address.parse("to@example.org"));

    private static final List<Address> ALL_TO_ADDRESSES = Arrays.asList(Address.parse("allTo@example.org"));

    private static final List<Address> ALL_CC_ADDRESSES = Arrays.asList(Address.parse("allCc@example.org"));