From d16b09b2a6be41319b993c27e69b85067a7f1c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 11 Jun 2015 00:05:13 +0200 Subject: [PATCH] Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds --- OpenKeychain-Test/build.gradle | 121 ------------------ OpenKeychain/build.gradle | 16 ++- .../operations/CertifyOperationTest.java | 49 +++---- .../keychain/operations/ExportTest.java | 14 +- .../operations/PromoteKeyOperationTest.java | 28 ++-- .../keychain/pgp/KeyRingTest.java | 7 +- .../keychain/pgp/PgpEncryptDecryptTest.java | 52 ++++---- .../keychain/pgp/PgpKeyOperationTest.java | 6 +- .../pgp/UncachedKeyringCanonicalizeTest.java | 7 +- .../pgp/UncachedKeyringMergeTest.java | 7 +- .../keychain/pgp/UncachedKeyringTest.java | 7 +- .../provider/ProviderHelperKeyringTest.java | 14 +- .../provider/ProviderHelperSaveTest.java | 26 ++-- .../keychain/support/KeyringBuilder.java | 0 .../support/KeyringTestingHelper.java | 0 .../keychain/support/ProviderHelperStub.java | 0 .../keychain/support/TestDataUtil.java | 0 .../keychain/util/Iso7816TLVTest.java | 7 +- .../util/ParcelableFileCacheTest.java | 10 +- .../keychain/util/TestingUtils.java | 0 .../test/resources/OpenPGP-Haskell/COPYING | 0 .../src/test/resources/OpenPGP-Haskell/README | 0 .../tests/data/000001-006.public_key | Bin .../tests/data/000002-013.user_id | 0 .../OpenPGP-Haskell/tests/data/000003-002.sig | Bin .../tests/data/000004-012.ring_trust | Bin .../OpenPGP-Haskell/tests/data/000005-002.sig | Bin .../tests/data/000006-012.ring_trust | Bin .../OpenPGP-Haskell/tests/data/000007-002.sig | Bin .../tests/data/000008-012.ring_trust | Bin .../OpenPGP-Haskell/tests/data/000009-002.sig | Bin .../tests/data/000010-012.ring_trust | Bin .../OpenPGP-Haskell/tests/data/000011-002.sig | Bin .../tests/data/000012-012.ring_trust | Bin .../tests/data/000013-014.public_subkey | Bin .../OpenPGP-Haskell/tests/data/000014-002.sig | Bin .../tests/data/000015-012.ring_trust | Bin .../tests/data/000016-006.public_key | Bin .../OpenPGP-Haskell/tests/data/000017-002.sig | Bin .../tests/data/000018-012.ring_trust | Bin .../tests/data/000019-013.user_id | 0 .../OpenPGP-Haskell/tests/data/000020-002.sig | Bin .../tests/data/000021-012.ring_trust | Bin .../OpenPGP-Haskell/tests/data/000022-002.sig | Bin .../tests/data/000023-012.ring_trust | Bin .../tests/data/000024-014.public_subkey | Bin .../OpenPGP-Haskell/tests/data/000025-002.sig | Bin .../tests/data/000026-012.ring_trust | Bin .../tests/data/000027-006.public_key | Bin .../OpenPGP-Haskell/tests/data/000028-002.sig | Bin .../tests/data/000029-012.ring_trust | Bin .../tests/data/000030-013.user_id | 0 .../OpenPGP-Haskell/tests/data/000031-002.sig | Bin .../tests/data/000032-012.ring_trust | Bin .../OpenPGP-Haskell/tests/data/000033-002.sig | Bin .../tests/data/000034-012.ring_trust | Bin .../tests/data/000035-006.public_key | Bin .../tests/data/000036-013.user_id | 0 .../OpenPGP-Haskell/tests/data/000037-002.sig | Bin .../tests/data/000038-012.ring_trust | Bin .../OpenPGP-Haskell/tests/data/000039-002.sig | Bin .../tests/data/000040-012.ring_trust | Bin .../tests/data/000041-017.attribute | Bin .../OpenPGP-Haskell/tests/data/000042-002.sig | Bin .../tests/data/000043-012.ring_trust | Bin .../tests/data/000044-014.public_subkey | Bin .../OpenPGP-Haskell/tests/data/000045-002.sig | Bin .../tests/data/000046-012.ring_trust | Bin .../tests/data/000047-005.secret_key | Bin .../tests/data/000048-013.user_id | 0 .../OpenPGP-Haskell/tests/data/000049-002.sig | Bin .../tests/data/000050-012.ring_trust | Bin .../tests/data/000051-007.secret_subkey | Bin .../OpenPGP-Haskell/tests/data/000052-002.sig | Bin .../tests/data/000053-012.ring_trust | Bin .../tests/data/000054-005.secret_key | Bin .../OpenPGP-Haskell/tests/data/000055-002.sig | Bin .../tests/data/000056-012.ring_trust | Bin .../tests/data/000057-013.user_id | 0 .../OpenPGP-Haskell/tests/data/000058-002.sig | Bin .../tests/data/000059-012.ring_trust | Bin .../tests/data/000060-007.secret_subkey | Bin .../OpenPGP-Haskell/tests/data/000061-002.sig | Bin .../tests/data/000062-012.ring_trust | Bin .../tests/data/000063-005.secret_key | Bin .../OpenPGP-Haskell/tests/data/000064-002.sig | Bin .../tests/data/000065-012.ring_trust | Bin .../tests/data/000066-013.user_id | 0 .../OpenPGP-Haskell/tests/data/000067-002.sig | Bin .../tests/data/000068-012.ring_trust | Bin .../tests/data/000069-005.secret_key | Bin .../tests/data/000070-013.user_id | 0 .../OpenPGP-Haskell/tests/data/000071-002.sig | Bin .../tests/data/000072-012.ring_trust | Bin .../tests/data/000073-017.attribute | Bin .../OpenPGP-Haskell/tests/data/000074-002.sig | Bin .../tests/data/000075-012.ring_trust | Bin .../tests/data/000076-007.secret_subkey | Bin .../OpenPGP-Haskell/tests/data/000077-002.sig | Bin .../tests/data/000078-012.ring_trust | Bin .../OpenPGP-Haskell/tests/data/002182-002.sig | Bin .../tests/data/3F5BBA0B0694BEB6000005-002.sig | Bin .../tests/data/3F5BBA0B0694BEB6000017-002.sig | Bin .../tests/data/compressedsig-bzip2.gpg | Bin .../tests/data/compressedsig-zlib.gpg | Bin .../tests/data/compressedsig.gpg | Bin .../OpenPGP-Haskell/tests/data/onepass_sig | Bin .../OpenPGP-Haskell/tests/data/pubring.gpg | Bin .../OpenPGP-Haskell/tests/data/secring.gpg | Bin .../tests/data/symmetrically_encrypted | Bin .../data/uncompressed-ops-dsa-sha384.txt.gpg | Bin .../tests/data/uncompressed-ops-dsa.gpg | Bin .../tests/data/uncompressed-ops-rsa.gpg | Bin .../resources/public-key-canonicalize.blob | Bin .../test/resources/public-key-for-sample.blob | Bin .../src/test/resources/sample-altered.txt | 0 .../src/test/resources/sample.txt | 0 .../test-keys/bad_user_id_encoding.asc | 0 .../test-keys/broken_cert_version.asc | 0 ...669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc | 0 ...5120427374F3F7AA5F1166DDA252EBB8EBE1AF.asc | 0 .../resources/test-keys/cooperpair/readme | 0 .../test-keys/divert_to_card_sec.asc | 0 .../test-keys/mailvelope_07_no_key_flags.asc | 0 .../resources/test-keys/stripped_flags.asc | 0 .../resources/test-keys/symantec_public.asc | 0 .../resources/test-keys/symantec_secret.asc | 0 README.md | 3 +- build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 4 +- settings.gradle | 1 - 131 files changed, 151 insertions(+), 234 deletions(-) delete mode 100644 OpenKeychain-Test/build.gradle rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java (86%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java (94%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/operations/PromoteKeyOperationTest.java (86%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/pgp/KeyRingTest.java (87%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java (93%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java (99%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java (99%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java (98%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java (95%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java (82%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java (90%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/support/KeyringBuilder.java (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/support/KeyringTestingHelper.java (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/support/ProviderHelperStub.java (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/support/TestDataUtil.java (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/util/Iso7816TLVTest.java (94%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java (86%) rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/util/TestingUtils.java (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/COPYING (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/README (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/public-key-canonicalize.blob (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/public-key-for-sample.blob (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/sample-altered.txt (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/sample.txt (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/bad_user_id_encoding.asc (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/broken_cert_version.asc (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/cooperpair/9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/cooperpair/A55120427374F3F7AA5F1166DDA252EBB8EBE1AF.asc (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/cooperpair/readme (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/divert_to_card_sec.asc (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/mailvelope_07_no_key_flags.asc (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/stripped_flags.asc (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/symantec_public.asc (100%) rename {OpenKeychain-Test => OpenKeychain}/src/test/resources/test-keys/symantec_secret.asc (100%) diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle deleted file mode 100644 index 2bf35b3d1..000000000 --- a/OpenKeychain-Test/build.gradle +++ /dev/null @@ -1,121 +0,0 @@ -buildscript { - repositories { - jcenter() - } - - dependencies { - // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information - classpath 'com.novoda:gradle-android-test-plugin:0.10.4' - } -} - -apply plugin: 'java' -apply plugin: 'android-test' -apply plugin: 'jacoco' - -dependencies { - testCompile 'junit:junit:4.11' - testCompile 'com.google.android:android:4.1.1.4' - testCompile('com.squareup:fest-android:1.0.8') { exclude module: 'support-v4' } - testCompile 'org.apache.maven:maven-ant-tasks:2.1.3' - testCompile ('org.robolectric:robolectric:2.4') { - exclude module: 'classworlds' - exclude module: 'maven-artifact' - exclude module: 'maven-artifact-manager' - exclude module: 'maven-error-diagnostics' - exclude module: 'maven-model' - exclude module: 'maven-plugin-registry' - exclude module: 'maven-profile' - exclude module: 'maven-project' - exclude module: 'maven-settings' - exclude module: 'nekohtml' - exclude module: 'plexus-container-default' - exclude module: 'plexus-interpolation' - exclude module: 'plexus-utils' - exclude module: 'support-v4' // crazy but my android studio don't like this dependency and to fix it remove .idea and re import project - exclude module: 'wagon-file' - exclude module: 'wagon-http-lightweight' - exclude module: 'wagon-http-shared' - exclude module: 'wagon-provider-api' - } -} - -test { - exclude '**/*$*' -} - -android { - projectUnderTest ':OpenKeychain' -} - -jacoco { - toolVersion = "0.7.2.201409121644" -} - - -def coverageSourceDirs = [ - '../OpenKeychain/src/main/java', - '../OpenKeychain/src/gen', - '../OpenKeychain/build/source/apt/debug', - '../OpenKeychain/build/source/generated/buildConfig/debug', - '../OpenKeychain/build/source/generated/r/debug' - ] - -jacocoTestReport { - reports { - xml.enabled = true - html.destination "${buildDir}/jacocoHtml" - } - // class R is used, but usage will not be covered, so ignore this class from report - classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ]) - additionalSourceDirs = files(coverageSourceDirs) - executionData = files('build/jacoco/testDebug.exec') -} - -// new workaround to force add custom output dirs for android studio -task addTest { - def file = file(project.name + ".iml") - doLast { - try { - def parsedXml = (new XmlParser()).parse(file) - def node = parsedXml.component[1] - def outputNode = parsedXml.component[1].output[0] - def outputTestNode = parsedXml.component[1].'output-test'[0] - def rewrite = false - - new Node(node, 'sourceFolder', ['url': 'file://$MODULE_DIR$/' + "${it}", 'isTestSource': "true"]) - - if(outputNode == null) { - new Node(node, 'output', ['url': 'file://$MODULE_DIR$/build/resources/testDebug']) - } else { - if(outputNode.attributes['url'] != 'file://$MODULE_DIR$/build/resources/testDebug') { - outputNode.attributes = ['url': 'file://$MODULE_DIR$/build/resources/testDebug'] - rewrite = true - } - } - - if(outputTestNode == null) { - new Node(node, 'output-test', ['url': 'file://$MODULE_DIR$/build/test-classes/debug']) - } else { - if(outputTestNode.attributes['url'] != 'file://$MODULE_DIR$/build/test-classes/debug') { - outputTestNode.attributes = ['url': 'file://$MODULE_DIR$/build/test-classes/debug'] - rewrite = true - } - } - - if(rewrite) { - def writer = new StringWriter() - new XmlNodePrinter(new PrintWriter(writer)).print(parsedXml) - file.text = writer.toString() - } - } catch (FileNotFoundException e) { - // iml not found, common on command line only builds - } - - } -} - -// always do the addtest on prebuild -gradle.projectsEvaluated { - testDebugClasses.dependsOn(addTest) -} diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index ad31dc48d..e84c2107c 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -10,8 +10,18 @@ dependencies { compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.android.support:recyclerview-v7:22.1.0' compile 'com.android.support:cardview-v7:22.1.0' + + // Local Unit tests with Robolectric + // https://developer.android.com/training/testing/unit-testing/local-unit-tests.html#run + // https://github.com/nenick/AndroidStudioAndRobolectric + // http://www.vogella.com/tutorials/Robolectric/article.html + testCompile 'junit:junit:4.12' + testCompile 'org.hamcrest:hamcrest-core:1.1' + testCompile 'org.hamcrest:hamcrest-library:1.1' + testCompile 'org.hamcrest:hamcrest-integration:1.1' + testCompile "org.robolectric:robolectric:3.0-rc3" - // UI testing libs + // UI testing with Espresso androidTestCompile 'com.android.support.test:runner:0.2' androidTestCompile 'com.android.support.test:rules:0.2' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.1' @@ -137,7 +147,7 @@ android { resValue "string", "tempstorage_authority", "org.sufficientlysecure.keychain.tempstorage" } - extra { + /*extra { applicationIdSuffix ".debug" // Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE. @@ -149,7 +159,7 @@ android { resValue "string", "account_type", "org.sufficientlysecure.keychain.debug.account" resValue "string", "provider_authority", "org.sufficientlysecure.keychain.debug.provider" resValue "string", "tempstorage_authority", "org.sufficientlysecure.keychain.debug.tempstorage" - } + }*/ } /* diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java similarity index 86% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java index 130b86908..3e1c6a54b 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java @@ -22,22 +22,19 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.operations.results.CertifyResult; import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; -import org.sufficientlysecure.keychain.operations.results.ExportResult; -import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; -import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify; import org.sufficientlysecure.keychain.pgp.PgpKeyOperation; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; -import org.sufficientlysecure.keychain.pgp.UncachedKeyRing.IteratorWithIOThrow; -import org.sufficientlysecure.keychain.pgp.WrappedSignature; import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute; import org.sufficientlysecure.keychain.provider.KeychainContract.Certs; import org.sufficientlysecure.keychain.provider.ProviderHelper; @@ -47,23 +44,17 @@ import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; -import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.Passphrase; import org.sufficientlysecure.keychain.util.ProgressScaler; import org.sufficientlysecure.keychain.util.TestingUtils; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; import java.io.PrintStream; import java.security.Security; import java.util.ArrayList; -import java.util.Iterator; import java.util.Random; - -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class CertifyOperationTest { static UncachedKeyRing mStaticRing1, mStaticRing2; @@ -128,7 +119,7 @@ public class CertifyOperationTest { @Before public void setUp() throws Exception { - ProviderHelper providerHelper = new ProviderHelper(Robolectric.application); + ProviderHelper providerHelper = new ProviderHelper(RuntimeEnvironment.application); // don't log verbosely here, we're not here to test imports ShadowLog.stream = oldShadowStream; @@ -143,7 +134,7 @@ public class CertifyOperationTest { @Test public void testSelfCertifyFlag() throws Exception { - CanonicalizedPublicKeyRing ring = new ProviderHelper(Robolectric.application) + CanonicalizedPublicKeyRing ring = new ProviderHelper(RuntimeEnvironment.application) .getCanonicalizedPublicKeyRing(mStaticRing1.getMasterKeyId()); Assert.assertEquals("secret key must be marked self-certified in database", // TODO this should be more correctly be VERIFIED_SELF at some point! @@ -153,11 +144,11 @@ public class CertifyOperationTest { @Test public void testCertifyId() throws Exception { - CertifyOperation op = new CertifyOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null, null); + CertifyOperation op = new CertifyOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null, null); { - CanonicalizedPublicKeyRing ring = new ProviderHelper(Robolectric.application) + CanonicalizedPublicKeyRing ring = new ProviderHelper(RuntimeEnvironment.application) .getCanonicalizedPublicKeyRing(mStaticRing2.getMasterKeyId()); Assert.assertEquals("public key must not be marked verified prior to certification", Certs.UNVERIFIED, ring.getVerified()); @@ -171,7 +162,7 @@ public class CertifyOperationTest { Assert.assertTrue("certification must succeed", result.success()); { - CanonicalizedPublicKeyRing ring = new ProviderHelper(Robolectric.application) + CanonicalizedPublicKeyRing ring = new ProviderHelper(RuntimeEnvironment.application) .getCanonicalizedPublicKeyRing(mStaticRing2.getMasterKeyId()); Assert.assertEquals("new key must be verified now", Certs.VERIFIED_SECRET, ring.getVerified()); @@ -181,11 +172,11 @@ public class CertifyOperationTest { @Test public void testCertifyAttribute() throws Exception { - CertifyOperation op = new CertifyOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null, null); + CertifyOperation op = new CertifyOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null, null); { - CanonicalizedPublicKeyRing ring = new ProviderHelper(Robolectric.application) + CanonicalizedPublicKeyRing ring = new ProviderHelper(RuntimeEnvironment.application) .getCanonicalizedPublicKeyRing(mStaticRing2.getMasterKeyId()); Assert.assertEquals("public key must not be marked verified prior to certification", Certs.UNVERIFIED, ring.getVerified()); @@ -199,7 +190,7 @@ public class CertifyOperationTest { Assert.assertTrue("certification must succeed", result.success()); { - CanonicalizedPublicKeyRing ring = new ProviderHelper(Robolectric.application) + CanonicalizedPublicKeyRing ring = new ProviderHelper(RuntimeEnvironment.application) .getCanonicalizedPublicKeyRing(mStaticRing2.getMasterKeyId()); Assert.assertEquals("new key must be verified now", Certs.VERIFIED_SECRET, ring.getVerified()); @@ -210,8 +201,8 @@ public class CertifyOperationTest { @Test public void testCertifySelf() throws Exception { - CertifyOperation op = new CertifyOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null, null); + CertifyOperation op = new CertifyOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null, null); CertifyActionsParcel actions = new CertifyActionsParcel(mStaticRing1.getMasterKeyId()); actions.add(new CertifyAction(mStaticRing1.getMasterKeyId(), @@ -227,8 +218,8 @@ public class CertifyOperationTest { @Test public void testCertifyNonexistent() throws Exception { - CertifyOperation op = new CertifyOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null, null); + CertifyOperation op = new CertifyOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null, null); { CertifyActionsParcel actions = new CertifyActionsParcel(mStaticRing1.getMasterKeyId()); diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java similarity index 94% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java index 23ea356c8..34420e736 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java @@ -23,10 +23,14 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; import org.sufficientlysecure.keychain.operations.results.ExportResult; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; @@ -48,8 +52,8 @@ import java.io.PrintStream; import java.security.Security; import java.util.Iterator; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class ExportTest { static Passphrase mPassphrase = TestingUtils.genPassphrase(true); @@ -108,7 +112,7 @@ public class ExportTest { @Before public void setUp() { - ProviderHelper providerHelper = new ProviderHelper(Robolectric.application); + ProviderHelper providerHelper = new ProviderHelper(RuntimeEnvironment.application); // don't log verbosely here, we're not here to test imports ShadowLog.stream = oldShadowStream; @@ -122,8 +126,8 @@ public class ExportTest { @Test public void testExportAll() throws Exception { - ImportExportOperation op = new ImportExportOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + ImportExportOperation op = new ImportExportOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); // make sure there is a local cert (so the later checks that there are none are meaningful) Assert.assertTrue("second keyring has local certification", checkForLocal(mStaticRing2)); diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/PromoteKeyOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/PromoteKeyOperationTest.java similarity index 86% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/PromoteKeyOperationTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/PromoteKeyOperationTest.java index 2ca904656..eebad4c6e 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/PromoteKeyOperationTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/PromoteKeyOperationTest.java @@ -23,11 +23,15 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.util.encoders.Hex; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; import org.sufficientlysecure.keychain.operations.results.PromoteKeyResult; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; @@ -50,8 +54,8 @@ import java.io.PrintStream; import java.security.Security; import java.util.Iterator; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class PromoteKeyOperationTest { static UncachedKeyRing mStaticRing; @@ -89,7 +93,7 @@ public class PromoteKeyOperationTest { @Before public void setUp() throws Exception { - ProviderHelper providerHelper = new ProviderHelper(Robolectric.application); + ProviderHelper providerHelper = new ProviderHelper(RuntimeEnvironment.application); // don't log verbosely here, we're not here to test imports ShadowLog.stream = oldShadowStream; @@ -102,15 +106,15 @@ public class PromoteKeyOperationTest { @Test public void testPromote() throws Exception { - PromoteKeyOperation op = new PromoteKeyOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null, null); + PromoteKeyOperation op = new PromoteKeyOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null, null); PromoteKeyResult result = op.execute(mStaticRing.getMasterKeyId(), null, null); Assert.assertTrue("promotion must succeed", result.success()); { - CachedPublicKeyRing ring = new ProviderHelper(Robolectric.application) + CachedPublicKeyRing ring = new ProviderHelper(RuntimeEnvironment.application) .getCachedPublicKeyRing(mStaticRing.getMasterKeyId()); Assert.assertTrue("key must have a secret now", ring.hasAnySecret()); @@ -126,8 +130,8 @@ public class PromoteKeyOperationTest { @Test public void testPromoteDivert() throws Exception { - PromoteKeyOperation op = new PromoteKeyOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null, null); + PromoteKeyOperation op = new PromoteKeyOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null, null); byte[] aid = Hex.decode("D2760001240102000000012345670000"); @@ -136,7 +140,7 @@ public class PromoteKeyOperationTest { Assert.assertTrue("promotion must succeed", result.success()); { - CanonicalizedSecretKeyRing ring = new ProviderHelper(Robolectric.application) + CanonicalizedSecretKeyRing ring = new ProviderHelper(RuntimeEnvironment.application) .getCanonicalizedSecretKeyRing(mStaticRing.getMasterKeyId()); for (CanonicalizedSecretKey key : ring.secretKeyIterator()) { @@ -151,8 +155,8 @@ public class PromoteKeyOperationTest { @Test public void testPromoteDivertSpecific() throws Exception { - PromoteKeyOperation op = new PromoteKeyOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null, null); + PromoteKeyOperation op = new PromoteKeyOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null, null); byte[] aid = Hex.decode("D2760001240102000000012345670000"); @@ -166,7 +170,7 @@ public class PromoteKeyOperationTest { Assert.assertTrue("promotion must succeed", result.success()); { - CanonicalizedSecretKeyRing ring = new ProviderHelper(Robolectric.application) + CanonicalizedSecretKeyRing ring = new ProviderHelper(RuntimeEnvironment.application) .getCanonicalizedSecretKeyRing(mStaticRing.getMasterKeyId()); for (CanonicalizedSecretKey key : ring.secretKeyIterator()) { diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/KeyRingTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/KeyRingTest.java similarity index 87% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/KeyRingTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/KeyRingTest.java index 6656c5131..fa597c57a 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/KeyRingTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/KeyRingTest.java @@ -20,10 +20,13 @@ package org.sufficientlysecure.keychain.pgp; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; +import org.sufficientlysecure.keychain.BuildConfig; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class KeyRingTest { @Test diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java similarity index 93% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java index c7ed9fb30..47b0a3e26 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java @@ -25,10 +25,12 @@ import org.junit.runner.RunWith; import org.openintents.openpgp.OpenPgpMetadata; import org.openintents.openpgp.OpenPgpSignatureResult; import org.robolectric.*; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.openpgp.PGPEncryptedData; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; import org.sufficientlysecure.keychain.operations.results.PgpSignEncryptResult; @@ -52,8 +54,8 @@ import java.io.PrintStream; import java.security.Security; import java.util.HashSet; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class PgpEncryptDecryptTest { static Passphrase mPassphrase = TestingUtils.genPassphrase(true); @@ -112,7 +114,7 @@ public class PgpEncryptDecryptTest { @Before public void setUp() { - ProviderHelper providerHelper = new ProviderHelper(Robolectric.application); + ProviderHelper providerHelper = new ProviderHelper(RuntimeEnvironment.application); // don't log verbosely here, we're not here to test imports ShadowLog.stream = oldShadowStream; @@ -134,8 +136,8 @@ public class PgpEncryptDecryptTest { ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayInputStream in = new ByteArrayInputStream(plaintext.getBytes()); - PgpSignEncryptOperation op = new PgpSignEncryptOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpSignEncryptOperation op = new PgpSignEncryptOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); InputData data = new InputData(in, in.available()); @@ -156,8 +158,8 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(ciphertext); InputData data = new InputData(in, in.available()); - PgpDecryptVerify op = new PgpDecryptVerify(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpDecryptVerify op = new PgpDecryptVerify(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(); input.setAllowSymmetricDecryption(true); DecryptVerifyResult result = op.execute( @@ -179,8 +181,8 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(ciphertext); InputData data = new InputData(in, in.available()); - PgpDecryptVerify op = new PgpDecryptVerify(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpDecryptVerify op = new PgpDecryptVerify(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(); input.setAllowSymmetricDecryption(true); DecryptVerifyResult result = op.execute(input, @@ -198,8 +200,8 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(ciphertext); InputData data = new InputData(in, in.available()); - PgpDecryptVerify op = new PgpDecryptVerify(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpDecryptVerify op = new PgpDecryptVerify(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(); input.setAllowSymmetricDecryption(true); DecryptVerifyResult result = op.execute(input, @@ -216,8 +218,8 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(ciphertext); InputData data = new InputData(in, in.available()); - PgpDecryptVerify op = new PgpDecryptVerify(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpDecryptVerify op = new PgpDecryptVerify(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(); input.setAllowSymmetricDecryption(false); DecryptVerifyResult result = op.execute(input, @@ -240,8 +242,8 @@ public class PgpEncryptDecryptTest { ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayInputStream in = new ByteArrayInputStream(plaintext.getBytes()); - PgpSignEncryptOperation op = new PgpSignEncryptOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpSignEncryptOperation op = new PgpSignEncryptOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); InputData data = new InputData(in, in.available()); PgpSignEncryptInputParcel input = new PgpSignEncryptInputParcel(); @@ -321,8 +323,8 @@ public class PgpEncryptDecryptTest { ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayInputStream in = new ByteArrayInputStream(plaintext.getBytes()); - PgpSignEncryptOperation op = new PgpSignEncryptOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpSignEncryptOperation op = new PgpSignEncryptOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); InputData data = new InputData(in, in.available()); @@ -406,7 +408,7 @@ public class PgpEncryptDecryptTest { { // decryption with passphrase cached should succeed for the other key if first is gone // delete first key from database - new ProviderHelper(Robolectric.application).getContentResolver().delete( + new ProviderHelper(RuntimeEnvironment.application).getContentResolver().delete( KeyRingData.buildPublicKeyRingUri(mStaticRing1.getMasterKeyId()), null, null ); @@ -437,8 +439,8 @@ public class PgpEncryptDecryptTest { ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayInputStream in = new ByteArrayInputStream(plaintext.getBytes()); - PgpSignEncryptOperation op = new PgpSignEncryptOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpSignEncryptOperation op = new PgpSignEncryptOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); InputData data = new InputData(in, in.available()); PgpSignEncryptInputParcel b = new PgpSignEncryptInputParcel(); @@ -482,7 +484,7 @@ public class PgpEncryptDecryptTest { { // decryption with passphrase cached should succeed for the other key if first is gone // delete first key from database - new ProviderHelper(Robolectric.application).getContentResolver().delete( + new ProviderHelper(RuntimeEnvironment.application).getContentResolver().delete( KeyRingData.buildPublicKeyRingUri(mStaticRing1.getMasterKeyId()), null, null ); @@ -520,8 +522,8 @@ public class PgpEncryptDecryptTest { ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayInputStream in = new ByteArrayInputStream(plaindata); - PgpSignEncryptOperation op = new PgpSignEncryptOperation(Robolectric.application, - new ProviderHelper(Robolectric.application), null); + PgpSignEncryptOperation op = new PgpSignEncryptOperation(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null); InputData data = new InputData(in, in.available()); PgpSignEncryptInputParcel b = new PgpSignEncryptInputParcel(); @@ -562,8 +564,8 @@ public class PgpEncryptDecryptTest { private PgpDecryptVerify operationWithFakePassphraseCache( final Passphrase passphrase, final Long checkMasterKeyId, final Long checkSubKeyId) { - return new PgpDecryptVerify(Robolectric.application, - new ProviderHelper(Robolectric.application), null) { + return new PgpDecryptVerify(RuntimeEnvironment.application, + new ProviderHelper(RuntimeEnvironment.application), null) { @Override public Passphrase getCachedPassphrase(long masterKeyId, long subKeyId) throws NoSecretKeyException { diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java similarity index 99% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java index e74b84dfb..1208c77f5 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java @@ -26,6 +26,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.robolectric.*; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.BCPGInputStream; import org.spongycastle.bcpg.Packet; @@ -40,6 +41,7 @@ import org.spongycastle.bcpg.UserIDPacket; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.openpgp.PGPSignature; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; @@ -70,8 +72,8 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class PgpKeyOperationTest { static UncachedKeyRing staticRing; diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java similarity index 99% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java index 2b184c075..2aa410e22 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java @@ -23,7 +23,9 @@ import org.junit.runner.RunWith; import org.junit.Assert; import org.junit.Test; import org.junit.Before; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.BCPGInputStream; import org.spongycastle.bcpg.HashAlgorithmTags; @@ -51,6 +53,7 @@ import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBu import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; import org.spongycastle.util.Strings; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; @@ -78,8 +81,8 @@ import java.util.Iterator; * Test cases are made for all its assertions. */ -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class UncachedKeyringCanonicalizeTest { static UncachedKeyRing staticRing; diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java similarity index 98% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java index 755a0b00d..33dae2225 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java @@ -23,7 +23,9 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.BCPGInputStream; import org.spongycastle.bcpg.PacketTags; @@ -32,6 +34,7 @@ import org.spongycastle.bcpg.SecretKeyPacket; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.util.Strings; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; @@ -77,8 +80,8 @@ import java.util.Random; * packet will be copied regardless. Filtering out bad packets is done with canonicalization. * */ -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class UncachedKeyringMergeTest { static UncachedKeyRing staticRingA, staticRingB; diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java similarity index 95% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java index a6159de4e..8b2bd70f2 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java @@ -23,9 +23,12 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.sig.KeyFlags; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing.IteratorWithIOThrow; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; @@ -40,8 +43,8 @@ import java.io.IOException; import java.util.Iterator; import java.util.Random; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class UncachedKeyringTest { static UncachedKeyRing staticRing, staticPubRing; diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java similarity index 82% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java index b0f47af29..d8d5c1955 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java @@ -26,22 +26,24 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.*; +import org.robolectric.annotation.Config; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.support.KeyringTestingHelper; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class ProviderHelperKeyringTest { @Test public void testSavePublicKeyring() throws Exception { - Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(Collections.singleton( + Assert.assertTrue(new KeyringTestingHelper(RuntimeEnvironment.application).addKeyring(Collections.singleton( "/public-key-for-sample.blob" ))); } // @Test public void testSavePublicKeyringRsa() throws Exception { - Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList( + Assert.assertTrue(new KeyringTestingHelper(RuntimeEnvironment.application).addKeyring(prependResourcePath(Arrays.asList( "000001-006.public_key", "000002-013.user_id", "000003-002.sig", @@ -62,7 +64,7 @@ public class ProviderHelperKeyringTest { // @Test public void testSavePublicKeyringDsa() throws Exception { - Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList( + Assert.assertTrue(new KeyringTestingHelper(RuntimeEnvironment.application).addKeyring(prependResourcePath(Arrays.asList( "000016-006.public_key", "000017-002.sig", "000018-012.ring_trust", @@ -79,7 +81,7 @@ public class ProviderHelperKeyringTest { // @Test public void testSavePublicKeyringDsa2() throws Exception { - Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList( + Assert.assertTrue(new KeyringTestingHelper(RuntimeEnvironment.application).addKeyring(prependResourcePath(Arrays.asList( "000027-006.public_key", "000028-002.sig", "000029-012.ring_trust", diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java similarity index 90% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java index 171ecc377..8c81831c5 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java @@ -23,10 +23,14 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.util.encoders.Hex; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType; @@ -40,11 +44,11 @@ import org.sufficientlysecure.keychain.util.ProgressScaler; import java.util.Arrays; import java.util.Iterator; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class ProviderHelperSaveTest { - ProviderHelper mProviderHelper = new ProviderHelper(Robolectric.application); + ProviderHelper mProviderHelper = new ProviderHelper(RuntimeEnvironment.application); @BeforeClass public static void setUpOnce() throws Exception { @@ -62,17 +66,17 @@ public class ProviderHelperSaveTest { SaveKeyringResult result; // insert both keys, second should fail - result = new ProviderHelper(Robolectric.application).savePublicKeyRing(first); + result = new ProviderHelper(RuntimeEnvironment.application).savePublicKeyRing(first); Assert.assertTrue("first keyring import should succeed", result.success()); - result = new ProviderHelper(Robolectric.application).savePublicKeyRing(second); + result = new ProviderHelper(RuntimeEnvironment.application).savePublicKeyRing(second); Assert.assertFalse("second keyring import should fail", result.success()); - new KeychainDatabase(Robolectric.application).clearDatabase(); + new KeychainDatabase(RuntimeEnvironment.application).clearDatabase(); // and the other way around - result = new ProviderHelper(Robolectric.application).savePublicKeyRing(second); + result = new ProviderHelper(RuntimeEnvironment.application).savePublicKeyRing(second); Assert.assertTrue("first keyring import should succeed", result.success()); - result = new ProviderHelper(Robolectric.application).savePublicKeyRing(first); + result = new ProviderHelper(RuntimeEnvironment.application).savePublicKeyRing(first); Assert.assertFalse("second keyring import should fail", result.success()); } @@ -91,13 +95,13 @@ public class ProviderHelperSaveTest { SaveKeyringResult result; // insert secret, this should fail because of missing self-cert - result = new ProviderHelper(Robolectric.application).saveSecretKeyRing(seckey, new ProgressScaler()); + result = new ProviderHelper(RuntimeEnvironment.application).saveSecretKeyRing(seckey, new ProgressScaler()); Assert.assertFalse("secret keyring import before pubring import should fail", result.success()); // insert pubkey, then seckey - both should succeed - result = new ProviderHelper(Robolectric.application).savePublicKeyRing(pubkey); + result = new ProviderHelper(RuntimeEnvironment.application).savePublicKeyRing(pubkey); Assert.assertTrue("public keyring import should succeed", result.success()); - result = new ProviderHelper(Robolectric.application).saveSecretKeyRing(seckey, new ProgressScaler()); + result = new ProviderHelper(RuntimeEnvironment.application).saveSecretKeyRing(seckey, new ProgressScaler()); Assert.assertTrue("secret keyring import after pubring import should succeed", result.success()); } diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/support/KeyringBuilder.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/support/KeyringBuilder.java similarity index 100% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/support/KeyringBuilder.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/support/KeyringBuilder.java diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/support/KeyringTestingHelper.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/support/KeyringTestingHelper.java similarity index 100% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/support/KeyringTestingHelper.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/support/KeyringTestingHelper.java diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/support/ProviderHelperStub.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/support/ProviderHelperStub.java similarity index 100% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/support/ProviderHelperStub.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/support/ProviderHelperStub.java diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/support/TestDataUtil.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/support/TestDataUtil.java similarity index 100% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/support/TestDataUtil.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/support/TestDataUtil.java diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/Iso7816TLVTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/Iso7816TLVTest.java similarity index 94% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/Iso7816TLVTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/Iso7816TLVTest.java index fccecc3cc..c22f54715 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/Iso7816TLVTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/Iso7816TLVTest.java @@ -19,13 +19,16 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.util.encoders.Hex; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.util.Iso7816TLV.Iso7816CompositeTLV; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class Iso7816TLVTest { @Before diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java similarity index 86% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java index 7a48d226f..10bee2a02 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java @@ -25,16 +25,20 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -@RunWith(RobolectricTestRunner.class) -@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class ParcelableFileCacheTest { @Before @@ -45,7 +49,7 @@ public class ParcelableFileCacheTest { @Test public void testInputOutput() throws Exception { - ParcelableFileCache cache = new ParcelableFileCache(Robolectric.application, "test.pcl"); + ParcelableFileCache cache = new ParcelableFileCache(RuntimeEnvironment.application, "test.pcl"); ArrayList list = new ArrayList(); diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/TestingUtils.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/TestingUtils.java similarity index 100% rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/TestingUtils.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/TestingUtils.java diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/COPYING b/OpenKeychain/src/test/resources/OpenPGP-Haskell/COPYING similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/COPYING rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/COPYING diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/README b/OpenKeychain/src/test/resources/OpenPGP-Haskell/README similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/README rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/README diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg b/OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg similarity index 100% rename from OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg rename to OpenKeychain/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg diff --git a/OpenKeychain-Test/src/test/resources/public-key-canonicalize.blob b/OpenKeychain/src/test/resources/public-key-canonicalize.blob similarity index 100% rename from OpenKeychain-Test/src/test/resources/public-key-canonicalize.blob rename to OpenKeychain/src/test/resources/public-key-canonicalize.blob diff --git a/OpenKeychain-Test/src/test/resources/public-key-for-sample.blob b/OpenKeychain/src/test/resources/public-key-for-sample.blob similarity index 100% rename from OpenKeychain-Test/src/test/resources/public-key-for-sample.blob rename to OpenKeychain/src/test/resources/public-key-for-sample.blob diff --git a/OpenKeychain-Test/src/test/resources/sample-altered.txt b/OpenKeychain/src/test/resources/sample-altered.txt similarity index 100% rename from OpenKeychain-Test/src/test/resources/sample-altered.txt rename to OpenKeychain/src/test/resources/sample-altered.txt diff --git a/OpenKeychain-Test/src/test/resources/sample.txt b/OpenKeychain/src/test/resources/sample.txt similarity index 100% rename from OpenKeychain-Test/src/test/resources/sample.txt rename to OpenKeychain/src/test/resources/sample.txt diff --git a/OpenKeychain-Test/src/test/resources/test-keys/bad_user_id_encoding.asc b/OpenKeychain/src/test/resources/test-keys/bad_user_id_encoding.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/bad_user_id_encoding.asc rename to OpenKeychain/src/test/resources/test-keys/bad_user_id_encoding.asc diff --git a/OpenKeychain-Test/src/test/resources/test-keys/broken_cert_version.asc b/OpenKeychain/src/test/resources/test-keys/broken_cert_version.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/broken_cert_version.asc rename to OpenKeychain/src/test/resources/test-keys/broken_cert_version.asc diff --git a/OpenKeychain-Test/src/test/resources/test-keys/cooperpair/9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc b/OpenKeychain/src/test/resources/test-keys/cooperpair/9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/cooperpair/9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc rename to OpenKeychain/src/test/resources/test-keys/cooperpair/9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc diff --git a/OpenKeychain-Test/src/test/resources/test-keys/cooperpair/A55120427374F3F7AA5F1166DDA252EBB8EBE1AF.asc b/OpenKeychain/src/test/resources/test-keys/cooperpair/A55120427374F3F7AA5F1166DDA252EBB8EBE1AF.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/cooperpair/A55120427374F3F7AA5F1166DDA252EBB8EBE1AF.asc rename to OpenKeychain/src/test/resources/test-keys/cooperpair/A55120427374F3F7AA5F1166DDA252EBB8EBE1AF.asc diff --git a/OpenKeychain-Test/src/test/resources/test-keys/cooperpair/readme b/OpenKeychain/src/test/resources/test-keys/cooperpair/readme similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/cooperpair/readme rename to OpenKeychain/src/test/resources/test-keys/cooperpair/readme diff --git a/OpenKeychain-Test/src/test/resources/test-keys/divert_to_card_sec.asc b/OpenKeychain/src/test/resources/test-keys/divert_to_card_sec.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/divert_to_card_sec.asc rename to OpenKeychain/src/test/resources/test-keys/divert_to_card_sec.asc diff --git a/OpenKeychain-Test/src/test/resources/test-keys/mailvelope_07_no_key_flags.asc b/OpenKeychain/src/test/resources/test-keys/mailvelope_07_no_key_flags.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/mailvelope_07_no_key_flags.asc rename to OpenKeychain/src/test/resources/test-keys/mailvelope_07_no_key_flags.asc diff --git a/OpenKeychain-Test/src/test/resources/test-keys/stripped_flags.asc b/OpenKeychain/src/test/resources/test-keys/stripped_flags.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/stripped_flags.asc rename to OpenKeychain/src/test/resources/test-keys/stripped_flags.asc diff --git a/OpenKeychain-Test/src/test/resources/test-keys/symantec_public.asc b/OpenKeychain/src/test/resources/test-keys/symantec_public.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/symantec_public.asc rename to OpenKeychain/src/test/resources/test-keys/symantec_public.asc diff --git a/OpenKeychain-Test/src/test/resources/test-keys/symantec_secret.asc b/OpenKeychain/src/test/resources/test-keys/symantec_secret.asc similarity index 100% rename from OpenKeychain-Test/src/test/resources/test-keys/symantec_secret.asc rename to OpenKeychain/src/test/resources/test-keys/symantec_secret.asc diff --git a/README.md b/README.md index c48a146db..ab8df9807 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,8 @@ Select everything for the newest SDK Platform, API 22, and also API 21 ### Run Tests 1. Use OpenJDK instead of Oracle JDK -2. Execute ``./gradlew test`` +2. Execute ``./gradlew clean`` +3. Execute ``./gradlew testDebug --continue`` ### Development with Android Studio diff --git a/build.gradle b/build.gradle index 538fb17f9..7898430d5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information - classpath 'com.android.tools.build:gradle:1.1.3' + classpath 'com.android.tools.build:gradle:1.2.3' classpath files('gradle-witness.jar') // bintray dependency to satisfy dependency of openpgp-api lib classpath 'com.novoda:bintray-release:0.2.7' @@ -19,7 +19,7 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.3' + gradleVersion = '2.4' } subprojects { @@ -28,7 +28,7 @@ subprojects { } } -// Ignore tests for external dependency +// Ignore tests for external spongycastle project(':extern:spongycastle') { subprojects { // Need to re-apply the plugin here otherwise the test property below can't be set. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6e00d9230..49cf64134 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip -distributionSha256Sum=010dd9f31849abc3d5644e282943b1c1c355f8e2635c5789833979ce590a3774 \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip +distributionSha256Sum=c4eaecc621a81f567ded1aede4a5ddb281cc02a03a6a87c4f5502add8fc2f16f \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 1b9038344..baf7e0e64 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,3 @@ include ':extern:spongycastle:prov' include ':extern:minidns' include ':extern:KeybaseLib:Lib' include ':extern:safeslinger-exchange' -include ':OpenKeychain-Test'