Remove pointless Mock<Key> objects in tests

2 files changed, 18 insertions, 35 deletions

diff --git a/OATH.Net.Test/CounterBasedOtpGeneratorTests.cs b/OATH.Net.Test/CounterBasedOtpGeneratorTests.cs
index 97101fc..f6e8d14 100644
--- a/OATH.Net.Test/CounterBasedOtpGeneratorTests.cs
+++ b/OATH.Net.Test/CounterBasedOtpGeneratorTests.cs
@@ -24,9 +24,7 @@ namespace OathNet.Test
                 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
                 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30
             };
-            var keyMock = new Mock<Key>();
-            keyMock.Setup(k => k.Binary).Returns(keyData);
-            var key = keyMock.Object;
+            var key = new Key(keyData);
 
             this.TestSHA1AndAssert(key, 6, 0, this.GetOtpWithImplicitHMAC(key, 6, 0));
             this.TestSHA1AndAssert(key, 6, 1, this.GetOtpWithImplicitHMAC(key, 6, 1));
@@ -48,9 +46,7 @@ namespace OathNet.Test
                 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
                 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30
             };
-            var keyMock = new Mock<Key>();
-            keyMock.Setup(k => k.Binary).Returns(keyData);
-            var key = keyMock.Object;
+            var key = new Key(keyData);
 
             this.TestSHA1AndAssert(key, 6, 0, "755224");
             this.TestSHA1AndAssert(key, 6, 1, "287082");
@@ -72,9 +68,7 @@ namespace OathNet.Test
                 0xDE, 0xAD, 0xBE, 0xEF, 0x48,
                 0x65, 0x6C, 0x6C, 0x6F, 0x21
             };
-            var keyMock = new Mock<Key>();
-            keyMock.Setup(k => k.Binary).Returns(keyData);
-            var key = keyMock.Object;
+            var key = new Key(keyData);
 
             this.TestSHA1AndAssert(key, 6, 1, "092093");
             this.TestSHA1AndAssert(key, 6, 11, "266262");
diff --git a/OATH.Net.Test/TimeBasedOtpGeneratorTests.cs b/OATH.Net.Test/TimeBasedOtpGeneratorTests.cs
index a51d91a..e9433c1 100644
--- a/OATH.Net.Test/TimeBasedOtpGeneratorTests.cs
+++ b/OATH.Net.Test/TimeBasedOtpGeneratorTests.cs
@@ -16,24 +16,21 @@ namespace OathNet.Test
 
     public class TimeBasedOtpGeneratorTests
     {
-        Mock<Key> keyMock;
-        Key key;
-
-        byte[] binaryForSha1ReferenceKey = new byte[]
+        Key Sha1ReferenceKey = new Key(new byte[]
         {
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30
-        };
+        });
 
-        byte[] binaryForSha256ReferenceKey = new byte[]
+        Key Sha256ReferenceKey = new Key(new byte[]
         {
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
             0x31, 0x32
-        };
+        });
 
