cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up remnants of KeychainContract

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-24 20:50:11 +02:00
parent 6f8b972f78
commit 48383211c3
5 changed files with 23 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/KeyRepositorySaveTest.java
View File

@@ -54,8 +54,8 @@ public class KeyRepositorySaveTest {
ShadowLog.stream = System.out;
}
@Test public void testImportCooperPair() throws Exception {
@Test
public void testImportCooperPairOne() throws Exception {
// insert two keys with same long key id, make sure the second one gets rejected either way!
UncachedKeyRing first =
readRingFromResource("/test-keys/cooperpair/9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc");
@@ -69,10 +69,18 @@ public class KeyRepositorySaveTest {
Assert.assertTrue("first keyring import should succeed", result.success());
result = KeyWritableRepository.create(RuntimeEnvironment.application).savePublicKeyRing(second);
Assert.assertFalse("second keyring import should fail", result.success());
}
KeychainDatabase.getInstance(RuntimeEnvironment.application).clearDatabase();
@Test
public void testImportCooperPairTwo() throws Exception {
// insert two keys with same long key id, make sure the second one gets rejected either way!
UncachedKeyRing first =
readRingFromResource("/test-keys/cooperpair/9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc");
UncachedKeyRing second =
readRingFromResource("/test-keys/cooperpair/A55120427374F3F7AA5F1166DDA252EBB8EBE1AF.asc");
SaveKeyringResult result;
// and the other way around
result = KeyWritableRepository.create(RuntimeEnvironment.application).savePublicKeyRing(second);
Assert.assertTrue("first keyring import should succeed", result.success());
result = KeyWritableRepository.create(RuntimeEnvironment.application).savePublicKeyRing(first);