SwiftLint fixes. (#2899)

non_optional_string_data_conversion and static_over_final_class

* Revert Data -> String changes for upcoming rule change.

UnitTests/Sources/AppLock/AppLockServiceTests.swift

@@ -185,7 +185,7 @@ class AppLockServiceTests: XCTestCase {
         // Given a service with the PIN code already set.
         let context = LAContextMock()
         context.biometryTypeValue = .touchID
-        context.evaluatedPolicyDomainStateValue = "👆".data(using: .utf8)
+        context.evaluatedPolicyDomainStateValue = Data("👆".utf8)
         service = AppLockService(keychainController: keychainController, appSettings: appSettings, context: context)
         guard case .success = service.setupPINCode("2023") else {
             XCTFail("The PIN should be valid.")
@@ -217,7 +217,7 @@ class AppLockServiceTests: XCTestCase {
         // Given a service with the PIN code already set.
         let context = LAContextMock()
         context.biometryTypeValue = .touchID
-        context.evaluatedPolicyDomainStateValue = "👆".data(using: .utf8)
+        context.evaluatedPolicyDomainStateValue = Data("👆".utf8)
         service = AppLockService(keychainController: keychainController, appSettings: appSettings, context: context)
         let pinCode = "2023"
         guard case .success = service.setupPINCode(pinCode) else {
@@ -234,7 +234,7 @@ class AppLockServiceTests: XCTestCase {
         XCTAssertTrue(service.biometricUnlockTrusted, "Biometric unlock should be trusted.")
         
         // When the user changes biometric data.
-        context.evaluatedPolicyDomainStateValue = "👈".data(using: .utf8)
+        context.evaluatedPolicyDomainStateValue = Data("👈".utf8)
         
         // Then biometric lock should remain enabled but untrusted.
         XCTAssertTrue(service.isEnabled, "The service should remain enabled.")
@@ -256,7 +256,7 @@ class AppLockServiceTests: XCTestCase {
         // Given a service with the PIN code already set.
         let context = LAContextMock()
         context.biometryTypeValue = .touchID
-        context.evaluatedPolicyDomainStateValue = "👆".data(using: .utf8)
+        context.evaluatedPolicyDomainStateValue = Data("👆".utf8)
         service = AppLockService(keychainController: keychainController, appSettings: appSettings, context: context)
         guard case .success = service.setupPINCode("2023") else {
             XCTFail("The PIN should be valid.")
@@ -285,7 +285,7 @@ class AppLockServiceTests: XCTestCase {
         // Given a service with the PIN code already set.
         let context = LAContextMock()
         context.biometryTypeValue = .touchID
-        context.evaluatedPolicyDomainStateValue = "👆".data(using: .utf8)
+        context.evaluatedPolicyDomainStateValue = Data("👆".utf8)
         service = AppLockService(keychainController: keychainController, appSettings: appSettings, context: context)
         guard case .success = service.setupPINCode("2023") else {
             XCTFail("The PIN should be valid.")

UnitTests/Sources/KeychainControllerTests.swift

@@ -170,7 +170,7 @@ class KeychainControllerTests: XCTestCase {
         XCTAssertNil(keychain.pinCodeBiometricState(), "A new keychain shouldn't return biometric state.")
         
         // When setting the state.
-        let data: Data! = "Face ID".data(using: .utf8)
+        let data = Data("Face ID".utf8)
         try keychain.setPINCodeBiometricState(data)
         
         // Then the state should be stored.
@@ -180,13 +180,13 @@ class KeychainControllerTests: XCTestCase {
     
     func testUpdatePINCodeBiometricState() throws {
         // Given a keychain that contains PIN code biometric state.
-        let data: Data! = "😃".data(using: .utf8)
+        let data = Data("😃".utf8)
         try keychain.setPINCodeBiometricState(data)
         XCTAssertTrue(keychain.containsPINCodeBiometricState(), "The keychain should contain the biometric state.")
         XCTAssertEqual(keychain.pinCodeBiometricState(), data, "The stored biometric state should match what was set.")
         
         // When setting different state.
-        let newData: Data! = "😎".data(using: .utf8)
+        let newData = Data("😎".utf8)
         try keychain.setPINCodeBiometricState(newData)
         
         // Then the state should be updated.
@@ -197,7 +197,7 @@ class KeychainControllerTests: XCTestCase {
     
     func testRemovePINCodeBiometricState() throws {
         // Given a keychain that contains PIN code biometric state.
-        let data: Data! = "Face ID".data(using: .utf8)
+        let data = Data("Face ID".utf8)
         try keychain.setPINCodeBiometricState(data)
         XCTAssertTrue(keychain.containsPINCodeBiometricState(), "The keychain should contain the biometric state.")
         XCTAssertEqual(keychain.pinCodeBiometricState(), data, "The stored biometric state should match what was set.")

UnitTests/Sources/LoggingTests.swift

@@ -294,12 +294,7 @@ class LoggingTests: XCTestCase {
         let currentLogFile = logsFileDirectory.appending(path: "console.1.log")
         let fileHandle = try FileHandle(forWritingTo: currentLogFile)
         try fileHandle.seekToEnd()
-        guard let newLineData = "newline".data(using: .utf8) else {
-            XCTFail("Couldn't create data to write to disk.")
-            return
-        }
-        
-        try fileHandle.write(contentsOf: newLineData)
+        try fileHandle.write(contentsOf: Data("newline".utf8))
         try fileHandle.close()
         
         // Then that file should now be the first log file.