aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java
Commit message (Expand)AuthorAgeFilesLines
* move classes around a bitVincent Breitmoser2014-08-011-397/+0
* tests: adapt to new EditKeyResult return valueVincent Breitmoser2014-07-311-16/+22
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-8/+2
* test: add misc UncachedKeyRing testsVincent Breitmoser2014-07-261-1/+0
* test: don't need commutativity parameter here after allVincent Breitmoser2014-07-261-18/+6
* test: (almost) full coverage for UncachedKeyRing.mergeVincent Breitmoser2014-07-261-17/+52
* tests: add a couple of UncachedKeyRing.merge testsVincent Breitmoser2014-07-261-0/+375