Browse Source

Fix tests. Make Hash public.

Marcin Krzyżanowski 9 years ago
parent
commit
633d0fcc5c

+ 1 - 1
Sources/CryptoSwift/Digest.swift

@@ -7,7 +7,7 @@
 //
 
 @available(*, deprecated:0.6.0, renamed: "Digest")
-typealias Hash = Digest
+public typealias Hash = Digest
 
 public struct Digest {
     public static func md5(_ bytes: Array<UInt8>) -> Array<UInt8> {

+ 6 - 6
Tests/CryptoSwiftTests/Access.swift

@@ -21,12 +21,12 @@ class Access: XCTestCase {
     }
 
     func testHash() {
-        let _ = Hash.md5([1,2,3])
-        let _ = Hash.sha1([1,2,3])
-        let _ = Hash.sha224([1,2,3])
-        let _ = Hash.sha256([1,2,3])
-        let _ = Hash.sha384([1,2,3])
-        let _ = Hash.sha512([1,2,3])
+        let _ = Digest.md5([1,2,3])
+        let _ = Digest.sha1([1,2,3])
+        let _ = Digest.sha224([1,2,3])
+        let _ = Digest.sha256([1,2,3])
+        let _ = Digest.sha384([1,2,3])
+        let _ = Digest.sha512([1,2,3])
     }
 
     func testArrayExtension() {

+ 3 - 3
Tests/CryptoSwiftTests/HashTests.swift

@@ -16,12 +16,12 @@ final class HashTests: XCTestCase {
     
     func testMD5Data() {
         let data = [0x31, 0x32, 0x33] as Array<UInt8> // "1", "2", "3"
-        XCTAssertEqual(Hash.md5(data), [0x20,0x2c,0xb9,0x62,0xac,0x59,0x07,0x5b,0x96,0x4b,0x07,0x15,0x2d,0x23,0x4b,0x70], "MD5 calculation failed");
+        XCTAssertEqual(Digest.md5(data), [0x20,0x2c,0xb9,0x62,0xac,0x59,0x07,0x5b,0x96,0x4b,0x07,0x15,0x2d,0x23,0x4b,0x70], "MD5 calculation failed");
     }
 
     func testMD5EmptyString() {
         let data:Data = "".data(using: String.Encoding.utf8, allowLossyConversion: false) ?? Data()
-        XCTAssertEqual(Hash.md5(data.bytes), [0xd4,0x1d,0x8c,0xd9,0x8f,0x00,0xb2,0x04,0xe9,0x80,0x09,0x98,0xec,0xf8,0x42,0x7e], "MD5 calculation failed")
+        XCTAssertEqual(Digest.md5(data.bytes), [0xd4,0x1d,0x8c,0xd9,0x8f,0x00,0xb2,0x04,0xe9,0x80,0x09,0x98,0xec,0xf8,0x42,0x7e], "MD5 calculation failed")
     }
 
     func testMD5String() {
@@ -39,7 +39,7 @@ final class HashTests: XCTestCase {
         self.measureMetrics([XCTPerformanceMetric_WallClockTime], automaticallyStartMeasuring: false, for: { () -> Void in
             let arr = Array<UInt8>(repeating: 200, count: 1024 * 1024)
             self.startMeasuring()
-            _ = Hash.md5(arr)
+            _ = Digest.md5(arr)
             self.stopMeasuring()
         })
     }