Skip to content

Commit c504511

Browse files
ron4funron4fun
committed
Code refactoring
1 parent 7100bec commit c504511

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+451
-227
lines changed

‎SharpHash.Tests/Checksum/CRCTests.cs

+11-10
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System;
77
using System.Collections.Generic;
88
using System.Linq;
9+
using System.Text;
910

1011
namespace SharpHash.Checksum.Tests
1112
{
@@ -42,18 +43,18 @@ public void TestAnotherChunkedDataIncrementalHash()
4243
while (i < TestConstants.ChunkedData.Length)
4344
{
4445
temp = TestConstants.ChunkedData.Substring(i - size, size);
45-
crcObj.TransformString(temp);
46+
crcObj.TransformString(temp, Encoding.UTF8);
4647

4748
i += size;
4849
} // end while
4950

5051
temp = TestConstants.ChunkedData.Substring((i - size));
51-
crcObj.TransformString(temp);
52+
crcObj.TransformString(temp, Encoding.UTF8);
5253

5354
ActualString = crcObj.TransformFinal().ToString();
5455

5556
ExpectedString = HashFactory.Checksum.CreateCRC(Idx)
56-
.ComputeString(TestConstants.ChunkedData).ToString();
57+
.ComputeString(TestConstants.ChunkedData, Encoding.UTF8).ToString();
5758

5859
Assert.AreEqual(ExpectedString, ActualString);
5960
} // end for
@@ -72,7 +73,7 @@ public void TestCheckValue()
7273

7374
ExpectedString = ((crcObj as ICRC).CheckValue.ToString("X"));
7475

75-
ActualString = TestHelper.lstrip(crcObj.ComputeString(TestConstants.OnetoNine).ToString(), '0');
76+
ActualString = TestHelper.lstrip(crcObj.ComputeString(TestConstants.OnetoNine, Encoding.UTF8).ToString(), '0');
7677

7778
Assert.AreEqual(ExpectedString, ActualString);
7879
} // end foreach
@@ -103,7 +104,7 @@ public void TestHashCloneIsCorrect()
103104
Int32 Count;
104105
string ActualString, ExpectedString;
105106

106-
MainData = Converters.ConvertStringToBytes(TestConstants.DefaultData);
107+
MainData = Converters.ConvertStringToBytes(TestConstants.DefaultData, Encoding.UTF8);
107108
Count = MainData.Length - 3;
108109

109110
ChunkOne = new byte[Count];
@@ -196,17 +197,17 @@ public void TestAnotherChunkedDataIncrementalHash()
196197
while (i < TestConstants.ChunkedData.Length)
197198
{
198199
temp = TestConstants.ChunkedData.Substring(i - size, size);
199-
crcObj.TransformString(temp);
200+
crcObj.TransformString(temp, Encoding.UTF8);
200201

201202
i += size;
202203
} // end while
203204

204205
temp = TestConstants.ChunkedData.Substring((i - size));
205-
crcObj.TransformString(temp);
206+
crcObj.TransformString(temp, Encoding.UTF8);
206207

207208
ActualString = crcObj.TransformFinal().ToString();
208209

209-
ExpectedString = crcObj.ComputeString(TestConstants.ChunkedData)
210+
ExpectedString = crcObj.ComputeString(TestConstants.ChunkedData, Encoding.UTF8)
210211
.ToString();
211212

212213
Assert.AreEqual(ExpectedString, ActualString);
@@ -227,7 +228,7 @@ public void TestCheckValue()
227228

228229
ExpectedString = Check_Value.ToString("X");
229230

230-
ActualString = TestHelper.lstrip(crcObj.ComputeString(TestConstants.OnetoNine).ToString(), '0');
231+
ActualString = TestHelper.lstrip(crcObj.ComputeString(TestConstants.OnetoNine, Encoding.UTF8).ToString(), '0');
231232

232233
Assert.AreEqual(ExpectedString, ActualString);
233234
} // end foreach
@@ -260,7 +261,7 @@ public void TestHashCloneIsCorrect()
260261
Int32 Count;
261262
string ActualString, ExpectedString;
262263

263-
MainData = Converters.ConvertStringToBytes(TestConstants.DefaultData);
264+
MainData = Converters.ConvertStringToBytes(TestConstants.DefaultData, Encoding.UTF8);
264265
Count = MainData.Length - 3;
265266

266267
ChunkOne = new byte[Count];

‎SharpHash.Tests/Crypto/Grindahl256Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

‎SharpHash.Tests/Crypto/Grindahl512Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

‎SharpHash.Tests/Crypto/HAS160Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

‎SharpHash.Tests/Crypto/Keccak_224Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

‎SharpHash.Tests/Crypto/Keccak_256Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

‎SharpHash.Tests/Crypto/Keccak_288Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

‎SharpHash.Tests/Crypto/Keccak_384Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

‎SharpHash.Tests/Crypto/Keccak_512Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

‎SharpHash.Tests/Crypto/MD2Tests.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SharpHash.Utils;
44
using SharpHash.Tests;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using System.Text;
67

78
namespace SharpHash.Crypto.Tests
89
{
@@ -75,8 +76,10 @@ public void TestHashCloneIsUnique()
7576
public void TestHMACWithDefaultDataAndLongKey()
7677
{
7778
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
78-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey);
79-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
79+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACLongStringKey,
80+
Encoding.UTF8);
81+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
82+
Encoding.UTF8).ToString();
8083

8184
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithLongKey, ActualString);
8285
}
@@ -85,8 +88,10 @@ public void TestHMACWithDefaultDataAndLongKey()
8588
public void TestHMACWithDefaultDataAndShortKey()
8689
{
8790
IHMAC hmac = HashFactory.HMAC.CreateHMAC(hash);
88-
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey);
89-
string ActualString = hmac.ComputeString(TestConstants.DefaultData).ToString();
91+
hmac.Key = Converters.ConvertStringToBytes(TestConstants.HMACShortStringKey,
92+
Encoding.UTF8);
93+
string ActualString = hmac.ComputeString(TestConstants.DefaultData,
94+
Encoding.UTF8).ToString();
9095

9196
Assert.AreEqual(ExpectedHashOfDefaultDataWithHMACWithShortKey, ActualString);
9297
}

0 commit comments

Comments
 (0)