Change tests to using `dataUsingUTF8StringEncoding`

Base32.xcodeproj/project.pbxproj

@@ -11,6 +11,11 @@
 		6C10E91A1A754346006EED90 /* TTTDataTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C10E9141A7540B5006EED90 /* TTTDataTransformer.m */; };
 		6C122F7D1A85E52C004FD458 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F7C1A85E52C004FD458 /* StringExtension.swift */; };
 		6C122F7E1A85E52C004FD458 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F7C1A85E52C004FD458 /* StringExtension.swift */; };
+		6C122F821A85EA0A004FD458 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F7C1A85E52C004FD458 /* StringExtension.swift */; };
+		6C122F831A85EA0B004FD458 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F7C1A85E52C004FD458 /* StringExtension.swift */; };
+		6C122F851A85EA52004FD458 /* StringExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F841A85EA52004FD458 /* StringExtensionTests.swift */; };
+		6C122F861A85EA52004FD458 /* StringExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F841A85EA52004FD458 /* StringExtensionTests.swift */; };
+		6C122F871A85F332004FD458 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F7C1A85E52C004FD458 /* StringExtension.swift */; };
 		6CA0A79E1A74E80600AC539F /* Base32.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CA0A79D1A74E80600AC539F /* Base32.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6CA0A7A41A74E80600AC539F /* Base32.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA0A7981A74E80600AC539F /* Base32.framework */; };
 		6CA0A7AB1A74E80600AC539F /* Base32Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA0A7AA1A74E80600AC539F /* Base32Tests.swift */; };
@@ -45,6 +50,7 @@
 		6C10E9131A7540B5006EED90 /* TTTDataTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TTTDataTransformer.h; sourceTree = "<group>"; };
 		6C10E9141A7540B5006EED90 /* TTTDataTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTTDataTransformer.m; sourceTree = "<group>"; };
 		6C122F7C1A85E52C004FD458 /* StringExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtension.swift; sourceTree = "<group>"; };
+		6C122F841A85EA52004FD458 /* StringExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtensionTests.swift; sourceTree = "<group>"; };
 		6CA0A7981A74E80600AC539F /* Base32.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Base32.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6CA0A79C1A74E80600AC539F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6CA0A79D1A74E80600AC539F /* Base32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Base32.h; sourceTree = "<group>"; };
@@ -173,6 +179,7 @@
 			isa = PBXGroup;
 			children = (
 				6CA0A7AA1A74E80600AC539F /* Base32Tests.swift */,
+				6C122F841A85EA52004FD458 /* StringExtensionTests.swift */,
 				6CA0A7A81A74E80600AC539F /* Supporting Files */,
 			);
 			path = Base32Tests;
@@ -492,7 +499,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6C122F851A85EA52004FD458 /* StringExtensionTests.swift in Sources */,
 				6CA0A7AB1A74E80600AC539F /* Base32Tests.swift in Sources */,
+				6C122F821A85EA0A004FD458 /* StringExtension.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -509,7 +518,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6C122F861A85EA52004FD458 /* StringExtensionTests.swift in Sources */,
 				6CA0A7EE1A74ECD700AC539F /* Base32Tests.swift in Sources */,
+				6C122F831A85EA0B004FD458 /* StringExtension.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -519,6 +530,7 @@
 			files = (
 				6CA0A80C1A75135D00AC539F /* SecEncodeTransformTests.swift in Sources */,
 				6C10E91A1A754346006EED90 /* TTTDataTransformer.m in Sources */,
