Browse Source

Tests doesn't need measure converting to NSData

Norio Nomura 10 năm trước cách đây
mục cha
commit
702255419e

+ 15 - 16
Base32Tests/Base32Tests.swift

@@ -35,11 +35,11 @@ class Base32Tests: XCTestCase {
     // MARK: https://tools.ietf.org/html/rfc4648
     
     func test_RFC4648_Encode() {
+        let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (test, expect, expectHex) in self.vectors {
-                    let data = test.dataUsingUTF8StringEncoding
-                    let result = base32Encode(data)
+                for (test, expect, expectHex) in convertedVectors {
+                    let result = base32Encode(test)
                     XCTAssertEqual(result, expect, "base32Encode for \(test)")
                 }
             }
@@ -47,23 +47,23 @@ class Base32Tests: XCTestCase {
     }
     
     func test_RFC4648_Decode() {
+        let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (expect, test, testHex) in self.vectors {
-                    let data = expect.dataUsingUTF8StringEncoding
+                for (expect, test, testHex) in convertedVectors {
                     let result = base32DecodeToData(test)
-                    XCTAssertEqual(result!, data, "base32Decode for \(test)")
+                    XCTAssertEqual(result!, expect, "base32Decode for \(test)")
                 }
             }
         }
     }
     
     func test_RFC4648_HexEncode() {
+        let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (test, expect, expectHex) in self.vectors {
-                    let data = test.dataUsingUTF8StringEncoding
-                    let resultHex = base32HexEncode(data)
+                for (test, expect, expectHex) in convertedVectors {
+                    let resultHex = base32HexEncode(test)
                     XCTAssertEqual(resultHex, expectHex, "base32HexEncode for \(test)")
                 }
             }
@@ -71,12 +71,12 @@ class Base32Tests: XCTestCase {
     }
     
     func test_RFC4648_HexDecode() {
+        let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (expect, test, testHex) in self.vectors {
-                    let data = expect.dataUsingUTF8StringEncoding
+                for (expect, test, testHex) in convertedVectors {
                     let resultHex = base32HexDecodeToData(testHex)
-                    XCTAssertEqual(resultHex!, data, "base32HexDecode for \(testHex)")
+                    XCTAssertEqual(resultHex!, expect, "base32HexDecode for \(testHex)")
                 }
             }
         }
@@ -149,17 +149,16 @@ class Base32Tests: XCTestCase {
         // "=" stripped valid string
         let strippedVectors = vectors.map {
             (
-                $0,
+                $0.dataUsingUTF8StringEncoding,
                 $1.stringByReplacingOccurrencesOfString("=", withString:""),
                 $2.stringByReplacingOccurrencesOfString("=", withString:"")
             )
         }
         for (expect, test, testHex) in strippedVectors {
-            let data = expect.dataUsingUTF8StringEncoding
             let result = base32DecodeToData(test)
             let resultHex = base32HexDecodeToData(testHex)
-            XCTAssertEqual(result!, data, "base32Decode for \(test)")
-            XCTAssertEqual(resultHex!, data, "base32HexDecode for \(testHex)")
+            XCTAssertEqual(result!, expect, "base32Decode for \(test)")
+            XCTAssertEqual(resultHex!, expect, "base32HexDecode for \(testHex)")
         }
         
         // invalid length string with padding

+ 6 - 6
SecEncodeTransformTests/SecEncodeTransformTests.swift

@@ -36,11 +36,11 @@ class SecEncodeTransformTests: XCTestCase {
     
     // MARK: Using SecEncodeTransform
     func test_RFC4648_Encode_UsingSecEncodeTransform() {
+        let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (test, expect, expectHex) in self.vectors {
-                    let data = test.dataUsingUTF8StringEncoding
-                    let result = TTTBase32EncodedStringFromData(data)
+                for (test, expect, expectHex) in convertedVectors {
+                    let result = TTTBase32EncodedStringFromData(test)
                     XCTAssertEqual(result, expect, "TTTBase32EncodedStringFromData for \(test)")
                 }
             }
@@ -48,12 +48,12 @@ class SecEncodeTransformTests: XCTestCase {
     }
     
     func test_RFC4648_Decode_UsingSecEncodeTransform() {
+        let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (expect, test, testHex) in self.vectors {
-                    let data = expect.dataUsingUTF8StringEncoding
+                for (expect, test, testHex) in convertedVectors {
                     let result = TTTDataFromBase32EncodedString(test)
-                    XCTAssertEqual(result, data, "TTTDataFromBase32EncodedString for \(test)")
+                    XCTAssertEqual(result, expect, "TTTDataFromBase32EncodedString for \(test)")
                 }
             }
         }