diff options
| author | Vincent <valodim@mugenguild.com> | 2015-06-12 14:59:26 +0200 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2015-06-12 14:59:26 +0200 |
| commit | d57324aa4b23633f5da995ba71d8fbb5690bae45 (patch) | |
| tree | 27898f27a06d544c99ad0de2f0767cdcaf459ccf /OpenKeychain/src/test | |
| parent | 4f55b1f5d1bc35a8a6b49dfe520ce641b6667f3d (diff) | |
| parent | 5d652e4c418b42eef0517d1110b782908bfd8235 (diff) | |
| download | open-keychain-d57324aa4b23633f5da995ba71d8fbb5690bae45.tar.gz open-keychain-d57324aa4b23633f5da995ba71d8fbb5690bae45.tar.bz2 open-keychain-d57324aa4b23633f5da995ba71d8fbb5690bae45.zip | |
Merge pull request #1331 from open-keychain/v/eventbus
replace messenger hack with eventbus
Diffstat (limited to 'OpenKeychain/src/test')
| -rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java index d4a6a105e..6984f126e 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java @@ -158,7 +158,7 @@ public class CertifyOperationTest { CertifyActionsParcel actions = new CertifyActionsParcel(mStaticRing1.getMasterKeyId()); actions.add(new CertifyAction(mStaticRing2.getMasterKeyId(), mStaticRing2.getPublicKey().getUnorderedUserIds())); - CertifyResult result = op.certify(actions, new CryptoInputParcel(mKeyPhrase1), null); + CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1)); Assert.assertTrue("certification must succeed", result.success()); @@ -186,7 +186,7 @@ public class CertifyOperationTest { CertifyActionsParcel actions = new CertifyActionsParcel(mStaticRing1.getMasterKeyId()); actions.add(new CertifyAction(mStaticRing2.getMasterKeyId(), null, mStaticRing2.getPublicKey().getUnorderedUserAttributes())); - CertifyResult result = op.certify(actions, new CryptoInputParcel(mKeyPhrase1), null); + CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1)); Assert.assertTrue("certification must succeed", result.success()); @@ -209,7 +209,7 @@ public class CertifyOperationTest { actions.add(new CertifyAction(mStaticRing1.getMasterKeyId(), mStaticRing2.getPublicKey().getUnorderedUserIds())); - CertifyResult result = op.certify(actions, new CryptoInputParcel(mKeyPhrase1), null); + CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1)); Assert.assertFalse("certification with itself must fail!", result.success()); Assert.assertTrue("error msg must be about self certification", @@ -228,7 +228,7 @@ public class CertifyOperationTest { uids.add("nonexistent"); actions.add(new CertifyAction(1234L, uids)); - CertifyResult result = op.certify(actions, new CryptoInputParcel(mKeyPhrase1), null); + CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1)); Assert.assertFalse("certification of nonexistent key must fail", result.success()); Assert.assertTrue("must contain error msg about not found", @@ -240,7 +240,7 @@ public class CertifyOperationTest { actions.add(new CertifyAction(mStaticRing1.getMasterKeyId(), mStaticRing2.getPublicKey().getUnorderedUserIds())); - CertifyResult result = op.certify(actions, new CryptoInputParcel(mKeyPhrase1), null); + CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1)); Assert.assertFalse("certification of nonexistent key must fail", result.success()); Assert.assertTrue("must contain error msg about not found", |