From 4ce9f468466080d54c21e40c84d1b45f96d68920 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 25 Aug 2022 11:26:12 +0200
Subject: [PATCH] Increase coverage of PGPCertificateDirectory

---
 .../InMemoryCertificateDirectoryBackend.java  |  4 +++
 .../cert_d/PGPCertificateDirectoryTest.java   | 36 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/pgp-cert-d-java/src/main/java/pgp/cert_d/backend/InMemoryCertificateDirectoryBackend.java b/pgp-cert-d-java/src/main/java/pgp/cert_d/backend/InMemoryCertificateDirectoryBackend.java
index b3c3bd6..90797af 100644
--- a/pgp-cert-d-java/src/main/java/pgp/cert_d/backend/InMemoryCertificateDirectoryBackend.java
+++ b/pgp-cert-d-java/src/main/java/pgp/cert_d/backend/InMemoryCertificateDirectoryBackend.java
@@ -21,6 +21,10 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
+/**
+ * Implementation of the {@link PGPCertificateDirectory.Backend} which stores key material in-memory.
+ * It uses object locking with {@link #wait()} and {@link #notify()} to synchronize write-access.
+ */
 public class InMemoryCertificateDirectoryBackend implements PGPCertificateDirectory.Backend {
 
     protected static class ObjectLockingMechanism implements PGPCertificateDirectory.LockingMechanism {
diff --git a/pgp-cert-d-java/src/test/java/pgp/cert_d/PGPCertificateDirectoryTest.java b/pgp-cert-d-java/src/test/java/pgp/cert_d/PGPCertificateDirectoryTest.java
index 8605f0e..4ffb865 100644
--- a/pgp-cert-d-java/src/test/java/pgp/cert_d/PGPCertificateDirectoryTest.java
+++ b/pgp-cert-d-java/src/test/java/pgp/cert_d/PGPCertificateDirectoryTest.java
@@ -70,7 +70,7 @@ public class PGPCertificateDirectoryTest {
 
     @ParameterizedTest
     @MethodSource("provideTestSubjects")
-    public void lockDirectoryAndInsertWillFail(PGPCertificateDirectory directory)
+    public void lockDirectoryAndTryInsertWillFail(PGPCertificateDirectory directory)
             throws IOException, InterruptedException, BadDataException {
         // Manually lock the dir
         assertFalse(directory.backend.getLock().isLocked());
@@ -86,6 +86,40 @@ public class PGPCertificateDirectoryTest {
         assertNotNull(inserted);
     }
 
+    @ParameterizedTest
+    @MethodSource("provideTestSubjects")
+    public void lockDirectoryAndTryInsertTrustRootWillFail(PGPCertificateDirectory directory)
+            throws IOException, InterruptedException, BadDataException {
+        // Manually lock the dir
+        assertFalse(directory.backend.getLock().isLocked());
+        directory.backend.getLock().lockDirectory();
+        assertTrue(directory.backend.getLock().isLocked());
+
+        KeyMaterial inserted = directory.tryInsertTrustRoot(TestKeys.getHarryKey(), merger);
+        assertNull(inserted);
+
+        directory.backend.getLock().releaseDirectory();
+        inserted = directory.tryInsertTrustRoot(TestKeys.getHarryKey(), merger);
+        assertNotNull(inserted);
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestSubjects")
+    public void lockDirectoryAndTryInsertWithSpecialNameWillFail(PGPCertificateDirectory directory)
+            throws IOException, InterruptedException, BadDataException, BadNameException {
+        // Manually lock the dir
+        assertFalse(directory.backend.getLock().isLocked());
+        directory.backend.getLock().lockDirectory();
+        assertTrue(directory.backend.getLock().isLocked());
+
+        Certificate inserted = directory.tryInsertWithSpecialName(SpecialNames.TRUST_ROOT, TestKeys.getHarryKey(), merger);
+        assertNull(inserted);
+
+        directory.backend.getLock().releaseDirectory();
+        inserted = directory.tryInsertWithSpecialName(SpecialNames.TRUST_ROOT, TestKeys.getHarryKey(), merger);
+        assertNotNull(inserted);
+    }
+
     @ParameterizedTest
     @MethodSource("provideTestSubjects")
     public void getByInvalidNameFails(PGPCertificateDirectory directory) {