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

Update Robolectric to 3.7.1 and simplify test annotations

Browse source
This commit is contained in:
cketti 2018-02-25 01:28:42 +01:00
parent 149603618b
commit 5d93d1139e
47 changed files with 116 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -4,7 +4,7 @@ androidBuildToolsVersion=27.0.3
androidSupportLibraryVersion=27.0.2 androidSupportLibraryVersion=27.0.2
timberVersion=4.5.1 timberVersion=4.5.1
robolectricVersion=3.2.2 robolectricVersion=3.7.1
junitVersion=4.12 junitVersion=4.12
mockitoVersion=1.10.19 mockitoVersion=1.10.19
okioVersion=1.11.0 okioVersion=1.11.0

6
k9mail/build.gradle
View file

@ -109,6 +109,12 @@ android {
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
} }
testOptions {
unitTests {
includeAndroidResources = true
}
}
} }
if (project.hasProperty('keyAlias')) { if (project.hasProperty('keyAlias')) {

20
k9mail/src/test/java/com/fsck/k9/K9RobolectricTestRunner.java
View file

@ -1,20 +0,0 @@
package com.fsck.k9;
import org.junit.runners.model.InitializationError;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
public class K9RobolectricTestRunner extends RobolectricTestRunner {
public K9RobolectricTestRunner(Class<?> testClass) throws InitializationError {
super(testClass);
}
@Override
protected Config buildGlobalConfig() {
return new Config.Builder()
.setSdk(22)
.setManifest("src/main/AndroidManifest.xml")
.build();
}
}

4
k9mail/src/test/java/com/fsck/k9/activity/ActivityListenerTest.java
View file

@ -5,11 +5,11 @@ import android.content.Context;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.Message; import com.fsck.k9.mail.Message;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
@ -17,7 +17,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ActivityListenerTest { public class ActivityListenerTest {
private static final String FOLDER = "folder"; private static final String FOLDER = "folder";
private static final String ERROR_MESSAGE = "errorMessage"; private static final String ERROR_MESSAGE = "errorMessage";

6
k9mail/src/test/java/com/fsck/k9/activity/MessageReferenceTest.java
View file

@ -1,11 +1,10 @@
package com.fsck.k9.activity; package com.fsck.k9.activity;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.Flag;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertFalse;
@ -14,8 +13,7 @@ import static junit.framework.Assert.assertTrue;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class MessageReferenceTest { public class MessageReferenceTest {
@Test @Test

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

@ -10,17 +10,17 @@ import android.net.Uri;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Email;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import com.fsck.k9.view.RecipientSelectView.Recipient; import com.fsck.k9.view.RecipientSelectView.Recipient;
import com.fsck.k9.view.RecipientSelectView.RecipientCryptoStatus; import com.fsck.k9.view.RecipientSelectView.RecipientCryptoStatus;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static android.provider.ContactsContract.CommonDataKinds.Email.TYPE_HOME; import static android.provider.ContactsContract.CommonDataKinds.Email.TYPE_HOME;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.mockito.AdditionalMatchers.aryEq; import static org.mockito.AdditionalMatchers.aryEq;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
@ -29,7 +29,7 @@ import static org.mockito.Mockito.when;
@SuppressWarnings("WeakerAccess") @SuppressWarnings("WeakerAccess")
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class RecipientLoaderTest { public class RecipientLoaderTest {
static final String CRYPTO_PROVIDER = "cryptoProvider"; static final String CRYPTO_PROVIDER = "cryptoProvider";
static final String[] PROJECTION = { static final String[] PROJECTION = {

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

@ -11,7 +11,6 @@ import android.os.ParcelFileDescriptor;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.activity.compose.RecipientMvpView.CryptoSpecialModeDisplayType; import com.fsck.k9.activity.compose.RecipientMvpView.CryptoSpecialModeDisplayType;
import com.fsck.k9.activity.compose.RecipientMvpView.CryptoStatusDisplayType; import com.fsck.k9.activity.compose.RecipientMvpView.CryptoStatusDisplayType;
import com.fsck.k9.activity.compose.RecipientPresenter.CryptoMode; import com.fsck.k9.activity.compose.RecipientPresenter.CryptoMode;
@ -34,6 +33,7 @@ import org.openintents.openpgp.util.OpenPgpApi;
import org.openintents.openpgp.util.OpenPgpServiceConnection; import org.openintents.openpgp.util.OpenPgpServiceConnection;
import org.openintents.openpgp.util.ShadowOpenPgpAsyncTask; import org.openintents.openpgp.util.ShadowOpenPgpAsyncTask;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
@ -49,8 +49,8 @@ import static org.mockito.Mockito.when;
@SuppressWarnings("ConstantConditions") @SuppressWarnings("ConstantConditions")
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowOpenPgpAsyncTask.class}) @Config(shadows = { ShadowOpenPgpAsyncTask.class })
public class RecipientPresenterTest { public class RecipientPresenterTest {
private static final ReplyToAddresses TO_ADDRESSES = new ReplyToAddresses(Address.parse("to@example.org")); 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_TO_ADDRESSES = Arrays.asList(Address.parse("allTo@example.org"));

6
k9mail/src/test/java/com/fsck/k9/activity/misc/ContactPictureLoaderTest.java
View file

@ -1,15 +1,15 @@
package com.fsck.k9.activity.misc; package com.fsck.k9.activity.misc;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@RunWith(K9RobolectricTestRunner.class)
@RunWith(RobolectricTestRunner.class)
public class ContactPictureLoaderTest { public class ContactPictureLoaderTest {
@Test @Test

10
k9mail/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java
View file

@ -1,7 +1,6 @@
package com.fsck.k9.autocrypt; package com.fsck.k9.autocrypt;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -14,7 +13,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -22,8 +20,6 @@ import static org.junit.Assert.assertNull;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE, sdk = 21)
@SuppressWarnings("WeakerAccess")
public class AutocryptHeaderParserTest { public class AutocryptHeaderParserTest {
AutocryptHeaderParser autocryptHeaderParser = AutocryptHeaderParser.getInstance(); AutocryptHeaderParser autocryptHeaderParser = AutocryptHeaderParser.getInstance();
@ -123,8 +119,6 @@ public class AutocryptHeaderParserTest {
} }
private InputStream readFromResourceFile(String name) throws FileNotFoundException { private InputStream readFromResourceFile(String name) throws FileNotFoundException {
return new FileInputStream(RuntimeEnvironment.application.getPackageResourcePath() + "/src/test/resources/" + name); return getClass().getResourceAsStream("/" + name);
} }
}
}

11
k9mail/src/test/java/com/fsck/k9/cache/EmailProviderCacheTest.java vendored
View file

@ -1,20 +1,19 @@
package com.fsck.k9.cache; package com.fsck.k9.cache;
import com.fsck.k9.K9RobolectricTestRunner; import java.util.Collections;
import java.util.UUID;
import com.fsck.k9.mailstore.LocalFolder; import com.fsck.k9.mailstore.LocalFolder;
import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.mailstore.LocalMessage;
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.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import java.util.Collections;
import java.util.UUID;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
@ -24,7 +23,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class EmailProviderCacheTest { public class EmailProviderCacheTest {
private EmailProviderCache cache; private EmailProviderCache cache;

4
k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java
View file

@ -14,7 +14,6 @@ import android.content.Context;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.AccountStats; import com.fsck.k9.AccountStats;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.Preferences; import com.fsck.k9.Preferences;
import com.fsck.k9.helper.Contacts; import com.fsck.k9.helper.Contacts;
import com.fsck.k9.mail.AuthenticationFailedException; import com.fsck.k9.mail.AuthenticationFailedException;
@ -46,6 +45,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
@ -70,7 +70,7 @@ import static org.mockito.Mockito.when;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class MessagingControllerTest { public class MessagingControllerTest {
private static final String FOLDER_NAME = "Folder"; private static final String FOLDER_NAME = "Folder";
private static final String SENT_FOLDER_NAME = "Sent"; private static final String SENT_FOLDER_NAME = "Sent";

4
k9mail/src/test/java/com/fsck/k9/controller/imap/ImapSyncTest.java
View file

@ -11,7 +11,6 @@ import android.content.Context;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.AccountStats; import com.fsck.k9.AccountStats;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.controller.MessagingController; import com.fsck.k9.controller.MessagingController;
import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.controller.MessagingListener;
import com.fsck.k9.controller.SimpleMessagingListener; import com.fsck.k9.controller.SimpleMessagingListener;
@ -34,6 +33,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
@ -51,7 +51,7 @@ import static org.mockito.Mockito.when;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ImapSyncTest { public class ImapSyncTest {
private static final String FOLDER_NAME = "Folder"; private static final String FOLDER_NAME = "Folder";
private static final int MAXIMUM_SMALL_MESSAGE_SIZE = 1000; private static final int MAXIMUM_SMALL_MESSAGE_SIZE = 1000;

6
k9mail/src/test/java/com/fsck/k9/crypto/MessageCryptoStructureDetectorTest.java
View file

@ -4,7 +4,6 @@ package com.fsck.k9.crypto;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.BodyPart;
import com.fsck.k9.mail.Message; import com.fsck.k9.mail.Message;
import com.fsck.k9.mail.Multipart; import com.fsck.k9.mail.Multipart;
@ -15,7 +14,7 @@ import com.fsck.k9.mail.internet.TextBody;
import com.fsck.k9.ui.crypto.MessageCryptoAnnotations; import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static com.fsck.k9.message.TestMessageConstructionUtils.bodypart; import static com.fsck.k9.message.TestMessageConstructionUtils.bodypart;
import static com.fsck.k9.message.TestMessageConstructionUtils.messageFromBody; import static com.fsck.k9.message.TestMessageConstructionUtils.messageFromBody;
@ -29,8 +28,7 @@ import static org.mockito.Mockito.mock;
@SuppressWarnings("WeakerAccess") @SuppressWarnings("WeakerAccess")
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class MessageCryptoStructureDetectorTest { public class MessageCryptoStructureDetectorTest {
MessageCryptoAnnotations messageCryptoAnnotations = mock(MessageCryptoAnnotations.class); MessageCryptoAnnotations messageCryptoAnnotations = mock(MessageCryptoAnnotations.class);
static final String PGP_INLINE_DATA = "" + static final String PGP_INLINE_DATA = "" +

8
k9mail/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.java
View file

@ -2,16 +2,14 @@ package com.fsck.k9.crypto;
import com.fsck.k9.Identity; import com.fsck.k9.Identity;
import com.fsck.k9.K9RobolectricTestRunner;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@RunWith(K9RobolectricTestRunner.class)
@Config(manifest = Config.NONE) @RunWith(RobolectricTestRunner.class)
public class OpenPgpApiHelperTest { public class OpenPgpApiHelperTest {
@Test @Test

4
k9mail/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt
View file

@ -3,7 +3,6 @@ package com.fsck.k9.helper
import com.fsck.k9.Account import com.fsck.k9.Account
import com.fsck.k9.Identity import com.fsck.k9.Identity
import com.fsck.k9.K9RobolectricTestRunner
import com.fsck.k9.mail.Address import com.fsck.k9.mail.Address
import com.fsck.k9.mail.Message import com.fsck.k9.mail.Message
import com.fsck.k9.mail.Message.RecipientType import com.fsck.k9.mail.Message.RecipientType
@ -11,9 +10,10 @@ import com.fsck.k9.mail.internet.MimeMessage
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment import org.robolectric.RuntimeEnvironment
@RunWith(K9RobolectricTestRunner::class) @RunWith(RobolectricTestRunner::class)
class IdentityHelperTest { class IdentityHelperTest {
private val account = createDummyAccount() private val account = createDummyAccount()

6
k9mail/src/test/java/com/fsck/k9/helper/MailToTest.java
View file

@ -7,14 +7,13 @@ import java.util.List;
import android.net.Uri; import android.net.Uri;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.helper.MailTo.CaseInsensitiveParamWrapper; import com.fsck.k9.helper.MailTo.CaseInsensitiveParamWrapper;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertFalse;
@ -23,8 +22,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class MailToTest { public class MailToTest {
@Rule @Rule
public ExpectedException exception = ExpectedException.none(); public ExpectedException exception = ExpectedException.none();

6
k9mail/src/test/java/com/fsck/k9/helper/MessageHelperTest.java
View file

@ -5,20 +5,18 @@ import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.text.SpannableString; import android.text.SpannableString;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class MessageHelperTest { public class MessageHelperTest {
private Contacts contacts; private Contacts contacts;
private Contacts contactsWithFakeContact; private Contacts contactsWithFakeContact;

6
k9mail/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java
View file

@ -5,7 +5,6 @@ import java.lang.reflect.Array;
import java.util.ArrayList; import java.util.ArrayList;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.helper.ReplyToParser.ReplyToAddresses; import com.fsck.k9.helper.ReplyToParser.ReplyToAddresses;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import com.fsck.k9.mail.Message; import com.fsck.k9.mail.Message;
@ -14,7 +13,7 @@ import com.fsck.k9.mail.internet.ListHeaders;
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.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -26,8 +25,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class ReplyToParserTest { public class ReplyToParserTest {
private static final Address[] REPLY_TO_ADDRESSES = Address.parse("replyTo1@example.com, replyTo2@example.com"); private static final Address[] REPLY_TO_ADDRESSES = Address.parse("replyTo1@example.com, replyTo2@example.com");
private static final Address[] LIST_POST_ADDRESSES = Address.parse("listPost@example.com"); private static final Address[] LIST_POST_ADDRESSES = Address.parse("listPost@example.com");

9
k9mail/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java
View file

@ -5,7 +5,6 @@ import java.util.Map;
import android.net.Uri; import android.net.Uri;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.BodyPart;
import com.fsck.k9.mail.Multipart; import com.fsck.k9.mail.Multipart;
import com.fsck.k9.mail.Part; import com.fsck.k9.mail.Part;
@ -16,9 +15,10 @@ import com.fsck.k9.message.extractors.AttachmentInfoExtractor;
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.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@ -26,8 +26,7 @@ import static org.mockito.Mockito.when;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class AttachmentResolverTest { public class AttachmentResolverTest {
public static final Uri ATTACHMENT_TEST_URI_1 = Uri.parse("uri://test/1"); public static final Uri ATTACHMENT_TEST_URI_1 = Uri.parse("uri://test/1");
public static final Uri ATTACHMENT_TEST_URI_2 = Uri.parse("uri://test/2"); public static final Uri ATTACHMENT_TEST_URI_2 = Uri.parse("uri://test/2");

8
k9mail/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java
View file

@ -7,14 +7,13 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mailstore.util.FileFactory; import com.fsck.k9.mailstore.util.FileFactory;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.io.output.ByteArrayOutputStream;
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.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -23,8 +22,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class DeferredFileBodyTest { public class DeferredFileBodyTest {
public static final String TEST_ENCODING = "test-encoding"; public static final String TEST_ENCODING = "test-encoding";
public static final byte[] TEST_DATA_SHORT = "test data".getBytes(); public static final byte[] TEST_DATA_SHORT = "test data".getBytes();
@ -143,4 +141,4 @@ public class DeferredFileBodyTest {
outputStream.write(TEST_DATA_LONG); outputStream.write(TEST_DATA_LONG);
outputStream.close(); outputStream.close();
} }
} }

4
k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java
View file

@ -12,7 +12,6 @@ import android.app.Application;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.fsck.k9.GlobalsHelper; import com.fsck.k9.GlobalsHelper;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.activity.K9ActivityCommon; import com.fsck.k9.activity.K9ActivityCommon;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.BodyPart;
@ -39,6 +38,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static com.fsck.k9.message.TestMessageConstructionUtils.bodypart; import static com.fsck.k9.message.TestMessageConstructionUtils.bodypart;
@ -56,7 +56,7 @@ import static org.mockito.Mockito.when;
@SuppressWarnings("WeakerAccess") @SuppressWarnings("WeakerAccess")
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class MessageViewInfoExtractorTest { public class MessageViewInfoExtractorTest {
public static final String BODY_TEXT = "K-9 Mail rocks :>"; public static final String BODY_TEXT = "K-9 Mail rocks :>";
public static final String BODY_TEXT_HTML = "K-9 Mail rocks :&gt;"; public static final String BODY_TEXT_HTML = "K-9 Mail rocks :&gt;";

5
k9mail/src/test/java/com/fsck/k9/mailstore/MigrationTest.java
View file

@ -14,7 +14,6 @@ import android.database.sqlite.SQLiteDatabase;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.Preferences; import com.fsck.k9.Preferences;
import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.BodyPart;
import com.fsck.k9.mail.FetchProfile; import com.fsck.k9.mail.FetchProfile;
@ -29,11 +28,13 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.openintents.openpgp.util.OpenPgpUtils; import org.openintents.openpgp.util.OpenPgpUtils;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
import org.robolectric.shadows.ShadowSQLiteConnection; import org.robolectric.shadows.ShadowSQLiteConnection;
@RunWith(K9RobolectricTestRunner.class)
@RunWith(RobolectricTestRunner.class)
public class MigrationTest { public class MigrationTest {
Account account; Account account;

6
k9mail/src/test/java/com/fsck/k9/mailstore/StoreSchemaDefinitionTest.java
View file

@ -17,14 +17,13 @@ import com.fsck.k9.Account;
import com.fsck.k9.BuildConfig; import com.fsck.k9.BuildConfig;
import com.fsck.k9.GlobalsHelper; import com.fsck.k9.GlobalsHelper;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.R; import com.fsck.k9.R;
import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.MessagingException;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -37,8 +36,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class StoreSchemaDefinitionTest { public class StoreSchemaDefinitionTest {
private StoreSchemaDefinition storeSchemaDefinition; private StoreSchemaDefinition storeSchemaDefinition;

4
k9mail/src/test/java/com/fsck/k9/mailstore/migrations/MigrationMimeStructureStateTest.java
View file

@ -3,14 +3,14 @@ package com.fsck.k9.mailstore.migrations;
import android.content.ContentValues; import android.content.ContentValues;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mailstore.migrations.MigrationTo51.MimeStructureState; import com.fsck.k9.mailstore.migrations.MigrationTo51.MimeStructureState;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@RunWith(K9RobolectricTestRunner.class) // required for ContentValues @RunWith(RobolectricTestRunner.class) // required for ContentValues
public class MigrationMimeStructureStateTest { public class MigrationMimeStructureStateTest {
@Test(expected = IllegalStateException.class) @Test(expected = IllegalStateException.class)

4
k9mail/src/test/java/com/fsck/k9/message/MessageBuilderTest.java
View file

@ -15,7 +15,6 @@ import android.app.Application;
import com.fsck.k9.Account.QuoteStyle; import com.fsck.k9.Account.QuoteStyle;
import com.fsck.k9.Identity; import com.fsck.k9.Identity;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.activity.misc.Attachment; import com.fsck.k9.activity.misc.Attachment;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.BodyPart;
@ -33,6 +32,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
@ -45,7 +45,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class MessageBuilderTest { public class MessageBuilderTest {
public static final String TEST_MESSAGE_TEXT = "soviet message\r\ntext ☭"; public static final String TEST_MESSAGE_TEXT = "soviet message\r\ntext ☭";
public static final String TEST_ATTACHMENT_TEXT = "text data in attachment"; public static final String TEST_ATTACHMENT_TEXT = "text data in attachment";

4
k9mail/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.java
View file

@ -17,7 +17,6 @@ import android.os.Bundle;
import com.fsck.k9.Account.QuoteStyle; import com.fsck.k9.Account.QuoteStyle;
import com.fsck.k9.Identity; import com.fsck.k9.Identity;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.activity.compose.ComposeCryptoStatus; import com.fsck.k9.activity.compose.ComposeCryptoStatus;
import com.fsck.k9.activity.compose.ComposeCryptoStatus.ComposeCryptoStatusBuilder; import com.fsck.k9.activity.compose.ComposeCryptoStatus.ComposeCryptoStatusBuilder;
import com.fsck.k9.activity.compose.RecipientPresenter.CryptoMode; import com.fsck.k9.activity.compose.RecipientPresenter.CryptoMode;
@ -49,6 +48,7 @@ import org.mockito.ArgumentCaptor;
import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpError;
import org.openintents.openpgp.util.OpenPgpApi; import org.openintents.openpgp.util.OpenPgpApi;
import org.openintents.openpgp.util.OpenPgpApi.OpenPgpDataSource; import org.openintents.openpgp.util.OpenPgpApi.OpenPgpDataSource;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static com.fsck.k9.autocrypt.AutocryptOperationsHelper.assertMessageHasAutocryptHeader; import static com.fsck.k9.autocrypt.AutocryptOperationsHelper.assertMessageHasAutocryptHeader;
@ -65,7 +65,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class PgpMessageBuilderTest { public class PgpMessageBuilderTest {
private static final long TEST_KEY_ID = 123L; private static final long TEST_KEY_ID = 123L;
private static final String TEST_MESSAGE_TEXT = "message text with a ☭ CCCP symbol"; private static final String TEST_MESSAGE_TEXT = "message text with a ☭ CCCP symbol";

8
k9mail/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java
View file

@ -5,20 +5,19 @@ import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.Part; import com.fsck.k9.mail.Part;
import com.fsck.k9.mail.internet.MimeBodyPart; import com.fsck.k9.mail.internet.MimeBodyPart;
import com.fsck.k9.mail.internet.MimeHeader; import com.fsck.k9.mail.internet.MimeHeader;
import com.fsck.k9.mail.internet.TextBody; import com.fsck.k9.mail.internet.TextBody;
import com.fsck.k9.mailstore.AttachmentViewInfo; import com.fsck.k9.mailstore.AttachmentViewInfo;
import com.fsck.k9.mailstore.LocalBodyPart;
import com.fsck.k9.mailstore.DeferredFileBody; import com.fsck.k9.mailstore.DeferredFileBody;
import com.fsck.k9.mailstore.LocalBodyPart;
import com.fsck.k9.provider.AttachmentProvider; import com.fsck.k9.provider.AttachmentProvider;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -27,8 +26,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class AttachmentInfoExtractorTest { public class AttachmentInfoExtractorTest {
public static final Uri TEST_URI = Uri.parse("uri://test"); public static final Uri TEST_URI = Uri.parse("uri://test");
public static final String TEST_MIME_TYPE = "text/plain"; public static final String TEST_MIME_TYPE = "text/plain";

5
k9mail/src/test/java/com/fsck/k9/message/extractors/EncryptionDetectorTest.java
View file

@ -1,11 +1,11 @@
package com.fsck.k9.message.extractors; package com.fsck.k9.message.extractors;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.Message; import com.fsck.k9.mail.Message;
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.robolectric.RobolectricTestRunner;
import static com.fsck.k9.message.MessageCreationHelper.createMessage; import static com.fsck.k9.message.MessageCreationHelper.createMessage;
import static com.fsck.k9.message.MessageCreationHelper.createMultipartMessage; import static com.fsck.k9.message.MessageCreationHelper.createMultipartMessage;
@ -16,7 +16,8 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class)
@RunWith(RobolectricTestRunner.class)
public class EncryptionDetectorTest { public class EncryptionDetectorTest {
private static final String CRLF = "\r\n"; private static final String CRLF = "\r\n";

6
k9mail/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.java
View file

@ -1,20 +1,18 @@
package com.fsck.k9.message.extractors; package com.fsck.k9.message.extractors;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.Part; import com.fsck.k9.mail.Part;
import com.fsck.k9.mail.internet.MimeBodyPart; import com.fsck.k9.mail.internet.MimeBodyPart;
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.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static com.fsck.k9.message.MessageCreationHelper.createTextPart; import static com.fsck.k9.message.MessageCreationHelper.createTextPart;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class PreviewTextExtractorTest { public class PreviewTextExtractorTest {
private PreviewTextExtractor previewTextExtractor; private PreviewTextExtractor previewTextExtractor;

6
k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java
View file

@ -8,7 +8,6 @@ import java.io.IOException;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9.Theme; import com.fsck.k9.K9.Theme;
import com.fsck.k9.K9RobolectricTestRunner;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
@ -16,13 +15,12 @@ import org.junit.After;
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.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class HtmlConverterTest { public class HtmlConverterTest {
// Useful if you want to write stuff to a file for debugging in a browser. // Useful if you want to write stuff to a file for debugging in a browser.
private static final boolean WRITE_TO_FILE = Boolean.parseBoolean(System.getProperty("k9.htmlConverterTest.writeToFile", "false")); private static final boolean WRITE_TO_FILE = Boolean.parseBoolean(System.getProperty("k9.htmlConverterTest.writeToFile", "false"));

7
k9mail/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.java
View file

@ -1,18 +1,15 @@
package com.fsck.k9.message.signature; package com.fsck.k9.message.signature;
import com.fsck.k9.K9RobolectricTestRunner;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static com.fsck.k9.message.html.HtmlHelper.extractText; import static com.fsck.k9.message.html.HtmlHelper.extractText;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class HtmlSignatureRemoverTest { public class HtmlSignatureRemoverTest {
@Test @Test
public void shouldStripSignatureFromK9StyleHtml() throws Exception { public void shouldStripSignatureFromK9StyleHtml() throws Exception {

4
k9mail/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationsTest.java
View file

@ -9,12 +9,12 @@ import android.support.v4.app.NotificationCompat.Builder;
import android.support.v4.app.NotificationManagerCompat; import android.support.v4.app.NotificationManagerCompat;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.MockHelper; import com.fsck.k9.MockHelper;
import com.fsck.k9.R; import com.fsck.k9.R;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class AuthenticationErrorNotificationsTest { public class AuthenticationErrorNotificationsTest {
private static final boolean INCOMING = true; private static final boolean INCOMING = true;
private static final boolean OUTGOING = false; private static final boolean OUTGOING = false;

6
k9mail/src/test/java/com/fsck/k9/notification/BaseNotificationsTest.java
View file

@ -7,13 +7,12 @@ import android.support.v4.app.NotificationCompat.Builder;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9.NotificationQuickDelete; import com.fsck.k9.K9.NotificationQuickDelete;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.MockHelper; import com.fsck.k9.MockHelper;
import com.fsck.k9.R; import com.fsck.k9.R;
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.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -23,8 +22,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class BaseNotificationsTest { public class BaseNotificationsTest {
private static final int ACCOUNT_COLOR = 0xAABBCC; private static final int ACCOUNT_COLOR = 0xAABBCC;
private static final String ACCOUNT_NAME = "AccountName"; private static final String ACCOUNT_NAME = "AccountName";

4
k9mail/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationsTest.java
View file

@ -9,12 +9,12 @@ import android.support.v4.app.NotificationCompat.Builder;
import android.support.v4.app.NotificationManagerCompat; import android.support.v4.app.NotificationManagerCompat;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.MockHelper; import com.fsck.k9.MockHelper;
import com.fsck.k9.R; import com.fsck.k9.R;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class CertificateErrorNotificationsTest { public class CertificateErrorNotificationsTest {
private static final boolean INCOMING = true; private static final boolean INCOMING = true;
private static final boolean OUTGOING = false; private static final boolean OUTGOING = false;

4
k9mail/src/test/java/com/fsck/k9/notification/DeviceNotificationsTest.java
View file

@ -15,7 +15,6 @@ import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9.NotificationHideSubject; import com.fsck.k9.K9.NotificationHideSubject;
import com.fsck.k9.K9.NotificationQuickDelete; import com.fsck.k9.K9.NotificationQuickDelete;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.NotificationSetting; import com.fsck.k9.NotificationSetting;
import com.fsck.k9.R; import com.fsck.k9.R;
import org.junit.Before; import org.junit.Before;
@ -23,6 +22,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static com.fsck.k9.MockHelper.mockBuilder; import static com.fsck.k9.MockHelper.mockBuilder;
@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class DeviceNotificationsTest { public class DeviceNotificationsTest {
private static final int UNREAD_MESSAGE_COUNT = 42; private static final int UNREAD_MESSAGE_COUNT = 42;
private static final int NEW_MESSAGE_COUNT = 2; private static final int NEW_MESSAGE_COUNT = 2;

4
k9mail/src/test/java/com/fsck/k9/notification/LockScreenNotificationTest.java
View file

@ -11,12 +11,12 @@ import android.support.v4.app.NotificationCompat.Builder;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9.LockScreenNotificationVisibility; import com.fsck.k9.K9.LockScreenNotificationVisibility;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.MockHelper; import com.fsck.k9.MockHelper;
import com.fsck.k9.R; import com.fsck.k9.R;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class LockScreenNotificationTest { public class LockScreenNotificationTest {
private static final String ACCOUNT_NAME = "Hugo"; private static final String ACCOUNT_NAME = "Hugo";
private static final int NEW_MESSAGE_COUNT = 3; private static final int NEW_MESSAGE_COUNT = 3;

4
k9mail/src/test/java/com/fsck/k9/notification/NewMailNotificationsTest.java
View file

@ -7,12 +7,12 @@ import android.support.v4.app.NotificationManagerCompat;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9.NotificationHideSubject; import com.fsck.k9.K9.NotificationHideSubject;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.activity.MessageReference; import com.fsck.k9.activity.MessageReference;
import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.mailstore.LocalMessage;
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.robolectric.RobolectricTestRunner;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyBoolean;
@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class NewMailNotificationsTest { public class NewMailNotificationsTest {
private static final int ACCOUNT_NUMBER = 23; private static final int ACCOUNT_NUMBER = 23;

4
k9mail/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.java
View file

@ -4,7 +4,6 @@ package com.fsck.k9.notification;
import android.content.Context; import android.content.Context;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.activity.MessageReference; import com.fsck.k9.activity.MessageReference;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.Flag;
@ -14,6 +13,7 @@ import com.fsck.k9.message.extractors.PreviewResult.PreviewType;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -22,7 +22,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class NotificationContentCreatorTest { public class NotificationContentCreatorTest {
private static final String ACCOUNT_UUID = "1-2-3"; private static final String ACCOUNT_UUID = "1-2-3";
private static final String FOLDER_NAME = "INBOX"; private static final String FOLDER_NAME = "INBOX";

7
k9mail/src/test/java/com/fsck/k9/notification/NotificationDataTest.java
View file

@ -4,13 +4,11 @@ package com.fsck.k9.notification;
import java.util.List; import java.util.List;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.activity.MessageReference; import com.fsck.k9.activity.MessageReference;
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.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -20,8 +18,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class NotificationDataTest { public class NotificationDataTest {
private static final String ACCOUNT_UUID = "1-2-3"; private static final String ACCOUNT_UUID = "1-2-3";
private static final int ACCOUNT_NUMBER = 23; private static final int ACCOUNT_NUMBER = 23;

8
k9mail/src/test/java/com/fsck/k9/notification/NotificationIdsTest.java
View file

@ -2,18 +2,16 @@ package com.fsck.k9.notification;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class)
@Config(manifest = Config.NONE) @RunWith(RobolectricTestRunner.class)
public class NotificationIdsTest { public class NotificationIdsTest {
private static final boolean INCOMING = true; private static final boolean INCOMING = true;
private static final boolean OUTGOING = false; private static final boolean OUTGOING = false;

4
k9mail/src/test/java/com/fsck/k9/notification/SendFailedNotificationsTest.java
View file

@ -8,12 +8,12 @@ import android.support.v4.app.NotificationCompat.Builder;
import android.support.v4.app.NotificationManagerCompat; import android.support.v4.app.NotificationManagerCompat;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.MockHelper; import com.fsck.k9.MockHelper;
import com.fsck.k9.R; import com.fsck.k9.R;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class SendFailedNotificationsTest { public class SendFailedNotificationsTest {
private static final int ACCOUNT_NUMBER = 1; private static final int ACCOUNT_NUMBER = 1;
private static final String ACCOUNT_NAME = "TestAccount"; private static final String ACCOUNT_NAME = "TestAccount";

4
k9mail/src/test/java/com/fsck/k9/notification/SyncNotificationsTest.java
View file

@ -8,13 +8,13 @@ import android.support.v4.app.NotificationCompat.Builder;
import android.support.v4.app.NotificationManagerCompat; import android.support.v4.app.NotificationManagerCompat;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.MockHelper; import com.fsck.k9.MockHelper;
import com.fsck.k9.R; import com.fsck.k9.R;
import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Folder;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
@ -26,7 +26,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class SyncNotificationsTest { public class SyncNotificationsTest {
private static final int ACCOUNT_NUMBER = 1; private static final int ACCOUNT_NUMBER = 1;
private static final String ACCOUNT_NAME = "TestAccount"; private static final String ACCOUNT_NAME = "TestAccount";

4
k9mail/src/test/java/com/fsck/k9/notification/WearNotificationsTest.java
View file

@ -14,7 +14,6 @@ import android.support.v4.app.NotificationCompat.WearableExtender;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.K9.NotificationQuickDelete; import com.fsck.k9.K9.NotificationQuickDelete;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.MockHelper; import com.fsck.k9.MockHelper;
import com.fsck.k9.R; import com.fsck.k9.R;
import com.fsck.k9.activity.MessageReference; import com.fsck.k9.activity.MessageReference;
@ -23,6 +22,7 @@ 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.ArgumentMatcher; import org.mockito.ArgumentMatcher;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class WearNotificationsTest { public class WearNotificationsTest {
private static final int ACCOUNT_NUMBER = 42; private static final int ACCOUNT_NUMBER = 42;
private static final String ACCOUNT_NAME = "accountName"; private static final String ACCOUNT_NAME = "accountName";

17
k9mail/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.java
View file

@ -1,12 +1,5 @@
package com.fsck.k9.preferences; package com.fsck.k9.preferences;
import com.fsck.k9.K9RobolectricTestRunner;
import org.jdom2.Document;
import org.jdom2.input.SAXBuilder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -14,11 +7,19 @@ import java.io.InputStream;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
import org.jdom2.Document;
import org.jdom2.input.SAXBuilder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
@RunWith(K9RobolectricTestRunner.class)
@RunWith(RobolectricTestRunner.class)
public class SettingsExporterTest { public class SettingsExporterTest {
@Test @Test

4
k9mail/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.java
View file

@ -7,13 +7,13 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.Preferences; import com.fsck.k9.Preferences;
import com.fsck.k9.mail.AuthType; import com.fsck.k9.mail.AuthType;
import org.apache.tools.ant.filters.StringInputStream; import org.apache.tools.ant.filters.StringInputStream;
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.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -21,7 +21,7 @@ import static org.junit.Assert.assertFalse;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class SettingsImporterTest { public class SettingsImporterTest {
@Before @Before

6
k9mail/src/test/java/com/fsck/k9/setup/ServerNameSuggesterTest.java
View file

@ -1,18 +1,16 @@
package com.fsck.k9.setup; package com.fsck.k9.setup;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.ServerSettings.Type; import com.fsck.k9.mail.ServerSettings.Type;
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.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@RunWith(K9RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class ServerNameSuggesterTest { public class ServerNameSuggesterTest {
private ServerNameSuggester serverNameSuggester; private ServerNameSuggester serverNameSuggester;

4
k9mail/src/test/java/com/fsck/k9/view/MessageHeaderTest.kt
View file

@ -1,13 +1,13 @@
package com.fsck.k9.view package com.fsck.k9.view
import com.fsck.k9.K9RobolectricTestRunner
import com.fsck.k9.mail.Address import com.fsck.k9.mail.Address
import com.fsck.k9.mail.internet.MimeMessage import com.fsck.k9.mail.internet.MimeMessage
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
@RunWith(K9RobolectricTestRunner::class) @RunWith(RobolectricTestRunner::class)
class MessageHeaderTest { class MessageHeaderTest {
@Test @Test