diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 04:38:30 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 04:38:30 +0200 |
commit | d849b6d8a83deed28e8a22da642db781c4e6cf6d (patch) | |
tree | ca8ae47d10af1c55a7073d471d7b48fa4c6a8ee9 /OpenKeychain-Test/src/test/java/org/sufficientlysecure | |
parent | eab4c4ba8e4865153b3fa2122ea28628db5f7bb0 (diff) | |
download | open-keychain-d849b6d8a83deed28e8a22da642db781c4e6cf6d.tar.gz open-keychain-d849b6d8a83deed28e8a22da642db781c4e6cf6d.tar.bz2 open-keychain-d849b6d8a83deed28e8a22da642db781c4e6cf6d.zip |
test: don't need commutativity parameter here after all
Diffstat (limited to 'OpenKeychain-Test/src/test/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java index 0b249dcce..5c2f0b170 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java @@ -319,21 +319,11 @@ public class UncachedKeyringMergeTest { private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b) throws Exception { - return mergeWithChecks(a, b, a, true); - } - - private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b, boolean commutative) - throws Exception { - return mergeWithChecks(a, b, a, commutative); - } - - private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b, UncachedKeyRing base) - throws Exception { - return mergeWithChecks(a, b, base, true); + return mergeWithChecks(a, b, a); } private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b, - UncachedKeyRing base, boolean commutative) + UncachedKeyRing base) throws Exception { Assert.assertTrue("merging keyring must be secret type", a.isSecret()); @@ -350,12 +340,10 @@ public class UncachedKeyringMergeTest { Assert.assertNotNull("merge must succeed as sec(b)+sec(a)", resultB); // check commutativity, if requested - if (commutative) { - Assert.assertFalse("result of merge must be commutative", - KeyringTestingHelper.diffKeyrings( - resultA.getEncoded(), resultB.getEncoded(), onlyA, onlyB) - ); - } + Assert.assertFalse("result of merge must be commutative", + KeyringTestingHelper.diffKeyrings( + resultA.getEncoded(), resultB.getEncoded(), onlyA, onlyB) + ); } final UncachedKeyRing pubA = a.extractPublicKeyRing(); |