moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

test: don't need commutativity parameter here after all

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-07-26 04:38:30 +02:00
parent eab4c4ba8e
commit d849b6d8a8
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java
View File

@ -319,21 +319,11 @@ public class UncachedKeyringMergeTest {
private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b) private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b)
throws Exception { throws Exception {
return mergeWithChecks(a, b, a, true); return mergeWithChecks(a, b, a);
}
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);
} }
private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b, private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b,
UncachedKeyRing base, boolean commutative) UncachedKeyRing base)
throws Exception { throws Exception {
Assert.assertTrue("merging keyring must be secret type", a.isSecret()); Assert.assertTrue("merging keyring must be secret type", a.isSecret());
@ -350,13 +340,11 @@ public class UncachedKeyringMergeTest {
Assert.assertNotNull("merge must succeed as sec(b)+sec(a)", resultB); Assert.assertNotNull("merge must succeed as sec(b)+sec(a)", resultB);
// check commutativity, if requested // check commutativity, if requested
if (commutative) {
Assert.assertFalse("result of merge must be commutative", Assert.assertFalse("result of merge must be commutative",
KeyringTestingHelper.diffKeyrings( KeyringTestingHelper.diffKeyrings(
resultA.getEncoded(), resultB.getEncoded(), onlyA, onlyB) resultA.getEncoded(), resultB.getEncoded(), onlyA, onlyB)
); );
} }
}
final UncachedKeyRing pubA = a.extractPublicKeyRing(); final UncachedKeyRing pubA = a.extractPublicKeyRing();
final UncachedKeyRing pubB = b.extractPublicKeyRing(); final UncachedKeyRing pubB = b.extractPublicKeyRing();