add the GPG version

This commit is contained in:
Art O Cathain
2014-07-06 17:35:07 +01:00
parent c05fd07986
commit e906fe5387
2 changed files with 10 additions and 1 deletions

View File

@@ -10,6 +10,7 @@ import org.sufficientlysecure.keychain.testsupport.KeyringBuilder;
import org.sufficientlysecure.keychain.testsupport.TestDataUtil; import org.sufficientlysecure.keychain.testsupport.TestDataUtil;
import java.io.*; import java.io.*;
import java.util.Collections;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 @org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
@@ -19,11 +20,19 @@ public class UncachedKeyringTest {
public void testVerifySuccess() throws Exception { public void testVerifySuccess() throws Exception {
UncachedKeyRing expectedKeyRing = KeyringBuilder.ring2(); UncachedKeyRing expectedKeyRing = KeyringBuilder.ring2();
UncachedKeyRing inputKeyRing = KeyringBuilder.ring1(); UncachedKeyRing inputKeyRing = KeyringBuilder.ring1();
// Uncomment to dump the encoded key for manual inspection // Uncomment to dump the encoded key for manual inspection
// inputKeyRing.getPublicKey().getPublicKey().encode(new FileOutputStream(new File("/tmp/key-encoded"))); // inputKeyRing.getPublicKey().getPublicKey().encode(new FileOutputStream(new File("/tmp/key-encoded")));
new UncachedKeyringTestingHelper().doTestCanonicalize(inputKeyRing, expectedKeyRing); new UncachedKeyringTestingHelper().doTestCanonicalize(inputKeyRing, expectedKeyRing);
} }
@Test
public void testVerifyFromGpg() throws Exception {
byte[] data = TestDataUtil.readAllFully(Collections.singleton( "/public-key-canonicalize.blob"));
UncachedKeyRing inputKeyRing = UncachedKeyRing.decodeFromData(data);
new UncachedKeyringTestingHelper().doTestCanonicalize(inputKeyRing, KeyringBuilder.ring2());
}
/** /**
* Just testing my own test code. Should really be using a library for this. * Just testing my own test code. Should really be using a library for this.
*/ */