From a24d85d754dcdcd4499c67abc4ebeb5e335d14fe Mon Sep 17 00:00:00 2001 From: cketti Date: Wed, 20 May 2015 23:48:30 +0200 Subject: [PATCH] Move library tests to k9mail-library module --- k9mail-library/build.gradle | 14 ++++++++++++++ .../java/com/fsck/k9/mail/MessageTest.java | 0 .../java/com/fsck/k9/mail/PgpMimeMessageTest.java | 0 .../com/fsck/k9/mail/ReconstructMessageTest.java | 0 .../fsck/k9/mail/ssl/TrustManagerFactoryTest.java | 0 .../test/java/com/fsck/k9/mail/AddressTest.java | 0 .../java/com/fsck/k9/mail/Address_quoteAtoms.java | 0 .../mail/filter/EOLConvertingOutputStreamTest.java | 0 .../fsck/k9/mail/internet/CharsetSupportTest.java | 0 .../com/fsck/k9/mail/internet/DecoderUtilTest.java | 0 .../k9/mail/internet/MimeMessageParseTest.java | 0 .../com/fsck/k9/mail/internet/MimeUtilityTest.java | 0 .../com/fsck/k9/mail/store/imap/ImapListTest.java | 0 .../k9/mail/store/imap/ImapResponseParserTest.java | 0 .../fsck/k9/mail/store/imap/ImapStoreUriTest.java | 0 .../fsck/k9/mail/store/imap/ImapUtilityTest.java | 0 k9mail/build.gradle | 1 - 17 files changed, 14 insertions(+), 1 deletion(-) rename {k9mail => k9mail-library}/src/androidTest/java/com/fsck/k9/mail/MessageTest.java (100%) rename {k9mail => k9mail-library}/src/androidTest/java/com/fsck/k9/mail/PgpMimeMessageTest.java (100%) rename {k9mail => k9mail-library}/src/androidTest/java/com/fsck/k9/mail/ReconstructMessageTest.java (100%) rename {k9mail => k9mail-library}/src/androidTest/java/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/AddressTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java (100%) rename {k9mail => k9mail-library}/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java (100%) diff --git a/k9mail-library/build.gradle b/k9mail-library/build.gradle index b32294f08..f95a158f6 100644 --- a/k9mail-library/build.gradle +++ b/k9mail-library/build.gradle @@ -12,6 +12,17 @@ dependencies { compile 'commons-io:commons-io:2.4' compile 'com.jcraft:jzlib:1.0.7' compile 'com.beetstra.jutf7:jutf7:1.0.0' + + androidTestCompile 'com.android.support.test:testing-support-lib:0.1' + androidTestCompile 'com.madgag.spongycastle:pg:1.51.0.0' + + testCompile('org.robolectric:robolectric:3.0-rc3') { + exclude group: 'org.hamcrest', module: 'hamcrest-core' + } + testCompile 'org.hamcrest:hamcrest-core:1.3' + testCompile('junit:junit:4.10') { + exclude group: 'org.hamcrest', module: 'hamcrest-core' + } } android { @@ -21,6 +32,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 21 + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } lintOptions { @@ -40,5 +53,6 @@ android { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE' exclude 'META-INF/NOTICE.txt' + exclude 'LICENSE.txt' } } diff --git a/k9mail/src/androidTest/java/com/fsck/k9/mail/MessageTest.java b/k9mail-library/src/androidTest/java/com/fsck/k9/mail/MessageTest.java similarity index 100% rename from k9mail/src/androidTest/java/com/fsck/k9/mail/MessageTest.java rename to k9mail-library/src/androidTest/java/com/fsck/k9/mail/MessageTest.java diff --git a/k9mail/src/androidTest/java/com/fsck/k9/mail/PgpMimeMessageTest.java b/k9mail-library/src/androidTest/java/com/fsck/k9/mail/PgpMimeMessageTest.java similarity index 100% rename from k9mail/src/androidTest/java/com/fsck/k9/mail/PgpMimeMessageTest.java rename to k9mail-library/src/androidTest/java/com/fsck/k9/mail/PgpMimeMessageTest.java diff --git a/k9mail/src/androidTest/java/com/fsck/k9/mail/ReconstructMessageTest.java b/k9mail-library/src/androidTest/java/com/fsck/k9/mail/ReconstructMessageTest.java similarity index 100% rename from k9mail/src/androidTest/java/com/fsck/k9/mail/ReconstructMessageTest.java rename to k9mail-library/src/androidTest/java/com/fsck/k9/mail/ReconstructMessageTest.java diff --git a/k9mail/src/androidTest/java/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java b/k9mail-library/src/androidTest/java/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java similarity index 100% rename from k9mail/src/androidTest/java/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java rename to k9mail-library/src/androidTest/java/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/AddressTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/AddressTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java b/k9mail-library/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java diff --git a/k9mail/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 similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java diff --git a/k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java diff --git a/k9mail/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 similarity index 100% rename from k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java rename to k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java diff --git a/k9mail/build.gradle b/k9mail/build.gradle index ff71994bd..c667e60a4 100644 --- a/k9mail/build.gradle +++ b/k9mail/build.gradle @@ -24,7 +24,6 @@ dependencies { androidTestCompile('com.icegreen:greenmail:1.4.1') { exclude group: 'junit' } - androidTestCompile 'com.madgag.spongycastle:pg:1.51.0.0' testCompile('org.robolectric:robolectric:3.0-rc3') { exclude group: 'org.hamcrest', module: 'hamcrest-core'