Cleanup

Author: fabianfett

Sources/Base64Kit/Base64.swift

@@ -21,64 +21,90 @@ print("------------------------------------------")
 print("Encoding")
 
 let data = Data(bytes)
-let foundationEncoding = timing(name: "Foundation") {
+let foundationEncodingString = timing(name: "Foundation: Data to String  ") {
     for _ in 1 ... runs {
         _ = data.base64EncodedString()
     }
 }
 
-let base64Encoding = timing(name: "Base64    ") {
+let foundationEncodingData = timing(name: "Foundation: Data to Data    ") {
     for _ in 1 ... runs {
-        _ = Base64.encode(bytes: bytes) // String(base64Encoding: bytes)
+        _ = data.base64EncodedData()
     }
 }
 
-let chromeEncoding = timing(name: "Chromium  ") {
+let chromeEncodingBytes = timing(name: "Chromium: [UInt8] to [UInt8]") {
     for _ in 1 ... runs {
-        _ = Base64.encodeChromium(bytes: bytes) // String(base64Encoding: bytes)
+        let _ : [UInt8] = Base64.encodeChromium(bytes: bytes)
+    }
+}
+
+let chromeEncodingString = timing(name: "Chromium: [UInt8] to String ") {
+    for _ in 1 ... runs {
+        let _ : String = Base64.encodeChromium(bytes: bytes)
+    }
+}
+
+let chromeEncodingData = timing(name: "Chromium: Data    to [UInt8]") {
+    for _ in 1 ... runs {
+        let _ : String = Base64.encodeChromium(bytes: data)
     }
 }
 
 print("------------------------------------------")
 print("Decoding")
 
-let foundationDecoding = timing(name: "Foundation") {
+let foundationDecodingFromString = timing(name: "Foundation: String to Data  ") {
     for _ in 1 ... runs {
         _ = Data(base64Encoded: base64)
     }
 }
 
-let base64Decoding = timing(name: "Base64    ") {
+let encodedData = Data(base64.utf8)
+let foundationDecodingFromData = timing(name: "Foundation: Data   to Data  ") {
     for _ in 1 ... runs {
-        _ = try! base64.base64decoded()
+        _ = Data(base64Encoded: encodedData)
     }
 }
 
-let chromeDecoding = timing(name: "Chromium  ") {
+let encodedUInt8Array = Array(base64.utf8)
+let chromeDecodingFromBytes = timing(name: "Chromium: [UInt8] to [UInt8]") {
     for _ in 1 ... runs {
-        _ = try! Base64.decodeChromium(bytes: [UInt8](base64.utf8)) // String(base64Encoding: bytes)
+        _ = try! Base64.decodeChromium(bytes: encodedUInt8Array)
     }
 }
 
-// print("------------------------------------------")
-// print("Results")
-
-var result: Int32 = 0
-if foundationEncoding < base64Encoding {
-    print("Base64 encoding must be at least as fast as Foundation encoding")
-    result = 1
+let chromeDecodingFromString = timing(name: "Chromium: String  to [UInt8]") {
+    for _ in 1 ... runs {
+        _ = try! Base64.decodeChromium(string: base64)
+    }
 }
 
-if foundationDecoding < base64Decoding {
-    print("Base64 decoding must be at least as fast as Foundation decoding")
-    result = 1
+let chromeDecodingFromData = timing(name: "Chromium: Data    to [UInt8]") {
+    for _ in 1 ... runs {
+        _ = try! Base64.decodeChromium(bytes: encodedData)
+    }
 }
 
-if result == 0 {
-    let encodingGain = round(foundationEncoding / base64Encoding * 1000) / 1000
-    let decodingGain = round(foundationDecoding / base64Decoding * 1000) / 1000
-    print("Encoding: \(encodingGain)x")
-    print("Decoding: \(decodingGain)x")
-}
+// print("------------------------------------------")
+// print("Results")
+
+var result: Int32 = 0
+//if foundationEncoding < base64Encoding {
+//    print("Base64 encoding must be at least as fast as Foundation encoding")
+//    result = 1
+//}
+//
+//if foundationDecoding < base64Decoding {
+//    print("Base64 decoding must be at least as fast as Foundation decoding")
+//    result = 1
+//}
+//
+//if result == 0 {
+//    let encodingGain = round(foundationEncoding / base64Encoding * 1000) / 1000
+//    let decodingGain = round(foundationDecoding / base64Decoding * 1000) / 1000
+//    print("Encoding: \(encodingGain)x")
+//    print("Decoding: \(decodingGain)x")
+//}
 
 exit(result)

Sources/Base64Kit/Chromium.swift

@@ -6,27 +6,33 @@ class ChromiumTests: XCTestCase {
 
     func testEncodeEmptyData() {
         let data = [UInt8]()
-        let encodedData = Base64.encodeChromium(bytes: data)
+        let encodedData: [UInt8] = Base64.encodeChromium(bytes: data)
         XCTAssertEqual(encodedData.count, 0)
     }
 
     func testBase64EncodingArrayOfNulls() {
         let data = Array(repeating: UInt8(0), count: 10)
-        let encodedData = Base64.encodeChromium(bytes: data)
+        let encodedData: [UInt8] = Base64.encodeChromium(bytes: data)
         XCTAssertEqual(encodedData, [UInt8]("AAAAAAAAAAAAAA==".utf8))
     }
 
     func testBase64EncodingAllTheBytesSequentially() {
         let data = Array(UInt8(0) ... UInt8(255))
-        let encodedData = Base64.encodeChromium(bytes: data)
+        let encodedData: [UInt8] = Base64.encodeChromium(bytes: data)
         XCTAssertEqual(encodedData, [UInt8]("AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==".utf8))
     }
 
     func testBase64UrlEncodingAllTheBytesSequentially() {
         let data = Array(UInt8(0) ... UInt8(255))
-        let encodedData = Base64.encodeChromium(bytes: data, options: .base64UrlAlphabet)
+        let encodedData: [UInt8] = Base64.encodeChromium(bytes: data, options: .base64UrlAlphabet)
         XCTAssertEqual(encodedData, [UInt8]("AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0-P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn-AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq-wsbKztLW2t7i5uru8vb6_wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t_g4eLj5OXm5-jp6uvs7e7v8PHy8_T19vf4-fr7_P3-_w==".utf8))
     }
+    
+    func testBase64UrlEncodingAllTheBytesSequentiallyOmitPadding() {
+        let data = Array(UInt8(0) ... UInt8(255))
+        let encodedData: [UInt8] = Base64.encodeChromium(bytes: data, options: [.base64UrlAlphabet, .omitPaddingCharacter])
+        XCTAssertEqual(encodedData, [UInt8]("AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0-P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn-AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq-wsbKztLW2t7i5uru8vb6_wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t_g4eLj5OXm5-jp6uvs7e7v8PHy8_T19vf4-fr7_P3-_w".utf8))
+    }
 
     // MARK: Decoding
 
@@ -59,7 +65,17 @@ class ChromiumTests: XCTestCase {
 
         let expected = Array(UInt8(0) ... UInt8(255))
         var decoded: [UInt8]?
-        XCTAssertNoThrow(decoded = try base64.base64decoded(options: .base64UrlAlphabet))
+        XCTAssertNoThrow(decoded = try Base64.decodeChromium(string: base64, options: .base64UrlAlphabet))
+
+        XCTAssertEqual(decoded, expected)
+    }
+    
+    func testBase64UrlDecodingAllTheBytesSequentiallyOmitPadding() {
+        let base64 = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0-P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn-AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq-wsbKztLW2t7i5uru8vb6_wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t_g4eLj5OXm5-jp6uvs7e7v8PHy8_T19vf4-fr7_P3-_w"
+
+        let expected = Array(UInt8(0) ... UInt8(255))
+        var decoded: [UInt8]?
+        XCTAssertNoThrow(decoded = try Base64.decodeChromium(string: base64, options: [.base64UrlAlphabet, .omitPaddingCharacter]))
 
         XCTAssertEqual(decoded, expected)
     }

Sources/Base64KitPerformanceTest/main.swift

@@ -4,12 +4,12 @@ import XCTest
 class IntegrationTests: XCTestCase {
     func testEncodeAndDecodingĨ() throws {
         var input = "Ĩ"
-        let output = try input.withUTF8 { (ptr) -> String in
-            let bytes = String(base64Encoding: ptr)
-            let decoded = try bytes.base64decoded()
-
-            return String(bytes: decoded, encoding: .utf8)!
+        let encoded = input.withUTF8 { (ptr) -> String in
+            Base64.encodeChromium(bytes: ptr)
         }
+        
+        let decoded = try Base64.decodeChromium(string: encoded)
+        let output = String(decoding: decoded, as: Unicode.UTF8.self)
 
         XCTAssertEqual(input, output)
     }