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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-09-13 21:43:49 +02:00
commit b9a4148a07
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java
View File

@ -76,8 +76,7 @@ public class ProviderHelperSaveTest {
@Test public void testImportNoFlagKey() throws Exception { @Test public void testImportNoFlagKey() throws Exception {
UncachedKeyRing pub = UncachedKeyRing pub = readRingFromResource("/test-keys/mailvelope_07_no_key_flags.asc");
readRingFromResource("/test-keys/mailvelope_07_no_key_flags.asc");
long keyId = pub.getMasterKeyId(); long keyId = pub.getMasterKeyId();
Assert.assertNull("key flags should be null", pub.getPublicKey().getKeyUsage()); Assert.assertNull("key flags should be null", pub.getPublicKey().getKeyUsage());
@ -100,8 +99,7 @@ public class ProviderHelperSaveTest {
@Test public void testImportDivertToCard() throws Exception { @Test public void testImportDivertToCard() throws Exception {
UncachedKeyRing sec = UncachedKeyRing sec = readRingFromResource("/test-keys/divert_to_card_sec.asc");
readRingFromResource("/test-keys/divert_to_card_sec.asc");
long keyId = sec.getMasterKeyId(); long keyId = sec.getMasterKeyId();
SaveKeyringResult result; SaveKeyringResult result;
@ -124,8 +122,7 @@ public class ProviderHelperSaveTest {
@Test public void testImportBadEncodedUserId() throws Exception { @Test public void testImportBadEncodedUserId() throws Exception {
UncachedKeyRing key = UncachedKeyRing key = readRingFromResource("/test-keys/bad_user_id_encoding.asc");
readRingFromResource("/test-keys/bad_user_id_encoding.asc");
long keyId = key.getMasterKeyId(); long keyId = key.getMasterKeyId();
SaveKeyringResult result; SaveKeyringResult result;
@ -133,8 +130,6 @@ public class ProviderHelperSaveTest {
result = mProviderHelper.savePublicKeyRing(key, new ProgressScaler()); result = mProviderHelper.savePublicKeyRing(key, new ProgressScaler());
Assert.assertTrue("import of keyring should succeed", result.success()); Assert.assertTrue("import of keyring should succeed", result.success());
// make sure both the CanonicalizedSecretKeyRing as well as the CachedPublicKeyRing correctly
// indicate the secret key type
CanonicalizedPublicKeyRing ring = mProviderHelper.getCanonicalizedPublicKeyRing(keyId); CanonicalizedPublicKeyRing ring = mProviderHelper.getCanonicalizedPublicKeyRing(keyId);
boolean found = false; boolean found = false;
byte[] badUserId = Hex.decode("436c61757320467261656e6b656c203c436c6175732e4672e46e6b656c4068616c696661782e727774682d61616368656e2e64653e"); byte[] badUserId = Hex.decode("436c61757320467261656e6b656c203c436c6175732e4672e46e6b656c4068616c696661782e727774682d61616368656e2e64653e");