From 7d3cea87f919d8ea54f314cacc0333c8097b7fac Mon Sep 17 00:00:00 2001 From: cketti Date: Fri, 19 Dec 2014 23:15:23 +0100 Subject: [PATCH] Use default directory structure for tests-on-jvm subproject --- tests-on-jvm/build.gradle | 9 --------- .../src/{ => test/java}/android/text/TextUtils.java | 0 tests-on-jvm/src/{ => test/java}/android/util/Log.java | 0 tests-on-jvm/src/{ => test/java}/com/fsck/k9/K9.java | 0 .../java}/com/fsck/k9/activity/TextBodyBuilderTest.java | 0 .../{ => test/java}/com/fsck/k9/mail/AddressTest.java | 0 .../java}/com/fsck/k9/mail/Address_quoteAtoms.java | 0 .../k9/mail/filter/EOLConvertingOutputStreamTest.java | 0 .../com/fsck/k9/mail/internet/CharsetSupportTest.java | 0 .../java}/com/fsck/k9/mail/internet/DecoderUtilTest.java | 0 .../com/fsck/k9/mail/internet/MimeMessageParseTest.java | 0 .../java}/com/fsck/k9/mail/internet/MimeUtilityTest.java | 0 .../java}/com/fsck/k9/mail/store/imap/ImapListTest.java | 0 .../fsck/k9/mail/store/imap/ImapResponseParserTest.java | 0 .../com/fsck/k9/mail/store/imap/ImapStoreUriTest.java | 0 .../com/fsck/k9/mail/store/imap/ImapUtilityTest.java | 0 16 files changed, 9 deletions(-) rename tests-on-jvm/src/{ => test/java}/android/text/TextUtils.java (100%) rename tests-on-jvm/src/{ => test/java}/android/util/Log.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/K9.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/activity/TextBodyBuilderTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/AddressTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/Address_quoteAtoms.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/internet/CharsetSupportTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/internet/DecoderUtilTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/internet/MimeMessageParseTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/internet/MimeUtilityTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/store/imap/ImapListTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java (100%) rename tests-on-jvm/src/{ => test/java}/com/fsck/k9/mail/store/imap/ImapUtilityTest.java (100%) diff --git a/tests-on-jvm/build.gradle b/tests-on-jvm/build.gradle index 563a283bd..831e87a39 100644 --- a/tests-on-jvm/build.gradle +++ b/tests-on-jvm/build.gradle @@ -13,20 +13,11 @@ dependencies { } sourceSets { - main { - java { - srcDirs = [] - } - } - test { compileClasspath += files(project(':k9mail').compileDebugJava.destinationDir) compileClasspath += project(':k9mail').compileDebugJava.classpath runtimeClasspath += files(project(':k9mail').compileDebugJava.destinationDir) runtimeClasspath += project(':k9mail').compileDebugJava.classpath - java { - srcDirs = ['src'] - } } } diff --git a/tests-on-jvm/src/android/text/TextUtils.java b/tests-on-jvm/src/test/java/android/text/TextUtils.java similarity index 100% rename from tests-on-jvm/src/android/text/TextUtils.java rename to tests-on-jvm/src/test/java/android/text/TextUtils.java diff --git a/tests-on-jvm/src/android/util/Log.java b/tests-on-jvm/src/test/java/android/util/Log.java similarity index 100% rename from tests-on-jvm/src/android/util/Log.java rename to tests-on-jvm/src/test/java/android/util/Log.java diff --git a/tests-on-jvm/src/com/fsck/k9/K9.java b/tests-on-jvm/src/test/java/com/fsck/k9/K9.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/K9.java rename to tests-on-jvm/src/test/java/com/fsck/k9/K9.java diff --git a/tests-on-jvm/src/com/fsck/k9/activity/TextBodyBuilderTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/activity/TextBodyBuilderTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/activity/TextBodyBuilderTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/activity/TextBodyBuilderTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/AddressTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/AddressTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/Address_quoteAtoms.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/Address_quoteAtoms.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/CharsetSupportTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/internet/CharsetSupportTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/DecoderUtilTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/internet/DecoderUtilTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/MimeMessageParseTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/internet/MimeMessageParseTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/MimeUtilityTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/internet/MimeUtilityTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapListTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapListTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java similarity index 100% rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java