aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain-Test
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-07-11 13:37:31 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-07-11 13:45:06 +0200
commit26f6d58284d7665aa810e0d6a219e1191166e349 (patch)
treebbac36487ec1558f5e2a2042929738ed96ad62ba /OpenKeychain-Test
parent4da273ac16fc93524bc6212e2b0477904155a4f5 (diff)
downloadopen-keychain-26f6d58284d7665aa810e0d6a219e1191166e349.tar.gz
open-keychain-26f6d58284d7665aa810e0d6a219e1191166e349.tar.bz2
open-keychain-26f6d58284d7665aa810e0d6a219e1191166e349.zip
get rid of some inspection warnings
Diffstat (limited to 'OpenKeychain-Test')
-rw-r--r--OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java
index b8aa1328f..5ebb7b593 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java
@@ -11,7 +11,6 @@ import org.robolectric.*;
import org.robolectric.shadows.ShadowLog;
import org.spongycastle.bcpg.BCPGInputStream;
import org.spongycastle.bcpg.Packet;
-import org.spongycastle.bcpg.SecretKeyPacket;
import org.spongycastle.bcpg.SecretSubkeyPacket;
import org.spongycastle.bcpg.SignaturePacket;
import org.spongycastle.bcpg.UserIDPacket;
@@ -147,7 +146,7 @@ public class PgpKeyOperationTest {
parcel.mFingerprint = ring.getFingerprint();
parcel.addSubKeys.add(new SubkeyAdd(algorithm.rsa, 1024, KeyFlags.SIGN_DATA, null));
- UncachedKeyRing modified = applyModificationWithChecks(parcel, ring, onlyA, onlyB);
+ applyModificationWithChecks(parcel, ring, onlyA, onlyB);
Assert.assertEquals("no extra packets in original", 0, onlyA.size());
Assert.assertEquals("exactly two extra packets in modified", 2, onlyB.size());
@@ -179,7 +178,7 @@ public class PgpKeyOperationTest {
parcel.revokeSubKeys.add(it.next().getKeyId());
}
- UncachedKeyRing modified = applyModificationWithChecks(parcel, ring, onlyA, onlyB);
+ applyModificationWithChecks(parcel, ring, onlyA, onlyB);
Assert.assertEquals("no extra packets in original", 0, onlyA.size());
Assert.assertEquals("exactly one extra packet in modified", 1, onlyB.size());
@@ -197,7 +196,7 @@ public class PgpKeyOperationTest {
}
@Test
- public void testUserIdRevokeReadd() throws Exception {
+ public void testUserIdRevokeRead() throws Exception {
UncachedKeyRing modified;
String uid = ring.getPublicKey().getUnorderedUserIds().get(1);
@@ -232,8 +231,7 @@ public class PgpKeyOperationTest {
parcel.mFingerprint = ring.getFingerprint();
parcel.addUserIds.add(uid);
- modified = applyModificationWithChecks(
- parcel, modified, onlyA, onlyB, true, false);
+ applyModificationWithChecks(parcel, modified, onlyA, onlyB, true, false);
Assert.assertEquals("exactly two outdated packets in original", 2, onlyA.size());
Assert.assertEquals("exactly one extra packet in modified", 1, onlyB.size());
@@ -411,6 +409,7 @@ public class PgpKeyOperationTest {
ArrayList onlyA = new ArrayList<RawPacket>();
ArrayList onlyB = new ArrayList<RawPacket>();
+ //noinspection unchecked
Assert.assertTrue("keyrings differ", !KeyringTestingHelper.diffKeyrings(
expectedKeyRing.getEncoded(), expectedKeyRing.getEncoded(), onlyA, onlyB));