From d849b6d8a83deed28e8a22da642db781c4e6cf6d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 26 Jul 2014 04:38:30 +0200
Subject: [PATCH] test: don't need commutativity parameter here after all

---
 .../tests/UncachedKeyringMergeTest.java       | 24 +++++--------------
 1 file 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();