Improve test coverage for RSAEncryptionPadding comparsion (dotnet#230)

* Improve test coverage for RSAEncryptionPadding comparsion * Simplify RSASignaturePadding comparison logic
franksinankaya · Nov 26, 2019 · 6fe9120 · 6fe9120
1 parent a71a324
commit 6fe9120
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/....Security.Cryptography.Algorithms/src/System/Security/Cryptography/RSASignaturePadding.cs b/....Security.Cryptography.Algorithms/src/System/Security/Cryptography/RSASignaturePadding.cs
@@ -59,7 +59,7 @@ public override bool Equals(object obj)
 
         public bool Equals(RSASignaturePadding other)
         {
-            return other != null && _mode == other._mode;
+            return !object.ReferenceEquals(other, null) && _mode == other._mode;
         }
 
         public static bool operator ==(RSASignaturePadding left, RSASignaturePadding right)

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/RSATests.cs b/src/libraries/System.Security.Cryptography.Algorithms/tests/RSATests.cs
@@ -193,9 +193,41 @@ public void VerifyDataStream_UsesHashDataAndVerifyHash()
         }
 
         [Fact]
-        public void RSAEncryptionPadding_Equals()
+        public void RSAEncryptionPadding_Equality()
         {
-            Assert.Equal(RSAEncryptionPadding.Pkcs1, RSAEncryptionPadding.Pkcs1);
+            Assert.True(RSAEncryptionPadding.Pkcs1.Equals(RSAEncryptionPadding.Pkcs1));
+            Assert.True(RSAEncryptionPadding.Pkcs1.Equals((object)RSAEncryptionPadding.Pkcs1));
+            Assert.True(RSAEncryptionPadding.Pkcs1 == RSAEncryptionPadding.Pkcs1);
+            Assert.False(RSAEncryptionPadding.Pkcs1 != RSAEncryptionPadding.Pkcs1);
+
+            Assert.False(RSAEncryptionPadding.Pkcs1.Equals(RSAEncryptionPadding.OaepSHA1));
+            Assert.False(RSAEncryptionPadding.Pkcs1.Equals((object)RSAEncryptionPadding.OaepSHA1));
+            Assert.False(RSAEncryptionPadding.Pkcs1 == RSAEncryptionPadding.OaepSHA1);
+            Assert.True(RSAEncryptionPadding.Pkcs1 != RSAEncryptionPadding.OaepSHA1);
+
+            Assert.False(RSAEncryptionPadding.Pkcs1.Equals(null));
+            Assert.False(RSAEncryptionPadding.Pkcs1.Equals((object)null));
+            Assert.False(RSAEncryptionPadding.Pkcs1 == null);
+            Assert.True(RSAEncryptionPadding.Pkcs1 != null);
+        }
+
+        [Fact]
+        public void RSASignaturePadding_Equality()
+        {
+            Assert.True(RSASignaturePadding.Pkcs1.Equals(RSASignaturePadding.Pkcs1));
+            Assert.True(RSASignaturePadding.Pkcs1.Equals((object)RSASignaturePadding.Pkcs1));
+            Assert.True(RSASignaturePadding.Pkcs1 == RSASignaturePadding.Pkcs1);
+            Assert.False(RSASignaturePadding.Pkcs1 != RSASignaturePadding.Pkcs1);
+
+            Assert.False(RSASignaturePadding.Pkcs1.Equals(RSASignaturePadding.Pss));
+            Assert.False(RSASignaturePadding.Pkcs1.Equals((object)RSASignaturePadding.Pss));
+            Assert.False(RSASignaturePadding.Pkcs1 == RSASignaturePadding.Pss);
+            Assert.True(RSASignaturePadding.Pkcs1 != RSASignaturePadding.Pss);
+
+            Assert.False(RSASignaturePadding.Pkcs1.Equals(null));
+            Assert.False(RSASignaturePadding.Pkcs1.Equals((object)null));
+            Assert.False(RSASignaturePadding.Pkcs1 == null);
+            Assert.True(RSASignaturePadding.Pkcs1 != null);
         }
 
         private sealed class EmptyRSA : RSA