Vincent Breitmoser
54bc874ce5
Merge remote-tracking branch 'origin/master' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
Vincent Breitmoser
d4fa2bbf47
test: make testing optional in build
2014-07-11 19:58:28 +02:00
Vincent Breitmoser
74f510e62b
tests: set maxParallelForks = 1, maybe this fixes travis non-deterministic build
2014-07-11 19:20:05 +02:00
Vincent Breitmoser
65e75eed93
travis: try running tests separately with info output
2014-07-11 17:15:17 +02:00
Vincent Breitmoser
faa8c2baa3
travis: get rid of lint
2014-07-11 16:39:31 +02:00
Vincent Breitmoser
f18e4d109f
tests: stronger subkey revocation test including re-certification
2014-07-11 16:17:17 +02:00
Vincent Breitmoser
20b28b5207
modifyKey: proper expiry check during SubkeyAdd
2014-07-11 15:42:02 +02:00
Vincent Breitmoser
46ef001b82
test: stronger SubkeyCreate tests
2014-07-11 15:41:34 +02:00
Vincent Breitmoser
7b195ac2e3
modifyKey: make SubkeyChange operations work
2014-07-11 15:20:16 +02:00
Vincent Breitmoser
e7efd2c539
test: add SubkeyChange tests
2014-07-11 15:19:49 +02:00
Vincent Breitmoser
e00c65ed82
test: onlyX vars are lists now, use them as such
2014-07-11 14:54:35 +02:00
Vincent Breitmoser
aaecf13ce0
(whoops)
2014-07-11 13:55:44 +02:00
Vincent Breitmoser
1436ab8d90
SaveKeyringParcel: follow attribute m prefix coding guideline
2014-07-11 13:51:36 +02:00
Vincent Breitmoser
bb92fe2804
test: get rid of some SaveKeyringParcel boilerplate
2014-07-11 13:49:17 +02:00
Vincent Breitmoser
26f6d58284
get rid of some inspection warnings
2014-07-11 13:45:06 +02:00
Vincent Breitmoser
4da273ac16
modifyKey: error out on nonexisting new primary user id
2014-07-11 13:35:48 +02:00
Vincent Breitmoser
4345e0309d
test: add more user id tests
2014-07-11 13:29:13 +02:00
Vincent Breitmoser
9bae53f101
test: put more stuff in helper method for neater tests
2014-07-11 13:28:28 +02:00
Vincent Breitmoser
d6f3b4b879
fix bug in canonicalization regarding subkey revocation
2014-07-11 03:27:44 +02:00
Vincent Breitmoser
036a886581
test: test subkey revocation
2014-07-11 03:27:28 +02:00
Vincent Breitmoser
f6e39b0a97
modifyKey: couple more fixes from tests
2014-07-11 02:51:13 +02:00
Vincent Breitmoser
e477577c55
some UncachedKeyRing fixes, primary user id mostly
2014-07-11 02:50:35 +02:00
Vincent Breitmoser
38ee6203ad
modifyKey: preserve master key flags
2014-07-11 02:49:51 +02:00
Vincent Breitmoser
dce2df4113
add come createKey strings
2014-07-11 02:48:54 +02:00
Vincent Breitmoser
b406db24b7
test: implement a ton of PgpKeyOperation tests
2014-07-11 02:48:08 +02:00
Vincent Breitmoser
d0ff2c9f28
test: fix RawPacket comparator
2014-07-11 02:47:26 +02:00
Vincent Breitmoser
fa00a5b23c
test: finish testSubkeyAdd
2014-07-10 21:00:17 +02:00
Vincent Breitmoser
0e7d4f644b
Revert "test: add --info to travis thing, for testing"
...
This reverts commit 7532baa6c7
2014-07-10 02:18:35 +02:00
Vincent Breitmoser
7532baa6c7
test: add --info to travis thing, for testing
2014-07-10 02:08:23 +02:00
Vincent Breitmoser
6f0e3c242a
test: enable travis, disable dysfunctional tests to make it work
2014-07-10 01:56:21 +02:00
Vincent Breitmoser
90f546a4e8
tests: add testSubkeyAdd
2014-07-10 01:38:57 +02:00
Vincent Breitmoser
0afd979665
test: move uncachedkeyring test setup into BeforeClass method
2014-07-09 20:35:03 +02:00
Vincent Breitmoser
a99589e9c4
use openjdk7 in travis
2014-07-09 17:41:13 +02:00
Vincent Breitmoser
09529bc47e
tests: fix createkey test
2014-07-09 17:41:01 +02:00
Vincent Breitmoser
a9c3d6b507
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
2014-07-09 16:39:26 +02:00
Vincent Breitmoser
718acbf954
put unit tests into external module (CAVEAT)
...
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.
2014-07-09 16:03:30 +02:00
Vincent
9fcc0a8816
Merge pull request #710 from mar-v-in/patch-1
...
Fix OperationResultParcel
2014-07-09 11:26:59 +02:00
mar-v-in
5185492b04
Fix OperationResultParcel
...
Naming conventions save lives... or atleast make addAll() work
2014-07-09 00:10:09 +02:00
Dominik Schürmann
16498be4a2
Fix nullpointer in API, fix #693
2014-07-08 04:24:27 +02:00
Dominik Schürmann
61d0e12e8a
cleanup
2014-07-08 03:37:32 +02:00
Dominik Schürmann
daa1f5cf8e
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-08 03:34:53 +02:00
Dominik Schürmann
5adcb7885c
Work on subkeys adapter
2014-07-08 03:34:27 +02:00
Art O Cathain
78b0c5e74a
actually provide a tostring
2014-07-07 21:38:49 +01:00
Art O Cathain
37433bd282
prevent odd ambiguous method toString error
2014-07-07 21:37:48 +01:00
Art O Cathain
51bedc2e73
(c) headers, tidy imports
2014-07-07 21:35:10 +01:00
Vincent Breitmoser
9971f9ad4c
use KeyringTestHelper.diffKeyrings method for unit test
...
Conflicts:
OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
2014-07-07 21:12:50 +01:00
Vincent Breitmoser
83e5a3d341
add diffKeyrings method
2014-07-07 21:08:48 +01:00
Vincent Breitmoser
9320d2d8a2
use KeyringTestHelper.diffKeyrings method for unit test
2014-07-07 19:02:57 +02:00
Vincent Breitmoser
23524af81d
add diffKeyrings method
2014-07-07 18:52:59 +02:00
Vincent Breitmoser
e54dd26d29
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
2014-07-07 18:19:52 +02:00
