Merge pull request #272 from mattosaurus/chore/improve-encrypt-tests

Improve encrypt tests
mattosaurus · Jan 18, 2024 · 729b977 · 729b977
2 parents aee754a + 3f12031
commit 729b977
Show file tree

Hide file tree

Showing 14 changed files with 2,643 additions and 741 deletions.
diff --git a/PgpCore.Tests/UnitTests/Encrypt/EncryptAsync.File.cs b/PgpCore.Tests/UnitTests/Encrypt/EncryptAsync.File.cs
diff --git a/PgpCore.Tests/UnitTests/Encrypt/EncryptAsync.Stream.cs b/PgpCore.Tests/UnitTests/Encrypt/EncryptAsync.Stream.cs
diff --git a/PgpCore.Tests/UnitTests/Encrypt/EncryptAsync.String.cs b/PgpCore.Tests/UnitTests/Encrypt/EncryptAsync.String.cs
diff --git a/PgpCore.Tests/UnitTests/Encrypt/EncryptSync.File.cs b/PgpCore.Tests/UnitTests/Encrypt/EncryptSync.File.cs
diff --git a/PgpCore.Tests/UnitTests/Encrypt/EncryptSync.Stream.cs b/PgpCore.Tests/UnitTests/Encrypt/EncryptSync.Stream.cs
diff --git a/PgpCore.Tests/UnitTests/Encrypt/EncryptSync.String.cs b/PgpCore.Tests/UnitTests/Encrypt/EncryptSync.String.cs
diff --git a/PgpCore.Tests/UnitTests/GenerateKey/KeyAsync.cs b/PgpCore.Tests/UnitTests/GenerateKey/KeyAsync.cs
@@ -4,22 +4,14 @@
 using Xunit;
 using Org.BouncyCastle.Bcpg.OpenPgp;
 using System.IO;
-using Org.BouncyCastle.Utilities.Zlib;
 using System;
 using System.Collections.Generic;
 using Org.BouncyCastle.Bcpg;
-using System.Security.Cryptography.X509Certificates;
 
 namespace PgpCore.Tests.UnitTests.GenerateKey
 {
-    public class KeyAsync
+    public class KeyAsync : TestBase
     {
-#if NETFRAMEWORK
-        public const string VERSION = "Version: BouncyCastle.NET Cryptography (net461) v2.1.1+851feee009";
-#else
-        public const string VERSION = "Version: BouncyCastle.NET Cryptography (net6.0) v2.1.1+851feee009";
-#endif
-
         [Fact]
         public async Task GenerateKeyAsync_CreatePublicAndPrivateKeys_ShouldCreateKeysWithDefaultProperties()
         {

diff --git a/PgpCore.Tests/UnitTests/GenerateKey/KeySync.cs b/PgpCore.Tests/UnitTests/GenerateKey/KeySync.cs
@@ -1,25 +1,16 @@
 using FluentAssertions.Execution;
 using FluentAssertions;
-using System.Threading.Tasks;
 using Xunit;
 using Org.BouncyCastle.Bcpg.OpenPgp;
 using System.IO;
-using Org.BouncyCastle.Utilities.Zlib;
 using System;
 using System.Collections.Generic;
 using Org.BouncyCastle.Bcpg;
-using System.Security.Cryptography.X509Certificates;
 
 namespace PgpCore.Tests.UnitTests.GenerateKey
 {
-    public class KeySync
+    public class KeySync : TestBase
     {
-#if NETFRAMEWORK
-        public const string VERSION = "Version: BouncyCastle.NET Cryptography (net461) v2.1.1+851feee009";
-#else
-        public const string VERSION = "Version: BouncyCastle.NET Cryptography (net6.0) v2.1.1+851feee009";
-#endif
-
         [Fact]
         public void GenerateKey_CreatePublicAndPrivateKeys_ShouldCreateKeysWithDefaultProperties()
         {

diff --git a/PgpCore.Tests/UnitTests/TestBase.cs b/PgpCore.Tests/UnitTests/TestBase.cs
@@ -9,6 +9,16 @@ namespace PgpCore.Tests.UnitTests
 {
     public class TestBase
     {
+#if NETFRAMEWORK
+        public const string VERSION = "BouncyCastle.NET Cryptography (net461) v2.1.1+851feee009";
+#else
+        public const string VERSION = "BouncyCastle.NET Cryptography (net6.0) v2.1.1+851feee009";
+#endif
+        public const string DEFAULTNAME = "name";
+        public const string TESTNAME = "Test Name";
+        public const string TESTHEADERKEY = "Test Header";
+        public const string TESTHEADERVALUE = "Test Value";
+
         public static IEnumerable<object[]> GetCompressionAlgorithimTags()
         {
             foreach (CompressionAlgorithmTag compressionAlgorithmTag in TestHelper.GetEnumValues<CompressionAlgorithmTag>())