Use Apple approved test format (#11)

Author: fabianfett

Sources/Base64Kit/Base64.swift

@@ -150,7 +150,7 @@ extension Base64 {
     public static let base64UrlAlphabet = DecodingOptions(rawValue: UInt(1 << 0))
   }
 
-  public enum DecodingError: Error {
+  public enum DecodingError: Error, Equatable {
     case invalidLength
     case invalidCharacter(UInt8)
     case unexpectedPaddingCharacter

Tests/Base64KitTests/DecodingTests.swift

@@ -4,57 +4,47 @@ import XCTest
 class DecodingTests: XCTestCase {
 
   func testDecodeEmptyString() throws {
-    let decoded = try "".base64decoded()
-    XCTAssertEqual(decoded.count, 0)
+    var decoded: [UInt8]?
+    XCTAssertNoThrow(decoded = try "".base64decoded())
+    XCTAssertEqual(decoded?.count, 0)
   }
 
   func testBase64DecodingArrayOfNulls() throws {
     let expected = Array(repeating: UInt8(0), count: 10)
-    let decoded  = try "AAAAAAAAAAAAAA==".base64decoded()
+    var decoded: [UInt8]?
+    XCTAssertNoThrow(decoded = try "AAAAAAAAAAAAAA==".base64decoded())
     XCTAssertEqual(decoded, expected)
   }
 
-  func testBase64DecodingAllTheBytesSequentially() throws {
+  func testBase64DecodingAllTheBytesSequentially() {
     let base64 = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=="
 
     let expected = Array(UInt8(0)...UInt8(255))
-    let decoded  = try base64.base64decoded()
+    var decoded: [UInt8]?
+    XCTAssertNoThrow(decoded = try base64.base64decoded())
 
     XCTAssertEqual(decoded, expected)
   }
 
-  func testBase64UrlDecodingAllTheBytesSequentially() throws {
+  func testBase64UrlDecodingAllTheBytesSequentially() {
     let base64 = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0-P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn-AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq-wsbKztLW2t7i5uru8vb6_wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t_g4eLj5OXm5-jp6uvs7e7v8PHy8_T19vf4-fr7_P3-_w=="
 
     let expected = Array(UInt8(0)...UInt8(255))
-    let decoded  = try base64.base64decoded(options: .base64UrlAlphabet)
+    var decoded: [UInt8]?
+    XCTAssertNoThrow(decoded = try base64.base64decoded(options: .base64UrlAlphabet))
 
     XCTAssertEqual(decoded, expected)
   }
 
   func testBase64DecodingWithPoop() {
-    do {
-      _ = try "💩".base64decoded()
-      XCTFail("This point should not be reached")
-    }
-    catch Base64.DecodingError.invalidCharacter(_) {
-      
-    }
-    catch {
-      XCTFail("Unexpected error: \(error)")
+    XCTAssertThrowsError(_ = try "💩".base64decoded()) { (error) in
+      XCTAssertEqual(error as? Base64.DecodingError, .invalidCharacter(240))
     }
   }
 
   func testBase64DecodingWithInvalidLength() {
-    do {
-      _ = try "AAAAA".base64decoded()
-      XCTFail("This point should not be reached")
-    }
-    catch Base64.DecodingError.invalidLength {
-      
-    }
-    catch {
-      XCTFail("Unexpected error: \(error)")
+    XCTAssertThrowsError(_ = try "AAAAA".base64decoded()) { (error) in
+      XCTAssertEqual(error as? Base64.DecodingError, .invalidLength)
     }
   }
 

Tests/Base64KitTests/EncodingTests.swift

@@ -2,25 +2,25 @@ import XCTest
 @testable import Base64Kit
 
 class EncodingTests: XCTestCase {
-  func testEncodeEmptyData() throws {
+  func testEncodeEmptyData() {
     let data = [UInt8]()
     let encodedData = String(base64Encoding: data)
     XCTAssertEqual(encodedData.count, 0)
   }
 
-  func testBase64EncodingArrayOfNulls() throws {
+  func testBase64EncodingArrayOfNulls() {
     let data = Array(repeating: UInt8(0), count: 10)
     let encodedData = String(base64Encoding: data)
     XCTAssertEqual(encodedData, "AAAAAAAAAAAAAA==")
   }
 
-  func testBase64EncodingAllTheBytesSequentially() throws {
+  func testBase64EncodingAllTheBytesSequentially() {
     let data = Array(UInt8(0)...UInt8(255))
     let encodedData = String(base64Encoding: data)
     XCTAssertEqual(encodedData, "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==")
   }
 
-  func testBase64UrlEncodingAllTheBytesSequentially() throws {
+  func testBase64UrlEncodingAllTheBytesSequentially() {
     let data = Array(UInt8(0)...UInt8(255))
     let encodedData = String(base64Encoding: data, options: .base64UrlAlphabet)
     XCTAssertEqual(encodedData, "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0-P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn-AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq-wsbKztLW2t7i5uru8vb6_wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t_g4eLj5OXm5-jp6uvs7e7v8PHy8_T19vf4-fr7_P3-_w==")