-        byte[] binaryForSha512ReferenceKey = new byte[]
+        Key Sha512ReferenceKey = new Key(new byte[]
         {
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
@@ -42,19 +39,12 @@ namespace OathNet.Test
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
             0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
             0x31, 0x32, 0x33, 0x34
-        };
-
-        [SetUp]
-        public void SetUp()
-        {
-            keyMock = new Mock<Key>();
-            key = keyMock.Object;
-        }
+        });
 
         [Test]
         public void GenerateOtp_without_hmac_returns_SHA1_with_bytearray_key()
         {
-            keyMock.Setup(k => k.Binary).Returns(binaryForSha1ReferenceKey);
+            var key = Sha1ReferenceKey;
 
             DateTime dt;
             dt = new DateTime(1970, 1, 1, 0, 0, 59, DateTimeKind.Utc);
@@ -74,7 +64,7 @@ namespace OathNet.Test
         [Test]
         public void GenerateOtp_returns_SHA1_reference_results_with_bytearray_key()
         {
-            keyMock.Setup(k => k.Binary).Returns(binaryForSha1ReferenceKey);
+            var key = Sha1ReferenceKey;
 
             this.TestSHA1AndAssert(key, 8, new DateTime(1970, 1, 1, 0, 0, 59, DateTimeKind.Utc), "94287082");
             this.TestSHA1AndAssert(key, 8, new DateTime(2005, 3, 18, 1, 58, 29, DateTimeKind.Utc), "07081804");
@@ -87,7 +77,7 @@ namespace OathNet.Test
         [Test]
         public void GenerateOtp_returns_SHA256_reference_results_with_bytearray_key()
         {
-            keyMock.Setup(k => k.Binary).Returns(binaryForSha256ReferenceKey);
+            var key = Sha256ReferenceKey;
 
             this.TestSHA256AndAssert(key, 8, new DateTime(1970, 1, 1, 0, 0, 59, DateTimeKind.Utc), "46119246");
             this.TestSHA256AndAssert(key, 8, new DateTime(2005, 3, 18, 1, 58, 29, DateTimeKind.Utc), "68084774");
@@ -100,8 +90,7 @@ namespace OathNet.Test
         [Test]
         public void GenerateOtp_returns_SHA512_reference_results_with_bytearray_key()
         {
-            keyMock.Setup(k => k.Binary).Returns(binaryForSha512ReferenceKey);
-            var key = keyMock.Object;
+            var key = Sha512ReferenceKey;
 
             this.TestSHA512AndAssert(key, 8, new DateTime(1970, 1, 1, 0, 0, 59, DateTimeKind.Utc), "90693936");
             this.TestSHA512AndAssert(key, 8, new DateTime(2005, 3, 18, 1, 58, 29, DateTimeKind.Utc), "25091201");
@@ -119,7 +108,7 @@ namespace OathNet.Test
                 0x48, 0x65, 0x6C, 0x6C, 0x6F,
                 0x21, 0xDE, 0xAD, 0xBE, 0xEF
             };
-            keyMock.Setup(k => k.Binary).Returns(keyData);
+            var key = new Key(keyData);
 
             this.TestSHA1AndAssert(key, 6, new DateTime(2011, 10, 17, 7, 49, 45, DateTimeKind.Utc), "010374");
         }
@@ -132,7 +121,7 @@ namespace OathNet.Test
                 0xDE, 0xAD, 0xBE, 0xEF, 0x48,
                 0x65, 0x6C, 0x6C, 0x6F, 0x21
             };
-            keyMock.Setup(k => k.Binary).Returns(keyData);
+            var key = new Key(keyData);
 
             this.TestSHA1AndAssert(key, 6, new DateTime(2011, 10, 17, 7, 52, 0, DateTimeKind.Utc), "139594");
         }
@@ -140,7 +129,7 @@ namespace OathNet.Test
         [Test]
         public void ValidateOtp_test_validates_within_60_second_validity_period()
         {
-            keyMock.Setup(k => k.Binary).Returns(binaryForSha1ReferenceKey);
+            var key = Sha1ReferenceKey;
             var generator = new TimeBasedOtpGenerator(key, 8);
             var currentTime = new DateTime(2009, 2, 13, 23, 31, 30, DateTimeKind.Utc);
             var sixtySeconds = TimeSpan.FromSeconds(60);
@@ -156,7 +145,7 @@ namespace OathNet.Test
         [Test]
         public void ValidateOtp_test_validates_within_50_second_validity_period()
         {
-            keyMock.Setup(k => k.Binary).Returns(binaryForSha1ReferenceKey);
+            var key = Sha1ReferenceKey;
             var generator = new TimeBasedOtpGenerator(key, 8);
             var currentTime = new DateTime(2033, 5, 18, 3, 33, 20, DateTimeKind.Utc);
             var fiftySeconds = TimeSpan.FromSeconds(50);
@@ -172,7 +161,7 @@ namespace OathNet.Test
         [Test]
         public void ValidateOtp_test_validates_with_an_empty_validity_period()
         {
-            keyMock.Setup(k => k.Binary).Returns(binaryForSha1ReferenceKey);
+            var key = Sha1ReferenceKey;
             var generator = new TimeBasedOtpGenerator(key, 8);
             var currentTime = new DateTime(2033, 5, 18, 3, 33, 20, DateTimeKind.Utc);
             var zeroSeconds = TimeSpan.FromSeconds(0);