+				6C122F871A85F332004FD458 /* StringExtension.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Base32Tests/Base32Tests.swift

@@ -1,6 +1,6 @@
 //
 //  Base32Tests.swift
-//  TOTP
+//  Base32
 //
 //  Created by 野村 憲男 on 1/24/15.
 //  Copyright (c) 2015 Norio Nomura. All rights reserved.
@@ -38,7 +38,7 @@ class Base32Tests: XCTestCase {
         self.measureBlock{
             for _ in 0...100 {
                 for (test, expect, expectHex) in self.vectors {
-                    let data = test.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
+                    let data = test.dataUsingUTF8StringEncoding
                     let result = base32Encode(data)
                     XCTAssertEqual(result, expect, "base32Encode for \(test)")
                 }
@@ -50,9 +50,9 @@ class Base32Tests: XCTestCase {
         self.measureBlock{
             for _ in 0...100 {
                 for (expect, test, testHex) in self.vectors {
-                    let data = expect.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
+                    let data = expect.dataUsingUTF8StringEncoding
                     let result = base32DecodeToData(test)
-                    XCTAssertEqual(result!, data!, "base32Decode for \(test)")
+                    XCTAssertEqual(result!, data, "base32Decode for \(test)")
                 }
             }
         }
@@ -62,7 +62,7 @@ class Base32Tests: XCTestCase {
         self.measureBlock{
             for _ in 0...100 {
                 for (test, expect, expectHex) in self.vectors {
-                    let data = test.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
+                    let data = test.dataUsingUTF8StringEncoding
                     let resultHex = base32HexEncode(data)
                     XCTAssertEqual(resultHex, expectHex, "base32HexEncode for \(test)")
                 }
@@ -74,9 +74,9 @@ class Base32Tests: XCTestCase {
         self.measureBlock{
             for _ in 0...100 {
                 for (expect, test, testHex) in self.vectors {
-                    let data = expect.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
+                    let data = expect.dataUsingUTF8StringEncoding
                     let resultHex = base32HexDecodeToData(testHex)
-                    XCTAssertEqual(resultHex!, data!, "base32HexDecode for \(testHex)")
+                    XCTAssertEqual(resultHex!, data, "base32HexDecode for \(testHex)")
                 }
             }
         }
@@ -104,9 +104,9 @@ class Base32Tests: XCTestCase {
     func test_ExtensionData() {
         let dataVectors = vectors.map {
             (
-                $0.dataUsingEncoding(NSUTF8StringEncoding)!,
-                $1.dataUsingEncoding(NSUTF8StringEncoding)!,
-                $2.dataUsingEncoding(NSUTF8StringEncoding)!
+                $0.dataUsingUTF8StringEncoding,
+                $1.dataUsingUTF8StringEncoding,
+                $2.dataUsingUTF8StringEncoding
             )
         }
         self.measureBlock{
@@ -126,7 +126,7 @@ class Base32Tests: XCTestCase {
     }
     
     func test_ExtensionDataAndString() {
-        let dataAndStringVectors = vectors.map {($0.dataUsingEncoding(NSUTF8StringEncoding)!, $1, $2)}
+        let dataAndStringVectors = vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
                 for (test, expect, expectHex) in dataAndStringVectors {
@@ -155,11 +155,11 @@ class Base32Tests: XCTestCase {
             )
         }
         for (expect, test, testHex) in strippedVectors {
-            let data = expect.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
+            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!, data, "base32Decode for \(test)")
+            XCTAssertEqual(resultHex!, data, "base32HexDecode for \(testHex)")
         }
         
         // invalid length string with padding

Base32Tests/StringExtensionTests.swift

@@ -0,0 +1,31 @@
+//
+//  StringExtensionTests.swift
+//  Base32
+//
+//  Created by 野村 憲男 on 2/7/15.
+//  Copyright (c) 2015 Norio Nomura. All rights reserved.
+//
+
+import Cocoa
+import XCTest
+
+class StringExtensionTests: XCTestCase {
+
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    func test_dataUsingUTF8StringEncoding() {
+        let emptyString = ""
+        XCTAssertEqual(emptyString.dataUsingUTF8StringEncoding, emptyString.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!)
+
+        let string = "0112233445566778899AABBCCDDEEFFaabbccddeefff"
+        XCTAssertEqual(string.dataUsingUTF8StringEncoding, string.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!)
+    }
+}

SecEncodeTransformTests/SecEncodeTransformTests.swift

@@ -39,7 +39,7 @@ class SecEncodeTransformTests: XCTestCase {
         self.measureBlock{
             for _ in 0...100 {
                 for (test, expect, expectHex) in self.vectors {
-                    let data = test.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
+                    let data = test.dataUsingUTF8StringEncoding
                     let result = TTTBase32EncodedStringFromData(data)
                     XCTAssertEqual(result, expect, "TTTBase32EncodedStringFromData for \(test)")
                 }
@@ -51,9 +51,9 @@ class SecEncodeTransformTests: XCTestCase {
         self.measureBlock{
             for _ in 0...100 {
                 for (expect, test, testHex) in self.vectors {
-                    let data = expect.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
+                    let data = expect.dataUsingUTF8StringEncoding
                     let result = TTTDataFromBase32EncodedString(test)
-                    XCTAssertEqual(result, data!, "TTTDataFromBase32EncodedString for \(test)")
+                    XCTAssertEqual(result, data, "TTTDataFromBase32EncodedString for \(test)")
                 }
             }
         }