From 05c203177ea7d875d3cb409520c76f7f707bad64 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 2 Feb 2024 16:39:19 +0100
Subject: [PATCH] Improve image attribute test

---
 .../key/generation/GenerateOpenPgpKeyTest.kt   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/GenerateOpenPgpKeyTest.kt b/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/GenerateOpenPgpKeyTest.kt
index 20cf8ba2..3a8f88e9 100644
--- a/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/GenerateOpenPgpKeyTest.kt
+++ b/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/GenerateOpenPgpKeyTest.kt
@@ -4,8 +4,11 @@
 
 package org.pgpainless.key.generation
 
+import java.io.InputStream
 import org.bouncycastle.bcpg.attr.ImageAttribute
 import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVectorGenerator
+import org.bouncycastle.util.io.Streams
+import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
@@ -20,7 +23,6 @@ import org.pgpainless.key.generation.type.xdh.XDHSpec
 import org.pgpainless.key.protection.SecretKeyRingProtector
 import org.pgpainless.policy.Policy
 import org.pgpainless.util.DateUtil
-import java.io.InputStream
 
 class GenerateOpenPgpKeyTest {
 
@@ -67,7 +69,7 @@ class GenerateOpenPgpKeyTest {
         val policy =
             Policy(
                 publicKeyAlgorithmPolicy =
-                Policy.PublicKeyAlgorithmPolicy(mapOf(PublicKeyAlgorithm.RSA_GENERAL to 4096)),
+                    Policy.PublicKeyAlgorithmPolicy(mapOf(PublicKeyAlgorithm.RSA_GENERAL to 4096)),
             )
         val builder = GenerateOpenPgpKey(policy)
 
@@ -83,12 +85,16 @@ class GenerateOpenPgpKeyTest {
 
     @Test
     fun testKeyGenerationWithJPEGAttribute() {
-        val key = GenerateOpenPgpKey(Policy.getInstance())
-            .buildV4Key(KeyType.EDDSA(EdDSACurve._Ed25519))
-            .addJpegImage(requireResource("suzanne.jpg"))
-            .build()
+        val key =
+            GenerateOpenPgpKey(Policy.getInstance())
+                .buildV4Key(KeyType.EDDSA(EdDSACurve._Ed25519))
+                .addJpegImage(requireResource("suzanne.jpg"))
+                .build()
 
         assertTrue(key.publicKey.userAttributes.hasNext())
+        assertArrayEquals(
+            Streams.readAll(requireResource("suzanne.jpg")),
+            key.publicKey.userAttributes.next().imageAttribute.imageData)
     }
 
     private fun requireResource(resourceName: String): InputStream {