diff --git a/gradle.properties b/gradle.properties index 8b0a92235d8..8007054521e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ androidCompileSdkVersion=24 androidBuildToolsVersion=24.0.3 androidSupportLibraryVersion=23.1.1 -robolectricVersion=3.1.1 +robolectricVersion=3.2.2 junitVersion=4.12 mockitoVersion=1.10.19 okioVersion=1.11.0 diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java index 133d5b82cf6..c6cfa6cbd3f 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java @@ -3,7 +3,6 @@ import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; @@ -12,8 +11,7 @@ import static org.junit.Assert.assertTrue; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class AddressTest { /** * test the possibility to parse "From:" fields with no email. diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java b/k9mail-library/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java index 7c493bf681d..8c8698425e1 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java @@ -3,14 +3,11 @@ import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class Address_quoteAtoms { @Test public void testNoQuote() { diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/K9LibRobolectricTestRunner.java b/k9mail-library/src/test/java/com/fsck/k9/mail/K9LibRobolectricTestRunner.java new file mode 100644 index 00000000000..561c594e877 --- /dev/null +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/K9LibRobolectricTestRunner.java @@ -0,0 +1,20 @@ +package com.fsck.k9.mail; + +import org.junit.runners.model.InitializationError; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +public class K9LibRobolectricTestRunner extends RobolectricTestRunner { + + public K9LibRobolectricTestRunner(Class testClass) throws InitializationError { + super(testClass); + } + + @Override + protected Config buildGlobalConfig() { + return new Config.Builder() + .setSdk(22) + .setManifest(Config.NONE) + .build(); + } +} \ No newline at end of file diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/MessageTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/MessageTest.java index 07dc6b33628..07356a474ca 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/MessageTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/MessageTest.java @@ -26,7 +26,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -34,8 +33,7 @@ import static org.junit.Assert.assertNotNull; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class MessageTest { private Context context; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java index 5d64202daee..c9205be7817 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java @@ -1,16 +1,15 @@ package com.fsck.k9.mail.internet; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class CharsetSupportTest { @Test diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java index 7059fd5047d..3eb7b69e53a 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java @@ -1,16 +1,15 @@ package com.fsck.k9.mail.internet; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class DecoderUtilTest { @Test diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/ListHeadersTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/ListHeadersTest.java index ce59c2547d0..1cb67472fc4 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/ListHeadersTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/ListHeadersTest.java @@ -2,19 +2,17 @@ import com.fsck.k9.mail.Address; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class ListHeadersTest { private static final String[] TEST_EMAIL_ADDRESSES = new String[] { "prettyandsimple@example.com", diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MessageExtractorTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MessageExtractorTest.java index 5fa528b3d31..828e2c007ae 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MessageExtractorTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MessageExtractorTest.java @@ -2,14 +2,13 @@ import com.fsck.k9.mail.Body; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mailstore.BinaryMemoryBody; import org.apache.james.mime4j.util.MimeUtil; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -18,8 +17,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class MessageExtractorTest { private MimeBodyPart part; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MessageIdGeneratorTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MessageIdGeneratorTest.java index b893f624586..9b8c19a0b27 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MessageIdGeneratorTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MessageIdGeneratorTest.java @@ -2,18 +2,16 @@ import com.fsck.k9.mail.Address; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; 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.annotation.Config; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class MessageIdGeneratorTest { private MessageIdGenerator messageIdGenerator; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java index 0ac57dae66f..6c05f811012 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java @@ -16,17 +16,15 @@ import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Body; import com.fsck.k9.mail.BodyPart; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.Message.RecipientType; import com.fsck.k9.mail.Multipart; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class MimeMessageParseTest { @Before public void setup() { diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/CopyUidResponseTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/CopyUidResponseTest.java index aea877c9d93..e99c0061119 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/CopyUidResponseTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/CopyUidResponseTest.java @@ -1,13 +1,13 @@ package com.fsck.k9.mail.store.imap; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; + import java.util.HashMap; import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static com.fsck.k9.mail.store.imap.ImapResponseHelper.createImapResponse; import static org.junit.Assert.assertEquals; @@ -15,8 +15,7 @@ import static org.junit.Assert.assertNull; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class CopyUidResponseTest { @Test public void parse_withCopyUidResponse_shouldCreateUidMapping() throws Exception { diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapConnectionTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapConnectionTest.java index 7d944f670cf..60bf3e77b8c 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapConnectionTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapConnectionTest.java @@ -11,6 +11,7 @@ import com.fsck.k9.mail.CertificateValidationException; import com.fsck.k9.mail.CertificateValidationException.Reason; import com.fsck.k9.mail.ConnectionSecurity; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.K9MailLib; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.XOAuth2ChallengeParserTest; @@ -23,8 +24,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InOrder; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import static org.hamcrest.core.StringContains.containsString; @@ -38,8 +37,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class ImapConnectionTest { private static final boolean DEBUGGING = false; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapFolderTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapFolderTest.java index 0b7f8ece61d..25bfcdabd1a 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapFolderTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapFolderTest.java @@ -17,6 +17,7 @@ import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Folder.FolderType; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessageRetrievalListener; import com.fsck.k9.mail.MessagingException; @@ -32,9 +33,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static com.fsck.k9.mail.Folder.OPEN_MODE_RO; import static com.fsck.k9.mail.Folder.OPEN_MODE_RW; @@ -58,8 +57,7 @@ import static org.mockito.internal.util.collections.Sets.newSet; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class ImapFolderTest { private ImapStore imapStore; private ImapConnection imapConnection; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapPushStateTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapPushStateTest.java index fc20de04b89..c66854e47de 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapPushStateTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapPushStateTest.java @@ -1,17 +1,16 @@ package com.fsck.k9.mail.store.imap; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class ImapPushStateTest { @Test public void parse_withValidArgument() throws Exception { diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapPusherTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapPusherTest.java index b6b890e5ade..55a185bbbcd 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapPusherTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapPusherTest.java @@ -6,13 +6,12 @@ import java.util.Collections; import java.util.List; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.PushReceiver; import com.fsck.k9.mail.store.StoreConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doThrow; @@ -21,8 +20,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class ImapPusherTest { private ImapStore imapStore; private TestImapPusher imapPusher; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java index 14a1a074bc7..0dcb8d829f1 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java @@ -6,12 +6,11 @@ import java.util.ArrayList; import java.util.List; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.filter.FixedLengthInputStream; import com.fsck.k9.mail.filter.PeekableInputStream; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; @@ -20,8 +19,7 @@ import static org.junit.Assert.fail; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class ImapResponseParserTest { private PeekableInputStream peekableInputStream; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java index c823aa2a783..5f83ae2e743 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java @@ -17,18 +17,17 @@ package com.fsck.k9.mail.store.imap; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import java.util.List; import static org.junit.Assert.assertArrayEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class ImapUtilityTest { @Test public void testGetImapSequenceValues() { diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java index c9e9a3b2b0d..69b18552a6f 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java @@ -1,6 +1,7 @@ package com.fsck.k9.mail.store.webdav; import com.fsck.k9.mail.FetchProfile; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessageRetrievalListener; import com.fsck.k9.mail.MessagingException; @@ -22,8 +23,6 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static java.util.Collections.singletonList; @@ -58,8 +57,7 @@ import java.util.Map; @SuppressWarnings("deprecation") -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class WebDavFolderTest { @Mock private MessageRetrievalListener listener; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavMessageTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavMessageTest.java index 9be44d893f7..33f8e01e276 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavMessageTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavMessageTest.java @@ -1,6 +1,7 @@ package com.fsck.k9.mail.store.webdav; import com.fsck.k9.mail.Flag; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.MessagingException; import org.junit.Before; @@ -8,18 +9,14 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import java.util.Collections; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class WebDavMessageTest { private WebDavMessage message; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavStoreTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavStoreTest.java index 463f5784f2e..f0c7586adf9 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavStoreTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavStoreTest.java @@ -4,13 +4,13 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; -import java.util.HashMap; import java.util.List; import com.fsck.k9.mail.AuthType; import com.fsck.k9.mail.CertificateValidationException; import com.fsck.k9.mail.ConnectionSecurity; import com.fsck.k9.mail.Folder; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.ServerSettings; import com.fsck.k9.mail.ServerSettings.Type; @@ -44,11 +44,8 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.mockito.stubbing.OngoingStubbing; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import java.util.Collections; - import static junit.framework.Assert.assertSame; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -58,8 +55,7 @@ @SuppressWarnings("deprecation") -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class WebDavStoreTest { private static final HttpResponse OK_200_RESPONSE = createOkResponse(); private static final HttpResponse UNAUTHORIZED_401_RESPONSE = createResponse(401); diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java index ed6e6f3c6f6..97492e52e03 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java @@ -8,6 +8,7 @@ import com.fsck.k9.mail.AuthenticationFailedException; import com.fsck.k9.mail.CertificateValidationException; import com.fsck.k9.mail.ConnectionSecurity; +import com.fsck.k9.mail.K9LibRobolectricTestRunner; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.ServerSettings; @@ -18,7 +19,6 @@ import com.fsck.k9.mail.helpers.TestTrustedSocketFactory; import com.fsck.k9.mail.internet.MimeMessage; import com.fsck.k9.mail.oauth.OAuth2TokenProvider; -import com.fsck.k9.mail.oauth.XOAuth2ChallengeParser; import com.fsck.k9.mail.ssl.TrustedSocketFactory; import com.fsck.k9.mail.store.StoreConfig; import com.fsck.k9.mail.transport.mockServer.MockSmtpServer; @@ -26,13 +26,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InOrder; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -41,8 +39,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9LibRobolectricTestRunner.class) public class SmtpTransportTest { private static final String LOCALHOST_NAME = "localhost"; private static final String USERNAME = "user"; diff --git a/k9mail/src/test/java/com/fsck/k9/K9RobolectricTestRunner.java b/k9mail/src/test/java/com/fsck/k9/K9RobolectricTestRunner.java new file mode 100644 index 00000000000..c9b91cc7510 --- /dev/null +++ b/k9mail/src/test/java/com/fsck/k9/K9RobolectricTestRunner.java @@ -0,0 +1,20 @@ +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(); + } +} \ No newline at end of file diff --git a/k9mail/src/test/java/com/fsck/k9/activity/ActivityListenerTest.java b/k9mail/src/test/java/com/fsck/k9/activity/ActivityListenerTest.java index dd328fc2ece..1aac238b1b4 100644 --- a/k9mail/src/test/java/com/fsck/k9/activity/ActivityListenerTest.java +++ b/k9mail/src/test/java/com/fsck/k9/activity/ActivityListenerTest.java @@ -4,21 +4,19 @@ import android.content.Context; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; 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 org.robolectric.annotation.Config; import static junit.framework.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class ActivityListenerTest { private static final String FOLDER = "folder"; private static final String ERROR_MESSAGE = "errorMessage"; diff --git a/k9mail/src/test/java/com/fsck/k9/activity/MessageReferenceTest.java b/k9mail/src/test/java/com/fsck/k9/activity/MessageReferenceTest.java index f77acafeb0f..29a1bcc9dfc 100644 --- a/k9mail/src/test/java/com/fsck/k9/activity/MessageReferenceTest.java +++ b/k9mail/src/test/java/com/fsck/k9/activity/MessageReferenceTest.java @@ -1,10 +1,10 @@ package com.fsck.k9.activity; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mail.Flag; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static junit.framework.Assert.assertEquals; @@ -14,8 +14,8 @@ import static org.junit.Assert.assertNotNull; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class MessageReferenceTest { @Test diff --git a/k9mail/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.java b/k9mail/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.java index 6a9ded3461f..4ddd21cfc16 100644 --- a/k9mail/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.java +++ b/k9mail/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.java @@ -10,6 +10,7 @@ import android.os.ParcelFileDescriptor; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.activity.compose.RecipientMvpView.CryptoSpecialModeDisplayType; import com.fsck.k9.activity.compose.RecipientMvpView.CryptoStatusDisplayType; import com.fsck.k9.activity.compose.RecipientPresenter.CryptoMode; @@ -28,7 +29,6 @@ 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; @@ -43,8 +43,8 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21, shadows = {ShadowOpenPgpAsyncTask.class}) +@RunWith(K9RobolectricTestRunner.class) +@Config(shadows = {ShadowOpenPgpAsyncTask.class}) public class RecipientPresenterTest { private static final ReplyToAddresses TO_ADDRESSES = new ReplyToAddresses(Address.parse("to@example.org")); private static final List
ALL_TO_ADDRESSES = Arrays.asList(Address.parse("allTo@example.org")); diff --git a/k9mail/src/test/java/com/fsck/k9/cache/EmailProviderCacheTest.java b/k9mail/src/test/java/com/fsck/k9/cache/EmailProviderCacheTest.java index a96ff0ab4a2..4bc8e03ce90 100644 --- a/k9mail/src/test/java/com/fsck/k9/cache/EmailProviderCacheTest.java +++ b/k9mail/src/test/java/com/fsck/k9/cache/EmailProviderCacheTest.java @@ -1,6 +1,7 @@ package com.fsck.k9.cache; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mailstore.LocalFolder; import com.fsck.k9.mailstore.LocalMessage; @@ -9,9 +10,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.Collections; import java.util.UUID; @@ -25,8 +24,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class EmailProviderCacheTest { private EmailProviderCache cache; diff --git a/k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java b/k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java index 1ae28167d69..e0254d7a1bb 100644 --- a/k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java +++ b/k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java @@ -13,6 +13,7 @@ import com.fsck.k9.Account; import com.fsck.k9.AccountStats; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.Preferences; import com.fsck.k9.helper.Contacts; import com.fsck.k9.mail.FetchProfile; @@ -38,8 +39,6 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import static org.junit.Assert.assertEquals; @@ -60,8 +59,7 @@ @SuppressWarnings("unchecked") -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class MessagingControllerTest { private static final String FOLDER_NAME = "Folder"; private static final int MAXIMUM_SMALL_MESSAGE_SIZE = 1000; diff --git a/k9mail/src/test/java/com/fsck/k9/crypto/MessageDecryptVerifierTest.java b/k9mail/src/test/java/com/fsck/k9/crypto/MessageDecryptVerifierTest.java index 55a12bb65fb..ff5fa20ce91 100644 --- a/k9mail/src/test/java/com/fsck/k9/crypto/MessageDecryptVerifierTest.java +++ b/k9mail/src/test/java/com/fsck/k9/crypto/MessageDecryptVerifierTest.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; @@ -18,7 +19,6 @@ import com.fsck.k9.ui.crypto.MessageCryptoAnnotations; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; @@ -29,8 +29,8 @@ import static org.mockito.Mockito.mock; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class MessageDecryptVerifierTest { private static final String MIME_TYPE_MULTIPART_ENCRYPTED = "multipart/encrypted"; private MessageCryptoAnnotations messageCryptoAnnotations = mock(MessageCryptoAnnotations.class); diff --git a/k9mail/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.java b/k9mail/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.java index 9f838cf959b..149868ba4e0 100644 --- a/k9mail/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.java +++ b/k9mail/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.java @@ -2,16 +2,16 @@ import com.fsck.k9.Identity; +import com.fsck.k9.K9RobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class OpenPgpApiHelperTest { @Test diff --git a/k9mail/src/test/java/com/fsck/k9/helper/MailToTest.java b/k9mail/src/test/java/com/fsck/k9/helper/MailToTest.java index b294dce3709..46ff491429b 100644 --- a/k9mail/src/test/java/com/fsck/k9/helper/MailToTest.java +++ b/k9mail/src/test/java/com/fsck/k9/helper/MailToTest.java @@ -7,13 +7,13 @@ import android.net.Uri; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.helper.MailTo.CaseInsensitiveParamWrapper; import com.fsck.k9.mail.Address; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static junit.framework.Assert.assertEquals; @@ -23,8 +23,8 @@ import static org.junit.Assert.assertThat; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class MailToTest { @Rule public ExpectedException exception = ExpectedException.none(); diff --git a/k9mail/src/test/java/com/fsck/k9/helper/MessageHelperTest.java b/k9mail/src/test/java/com/fsck/k9/helper/MessageHelperTest.java index 65511b7ec81..2278a3f5e7b 100644 --- a/k9mail/src/test/java/com/fsck/k9/helper/MessageHelperTest.java +++ b/k9mail/src/test/java/com/fsck/k9/helper/MessageHelperTest.java @@ -5,11 +5,11 @@ import android.graphics.Color; import android.text.SpannableString; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mail.Address; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -17,8 +17,8 @@ import static junit.framework.Assert.assertTrue; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class MessageHelperTest { private Contacts contacts; private Contacts mockContacts; diff --git a/k9mail/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java b/k9mail/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java index 68794450bac..6725cb25cd6 100644 --- a/k9mail/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java +++ b/k9mail/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.helper.ReplyToParser.ReplyToAddresses; import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Message; @@ -13,7 +14,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertArrayEquals; @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class ReplyToParserTest { 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"); diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java index 45179310c23..3d3d9200eb7 100644 --- a/k9mail/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java +++ b/k9mail/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java @@ -5,6 +5,7 @@ import android.net.Uri; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.Multipart; import com.fsck.k9.mail.Part; @@ -15,7 +16,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.*; @@ -26,8 +26,8 @@ @SuppressWarnings("unchecked") -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class AttachmentResolverTest { 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"); diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java index 4cf448e7e59..77e7393c1b9 100644 --- a/k9mail/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java +++ b/k9mail/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java @@ -7,13 +7,13 @@ import java.io.InputStream; import java.io.OutputStream; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mailstore.util.FileFactory; import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.ByteArrayOutputStream; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertArrayEquals; @@ -21,11 +21,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class DeferredFileBodyTest { public static final String TEST_ENCODING = "test-encoding"; public static final byte[] TEST_DATA_SHORT = "test data".getBytes(); diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java index be083023b45..6c22c799723 100644 --- a/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java +++ b/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java @@ -11,6 +11,7 @@ import android.app.Application; import com.fsck.k9.GlobalsHelper; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.activity.K9ActivityCommon; import com.fsck.k9.message.html.HtmlSanitizer; import com.fsck.k9.message.html.HtmlSanitizerHelper; @@ -31,9 +32,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertSame; @@ -42,8 +41,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class MessageViewInfoExtractorTest { public static final String BODY_TEXT = "K-9 Mail rocks :>"; public static final String BODY_TEXT_HTML = "K-9 Mail rocks :>"; diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/MigrationTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/MigrationTest.java index 00db71789db..a5f74fc8fcd 100644 --- a/k9mail/src/test/java/com/fsck/k9/mailstore/MigrationTest.java +++ b/k9mail/src/test/java/com/fsck/k9/mailstore/MigrationTest.java @@ -14,6 +14,7 @@ import com.fsck.k9.Account; import com.fsck.k9.K9; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.Preferences; import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.FetchProfile; @@ -28,14 +29,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.openintents.openpgp.util.OpenPgpUtils; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowSQLiteConnection; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class MigrationTest { Account account; diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/StoreSchemaDefinitionTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/StoreSchemaDefinitionTest.java index df149a54753..0d1ced85d1d 100644 --- a/k9mail/src/test/java/com/fsck/k9/mailstore/StoreSchemaDefinitionTest.java +++ b/k9mail/src/test/java/com/fsck/k9/mailstore/StoreSchemaDefinitionTest.java @@ -15,12 +15,12 @@ import com.fsck.k9.BuildConfig; import com.fsck.k9.GlobalsHelper; import com.fsck.k9.K9; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.R; import com.fsck.k9.mail.MessagingException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; @@ -35,7 +35,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) +@RunWith(K9RobolectricTestRunner.class) @Config(manifest = Config.NONE) public class StoreSchemaDefinitionTest { private StoreSchemaDefinition storeSchemaDefinition; diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/migrations/MigrationMimeStructureStateTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/migrations/MigrationMimeStructureStateTest.java index f0856e25f54..3121f4ed022 100644 --- a/k9mail/src/test/java/com/fsck/k9/mailstore/migrations/MigrationMimeStructureStateTest.java +++ b/k9mail/src/test/java/com/fsck/k9/mailstore/migrations/MigrationMimeStructureStateTest.java @@ -3,16 +3,14 @@ import android.content.ContentValues; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mailstore.migrations.MigrationTo51.MimeStructureState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; -@RunWith(RobolectricTestRunner.class) // required for ContentValues -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) // required for ContentValues public class MigrationMimeStructureStateTest { @Test(expected = IllegalStateException.class) diff --git a/k9mail/src/test/java/com/fsck/k9/message/MessageBuilderTest.java b/k9mail/src/test/java/com/fsck/k9/message/MessageBuilderTest.java index 757c4a7a192..7bed929331e 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/MessageBuilderTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/MessageBuilderTest.java @@ -15,6 +15,7 @@ import com.fsck.k9.Account.QuoteStyle; import com.fsck.k9.Identity; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.activity.misc.Attachment; import com.fsck.k9.mail.Address; import com.fsck.k9.mail.BodyPart; @@ -32,9 +33,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -46,8 +45,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class MessageBuilderTest { public static final String TEST_MESSAGE_TEXT = "soviet message\r\ntext ☭"; public static final String TEST_ATTACHMENT_TEXT = "text data in attachment"; diff --git a/k9mail/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.java b/k9mail/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.java index 19f4cd2b8cd..855c3c5aa04 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.java @@ -17,6 +17,7 @@ import com.fsck.k9.Account.QuoteStyle; import com.fsck.k9.Identity; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.activity.compose.ComposeCryptoStatus; import com.fsck.k9.activity.compose.ComposeCryptoStatus.ComposeCryptoStatusBuilder; import com.fsck.k9.activity.compose.RecipientPresenter.CryptoMode; @@ -46,9 +47,7 @@ import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.util.OpenPgpApi; import org.openintents.openpgp.util.OpenPgpApi.OpenPgpDataSource; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -61,8 +60,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class PgpMessageBuilderTest { private static final long TEST_SIGN_KEY_ID = 123L; private static final long TEST_SELF_ENCRYPT_KEY_ID = 234L; diff --git a/k9mail/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java b/k9mail/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java index f1260727d32..aa5b07b1693 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java @@ -5,6 +5,7 @@ import android.net.Uri; import android.support.annotation.Nullable; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MimeBodyPart; import com.fsck.k9.mail.internet.MimeHeader; @@ -16,20 +17,18 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class AttachmentInfoExtractorTest { public static final Uri TEST_URI = Uri.parse("uri://test"); public static final String TEST_MIME_TYPE = "text/plain"; diff --git a/k9mail/src/test/java/com/fsck/k9/message/extractors/EncryptionDetectorTest.java b/k9mail/src/test/java/com/fsck/k9/message/extractors/EncryptionDetectorTest.java index 7d748464338..15119b46edf 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/extractors/EncryptionDetectorTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/extractors/EncryptionDetectorTest.java @@ -1,12 +1,11 @@ package com.fsck.k9.message.extractors; +import com.fsck.k9.K9RobolectricTestRunner; 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.annotation.Config; import static com.fsck.k9.message.MessageCreationHelper.createMessage; import static com.fsck.k9.message.MessageCreationHelper.createMultipartMessage; @@ -17,8 +16,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class EncryptionDetectorTest { private static final String CRLF = "\r\n"; diff --git a/k9mail/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.java b/k9mail/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.java index a7de3e61f79..6c71bcdea06 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.java @@ -1,20 +1,20 @@ package com.fsck.k9.message.extractors; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MimeBodyPart; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static com.fsck.k9.message.MessageCreationHelper.createTextPart; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class PreviewTextExtractorTest { private PreviewTextExtractor previewTextExtractor; diff --git a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java index 9db158533f5..57e6105e637 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java @@ -6,18 +6,17 @@ import java.io.FileWriter; import java.io.IOException; -import com.fsck.k9.message.html.HtmlConverter; +import com.fsck.k9.K9RobolectricTestRunner; import org.apache.commons.io.IOUtils; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static junit.framework.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class HtmlConverterTest { // 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")); diff --git a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerHelper.java b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerHelper.java index 92fbde07000..3ad0445a4d2 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerHelper.java +++ b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerHelper.java @@ -1,9 +1,6 @@ package com.fsck.k9.message.html; -import com.fsck.k9.message.html.HtmlSanitizer; - - public class HtmlSanitizerHelper { public static HtmlSanitizer getDummyHtmlSanitizer() { return new HtmlSanitizer() { diff --git a/k9mail/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.java b/k9mail/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.java index b7d0c361c12..69d0c861438 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.java @@ -1,18 +1,19 @@ package com.fsck.k9.message.signature; +import com.fsck.k9.K9RobolectricTestRunner; + import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static com.fsck.k9.message.html.HtmlHelper.extractText; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class HtmlSignatureRemoverTest { @Test public void shouldStripSignatureFromK9StyleHtml() throws Exception { diff --git a/k9mail/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java b/k9mail/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java index e9594c2ec9a..1eea7962b5e 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java @@ -1,7 +1,6 @@ package com.fsck.k9.message.signature; -import com.fsck.k9.message.signature.TextSignatureRemover; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationsTest.java index f6f24c97aa9..711bd0ba535 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationsTest.java @@ -9,14 +9,13 @@ import android.support.v4.app.NotificationManagerCompat; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.MockHelper; import com.fsck.k9.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -25,8 +24,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class AuthenticationErrorNotificationsTest { private static final boolean INCOMING = true; private static final boolean OUTGOING = false; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/BaseNotificationsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/BaseNotificationsTest.java index 6ffc0b4e485..a5bb022475b 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/BaseNotificationsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/BaseNotificationsTest.java @@ -7,12 +7,12 @@ import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.K9.NotificationQuickDelete; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.MockHelper; import com.fsck.k9.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertFalse; @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class BaseNotificationsTest { private static final int ACCOUNT_COLOR = 0xAABBCC; private static final String ACCOUNT_NAME = "AccountName"; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationsTest.java index dededdb304f..47ea603138f 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationsTest.java @@ -9,14 +9,13 @@ import android.support.v4.app.NotificationManagerCompat; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.MockHelper; import com.fsck.k9.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -25,8 +24,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class CertificateErrorNotificationsTest { private static final boolean INCOMING = true; private static final boolean OUTGOING = false; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/DeviceNotificationsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/DeviceNotificationsTest.java index cd697961c4f..575809fea03 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/DeviceNotificationsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/DeviceNotificationsTest.java @@ -15,6 +15,7 @@ import com.fsck.k9.K9; import com.fsck.k9.K9.NotificationHideSubject; import com.fsck.k9.K9.NotificationQuickDelete; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.NotificationSetting; import com.fsck.k9.R; import org.junit.Before; @@ -22,9 +23,7 @@ import org.junit.runner.RunWith; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static com.fsck.k9.MockHelper.mockBuilder; import static org.junit.Assert.assertEquals; @@ -35,8 +34,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class DeviceNotificationsTest { private static final int UNREAD_MESSAGE_COUNT = 42; private static final int NEW_MESSAGE_COUNT = 2; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/LockScreenNotificationTest.java b/k9mail/src/test/java/com/fsck/k9/notification/LockScreenNotificationTest.java index e063bf963ed..1355ae0e47f 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/LockScreenNotificationTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/LockScreenNotificationTest.java @@ -11,14 +11,13 @@ import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.K9.LockScreenNotificationVisibility; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.MockHelper; import com.fsck.k9.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -28,8 +27,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class LockScreenNotificationTest { private static final String ACCOUNT_NAME = "Hugo"; private static final int NEW_MESSAGE_COUNT = 3; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/NewMailNotificationsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/NewMailNotificationsTest.java index f41e5dee2fb..5250dd23c70 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/NewMailNotificationsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/NewMailNotificationsTest.java @@ -7,13 +7,12 @@ import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.K9.NotificationHideSubject; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.activity.MessageReference; import com.fsck.k9.mailstore.LocalMessage; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; @@ -26,8 +25,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class NewMailNotificationsTest { private static final int ACCOUNT_NUMBER = 23; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.java b/k9mail/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.java index f814dc6d60c..38147621bb1 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.java @@ -4,6 +4,7 @@ import android.content.Context; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.activity.MessageReference; import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Flag; @@ -13,9 +14,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -23,8 +22,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class NotificationContentCreatorTest { private static final String ACCOUNT_UUID = "1-2-3"; private static final String FOLDER_NAME = "INBOX"; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/NotificationDataTest.java b/k9mail/src/test/java/com/fsck/k9/notification/NotificationDataTest.java index 221c0bacfb9..fc16d3d198a 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/NotificationDataTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/NotificationDataTest.java @@ -4,12 +4,12 @@ import java.util.List; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.activity.MessageReference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; @@ -20,8 +20,8 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class NotificationDataTest { private static final String ACCOUNT_UUID = "1-2-3"; private static final int ACCOUNT_NUMBER = 23; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/NotificationIdsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/NotificationIdsTest.java index 8360da743bc..98a449261b9 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/NotificationIdsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/NotificationIdsTest.java @@ -2,17 +2,18 @@ import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class NotificationIdsTest { private static final boolean INCOMING = true; private static final boolean OUTGOING = false; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/SendFailedNotificationsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/SendFailedNotificationsTest.java index 15d662498dc..897ed4f7695 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/SendFailedNotificationsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/SendFailedNotificationsTest.java @@ -8,14 +8,13 @@ import android.support.v4.app.NotificationManagerCompat; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.MockHelper; import com.fsck.k9.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -25,8 +24,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class SendFailedNotificationsTest { private static final int ACCOUNT_NUMBER = 1; private static final String ACCOUNT_NAME = "TestAccount"; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/SyncNotificationsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/SyncNotificationsTest.java index b11333ef55a..fccf39119c1 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/SyncNotificationsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/SyncNotificationsTest.java @@ -8,15 +8,14 @@ import android.support.v4.app.NotificationManagerCompat; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.MockHelper; import com.fsck.k9.R; import com.fsck.k9.mail.Folder; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -27,8 +26,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class SyncNotificationsTest { private static final int ACCOUNT_NUMBER = 1; private static final String ACCOUNT_NAME = "TestAccount"; diff --git a/k9mail/src/test/java/com/fsck/k9/notification/WearNotificationsTest.java b/k9mail/src/test/java/com/fsck/k9/notification/WearNotificationsTest.java index 9cb34d74c9d..faa925fe030 100644 --- a/k9mail/src/test/java/com/fsck/k9/notification/WearNotificationsTest.java +++ b/k9mail/src/test/java/com/fsck/k9/notification/WearNotificationsTest.java @@ -14,6 +14,7 @@ import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.K9.NotificationQuickDelete; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.MockHelper; import com.fsck.k9.R; import com.fsck.k9.activity.MessageReference; @@ -22,9 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -35,8 +34,7 @@ import static org.mockito.Mockito.when; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class WearNotificationsTest { private static final int ACCOUNT_NUMBER = 42; private static final String ACCOUNT_NAME = "accountName"; diff --git a/k9mail/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.java b/k9mail/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.java index deef3b43665..106a6d11ef4 100644 --- a/k9mail/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.java +++ b/k9mail/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.java @@ -1,12 +1,12 @@ 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -18,8 +18,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class SettingsExporterTest { @Test diff --git a/k9mail/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.java b/k9mail/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.java index 475d016a4db..161d0b613ae 100644 --- a/k9mail/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.java +++ b/k9mail/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.java @@ -7,23 +7,21 @@ import java.util.UUID; import com.fsck.k9.Account; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.Preferences; import com.fsck.k9.mail.AuthType; import org.apache.tools.ant.filters.StringInputStream; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @SuppressWarnings("unchecked") -@RunWith(RobolectricTestRunner.class) -@Config(manifest = "src/main/AndroidManifest.xml", sdk = 21) +@RunWith(K9RobolectricTestRunner.class) public class SettingsImporterTest { @Before diff --git a/k9mail/src/test/java/com/fsck/k9/setup/ServerNameSuggesterTest.java b/k9mail/src/test/java/com/fsck/k9/setup/ServerNameSuggesterTest.java index 1a31dec7b79..7e279d51940 100644 --- a/k9mail/src/test/java/com/fsck/k9/setup/ServerNameSuggesterTest.java +++ b/k9mail/src/test/java/com/fsck/k9/setup/ServerNameSuggesterTest.java @@ -1,18 +1,18 @@ package com.fsck.k9.setup; +import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.mail.ServerSettings.Type; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 21) +@RunWith(K9RobolectricTestRunner.class) +@Config(manifest = Config.NONE) public class ServerNameSuggesterTest { private ServerNameSuggester serverNameSuggester;