aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-292-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
* | Remove dead codeDominik Schürmann2015-08-271-17/+17
| |
* | Disable new failing test for nowDominik Schürmann2015-08-101-2/+3
| |
* | Fix test cases, add test cases (still 1 failing)Dominik Schürmann2015-08-104-40/+166
| |
* | Introduce constants in OpenPgpSignature and DecryptionResult for ↵Dominik Schürmann2015-08-091-7/+7
| | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos
* | made mSignatureTime optional in CryptoOperationHelperAdithya Abraham Philip2015-07-154-20/+32
| |
* | Tests not working anymore on travis after using new annotation parameterDominik Schürmann2015-07-0914-57/+84
| | | | | | | | | | | | Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0" This reverts commit 85a47d22f9bb1e4aaf5770c67416a5532977658e.
* | Get rid of robolectric workaround by using new annotation in robolectric 3.0Dominik Schürmann2015-07-0914-84/+57
| |
* | better handling of divert-to-card keys for subkey modificationsVincent Breitmoser2015-07-082-8/+31
| |
* | tests: make sure encryption happens to all enc-capable subkeysVincent Breitmoser2015-07-072-11/+120
| |
* | fix PromoteKeyOperationTestVincent Breitmoser2015-07-061-11/+10
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-301-4/+3
|\ \
| * | Create key wizard for blank YubiKeyDominik Schürmann2015-06-291-4/+3
| | |
* | | split import and export opsAdithya Abraham Philip2015-06-271-2/+1
|/ /
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-261-0/+2
|\ \
| * | Import R and BuildConfig explicitlyThialfihar2015-06-261-0/+2
| | |
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-11126-0/+5961
| |\ \ | | |/ | |/|
* | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-11126-0/+5973
|\ \ \ | |/ / |/| / | |/
| * Add missing WorkaroundBuildConfigDominik Schürmann2015-06-111-0/+14
| |
| * Fix debug/release build separationDominik Schürmann2015-06-1113-13/+26
| |
| * Use new officially supported way for local unit tests, many dependencies ↵Dominik Schürmann2015-06-11125-0/+5934
|/ | | | upgraded for this, temporary disabled separate debug builds
* put unit tests into external module (CAVEAT)Vincent Breitmoser2014-07-097-225/+0
| | | | | | | this requires a more up to date version of gradle-android-test-plugin than is currently in the repositories. it must be added to the local maven repo using ./install-custom-gradle-test-plugin.sh before compiling.
* use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-071-1/+18
|
* actually canonicalizeArt O Cathain2014-07-061-4/+1
|
* work in progressArt O Cathain2014-07-061-0/+37
|
* add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-291-1/+0
|
* borrow tests from Haskell OpenPGPArt O Cathain2014-06-231-1/+67
|
* add OpenPGP-Haskell to test collateralArt O Cathain2014-06-231-0/+0
|
* VERY basic test for save keyringArt O Cathain2014-06-212-1/+21
|
* Start on Robolectric integration testArt O Cathain2014-06-164-0/+89
|
* update unit test support in build filesVincent Breitmoser2014-05-272-69/+0
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-062-0/+69