From be351616b68cf3759418156a233293e5384e217e Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 12 Jul 2023 15:08:33 +0200
Subject: [PATCH] Add some more RevokeKey tests

---
 .../testsuite/operation/RevokeKeyTest.java    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/sop-java/src/testFixtures/java/sop/testsuite/operation/RevokeKeyTest.java b/sop-java/src/testFixtures/java/sop/testsuite/operation/RevokeKeyTest.java
index 920f877..10472ca 100644
--- a/sop-java/src/testFixtures/java/sop/testsuite/operation/RevokeKeyTest.java
+++ b/sop-java/src/testFixtures/java/sop/testsuite/operation/RevokeKeyTest.java
@@ -10,6 +10,8 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import sop.SOP;
 import sop.exception.SOPGPException;
+import sop.testsuite.JUtils;
+import sop.testsuite.TestData;
 import sop.util.UTF8Util;
 
 import java.io.IOException;
@@ -18,6 +20,7 @@ import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIf("sop.testsuite.operation.AbstractSOPTest#hasBackends")
 public class RevokeKeyTest extends AbstractSOPTest {
@@ -32,9 +35,29 @@ public class RevokeKeyTest extends AbstractSOPTest {
         byte[] secretKey = sop.generateKey().userId("Alice <alice@pgpainless.org>").generate().getBytes();
         byte[] revocation = sop.revokeKey().keys(secretKey).getBytes();
 
+        assertTrue(JUtils.arrayStartsWith(revocation, TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK));
         assertFalse(Arrays.equals(secretKey, revocation));
     }
 
+    @ParameterizedTest
+    @MethodSource("provideInstances")
+    public void revokeUnprotectedKeyUnarmored(SOP sop) throws IOException {
+        byte[] secretKey = sop.generateKey().userId("Alice <alice@pgpainless.org>").noArmor().generate().getBytes();
+        byte[] revocation = sop.revokeKey().noArmor().keys(secretKey).getBytes();
+
+        assertFalse(JUtils.arrayStartsWith(revocation, TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK));
+        assertFalse(Arrays.equals(secretKey, revocation));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideInstances")
+    public void revokeCertificateFails(SOP sop) throws IOException {
+        byte[] secretKey = sop.generateKey().generate().getBytes();
+        byte[] certificate = sop.extractCert().key(secretKey).getBytes();
+
+        assertThrows(SOPGPException.BadData.class, () -> sop.revokeKey().keys(certificate).getBytes());
+    }
+
     @ParameterizedTest
     @MethodSource("provideInstances")
     public void revokeProtectedKey(SOP sop) throws IOException {