Actually test canonicalize

1 files changed, 18 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/testsupport/TestDataUtil.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/testsupport/TestDataUtil.java
index 338488e1f..c08b60d1a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/testsupport/TestDataUtil.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/testsupport/TestDataUtil.java
@@ -1,8 +1,11 @@
 package org.sufficientlysecure.keychain.testsupport;
 
+import org.spongycastle.bcpg.ContainedPacket;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -17,7 +20,7 @@ public class TestDataUtil {
         return output.toByteArray();
     }
 
-    private static void appendToOutput(InputStream input, ByteArrayOutputStream output) {
+    public static void appendToOutput(InputStream input, OutputStream output) {
         byte[] buffer = new byte[8192];
         int bytesRead;
         try {
@@ -82,6 +85,20 @@ public class TestDataUtil {
         public boolean areEquals(T lhs, T rhs);
     }
 
+
+    public static byte[] concatAll(java.util.List<ContainedPacket>  packets) {
+        byte[][] byteArrays = new byte[packets.size()][];
+        try {
+            for (int i = 0; i < packets.size(); i++) {
+                byteArrays[i] = packets.get(i).getEncoded();
+            }
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+
+        return concatAll(byteArrays);
+    }
+
     public static byte[] concatAll(byte[]... byteArrays) {
         if (byteArrays.length == 1) {
             return byteArrays[0];