Remove SinglePromptSecureEnclave tests from tvOS

Signed-off-by: Diogo Tridapalli <diogot@users.noreply.github.com>
square · Aug 16, 2022 · f615eeb · f615eeb
1 parent 75fe4ab
commit f615eeb
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 107 deletions.
diff --git a/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift b/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift
@@ -18,13 +18,13 @@ import Foundation
 @testable import Valet
 import XCTest
 
+#if !os(tvOS)
 #if canImport(LocalAuthentication)
 
 class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
 {
     static let identifier = Identifier(nonEmpty: "valet_testing")!
 
-    @available(tvOS 11.0, *)
     func valet() -> SinglePromptSecureEnclaveValet {
         .valet(with: SinglePromptSecureEnclaveTests.identifier, accessControl: .userPresence)
     }
@@ -35,9 +35,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
     {
         super.setUp()
 
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() else {
             return
         }
@@ -52,9 +49,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
 
     func test_SinglePromptSecureEnclaveValetsWithEqualConfiguration_canAccessSameData() throws
     {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() && testEnvironmentSupportsWhenPasscodeSet() else {
             return
         }
@@ -67,9 +61,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
 
     func test_SinglePromptSecureEnclaveValetsWithDifferingAccessControl_canNotAccessSameData() throws
     {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() && testEnvironmentSupportsWhenPasscodeSet() else {
             return
         }
@@ -87,9 +78,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
 
     func test_allKeys() throws
     {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() && testEnvironmentSupportsWhenPasscodeSet() else {
             return
         }
@@ -107,9 +95,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
     }
 
     func test_allKeys_doesNotReflectValetImplementationDetails() throws {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() && testEnvironmentSupportsWhenPasscodeSet() else {
             return
         }
@@ -123,9 +108,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
 
     func test_canAccessKeychain()
     {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() else {
             return
         }
@@ -140,9 +122,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
     }
 
     func test_canAccessKeychain_sharedAccessGroup() {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() else {
             return
         }
@@ -159,9 +138,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
     #if !os(macOS)
     // We can't test app groups on macOS without a paid developer account, which we don't have.
     func test_canAccessKeychain_sharedAppGroup() {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() else {
             return
         }
@@ -180,9 +156,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
 
     func test_migrateObjectsMatchingQuery_failsForBadQuery()
     {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() else {
             return
         }
@@ -198,9 +171,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
 
     func test_migrateObjectsFromValet_migratesSuccessfullyToSecureEnclave() throws
     {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() && testEnvironmentSupportsWhenPasscodeSet() else {
             return
         }
@@ -239,9 +209,6 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
     }
 
     func test_migrateObjectsFromValet_migratesSuccessfullyAfterCanAccessKeychainCalls() throws {
-        guard #available(tvOS 11.0, *) else {
-            return
-        }
         guard testEnvironmentIsSigned() && testEnvironmentSupportsWhenPasscodeSet() else {
             return
         }
@@ -269,3 +236,4 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase
 }
 
 #endif
+#endif
diff --git a/Tests/ValetObjectiveCBridgeTests/VALSinglePromptSecureEnclaveValetTests.m b/Tests/ValetObjectiveCBridgeTests/VALSinglePromptSecureEnclaveValetTests.m
@@ -16,6 +16,10 @@
 #import <Valet/Valet.h>
 #import <XCTest/XCTest.h>
 
+#if TARGET_OS_TV
+
+#else
+
 @interface VALSinglePromptSecureEnclaveValetTests : XCTestCase
 @end
 
@@ -66,134 +70,106 @@ - (NSString *)sharedAppGroupIdentifier;
 
 - (void)test_valetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlDevicePasscode;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:self.identifier accessControl:VALSecureEnclaveAccessControlDevicePasscode];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlDevicePasscode);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:self.identifier accessControl:VALSecureEnclaveAccessControlDevicePasscode];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlDevicePasscode);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_valetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlUserPresence;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:self.identifier accessControl:VALSecureEnclaveAccessControlUserPresence];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlUserPresence);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:self.identifier accessControl:VALSecureEnclaveAccessControlUserPresence];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlUserPresence);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_valetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlBiometricAny;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:self.identifier accessControl:VALSecureEnclaveAccessControlBiometricAny];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricAny);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:self.identifier accessControl:VALSecureEnclaveAccessControlBiometricAny];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricAny);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_valetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlBiometricCurrentSet;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:self.identifier accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricCurrentSet);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:self.identifier accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricCurrentSet);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_valetWithIdentifier_accessibility_returnsNilWhenIdentifierIsEmpty;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:@"" accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
-        XCTAssertNil(valet);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet valetWithIdentifier:@"" accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
+    XCTAssertNil(valet);
 }
 
 - (void)test_sharedAccessGroupValetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlDevicePasscode;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:self.sharedAccessGroupIdentifier accessControl:VALSecureEnclaveAccessControlDevicePasscode];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlDevicePasscode);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:self.sharedAccessGroupIdentifier accessControl:VALSecureEnclaveAccessControlDevicePasscode];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlDevicePasscode);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_sharedAccessGroupValetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlUserPresence;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:self.sharedAccessGroupIdentifier accessControl:VALSecureEnclaveAccessControlUserPresence];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlUserPresence);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:self.sharedAccessGroupIdentifier accessControl:VALSecureEnclaveAccessControlUserPresence];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlUserPresence);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_sharedAccessGroupValetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlBiometricAny;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:self.sharedAccessGroupIdentifier accessControl:VALSecureEnclaveAccessControlBiometricAny];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricAny);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:self.sharedAccessGroupIdentifier accessControl:VALSecureEnclaveAccessControlBiometricAny];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricAny);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_sharedAccessGroupValetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlBiometricCurrentSet;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:self.sharedAccessGroupIdentifier accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricCurrentSet);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:self.sharedAccessGroupIdentifier accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricCurrentSet);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_sharedAccessGroupValetWithIdentifier_accessibility_returnsNilWhenIdentifierIsEmpty;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:@"" accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
-        XCTAssertNil(valet);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithAppIDPrefix:self.appIDPrefix sharedGroupIdentifier:@"" accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
+    XCTAssertNil(valet);
 }
 
 - (void)test_sharedAppGroupValetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlDevicePasscode;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:self.sharedAppGroupIdentifier accessControl:VALSecureEnclaveAccessControlDevicePasscode];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlDevicePasscode);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:self.sharedAppGroupIdentifier accessControl:VALSecureEnclaveAccessControlDevicePasscode];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlDevicePasscode);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_sharedAppGroupValetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlUserPresence;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:self.sharedAppGroupIdentifier accessControl:VALSecureEnclaveAccessControlUserPresence];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlUserPresence);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:self.sharedAppGroupIdentifier accessControl:VALSecureEnclaveAccessControlUserPresence];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlUserPresence);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_sharedAppGroupValetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlBiometricAny;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:self.sharedAppGroupIdentifier accessControl:VALSecureEnclaveAccessControlBiometricAny];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricAny);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:self.sharedAppGroupIdentifier accessControl:VALSecureEnclaveAccessControlBiometricAny];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricAny);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_sharedAppGroupValetWithIdentifier_accessControl_returnsCorrectValet_VALSecureEnclaveAccessControlBiometricCurrentSet;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:self.sharedAppGroupIdentifier accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
-        XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricCurrentSet);
-        XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:self.sharedAppGroupIdentifier accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
+    XCTAssertEqual(valet.accessControl, VALSecureEnclaveAccessControlBiometricCurrentSet);
+    XCTAssertEqual([valet class], [VALSinglePromptSecureEnclaveValet class]);
 }
 
 - (void)test_sharedAppGroupValetWithIdentifier_accessibility_returnsNilWhenIdentifierIsEmpty;
 {
-    if (@available(tvOS 11.0, *)) {
-        VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:@"" accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
-        XCTAssertNil(valet);
-    }
+    VALSinglePromptSecureEnclaveValet *const valet = [VALSinglePromptSecureEnclaveValet sharedGroupValetWithGroupPrefix:self.groupPrefix sharedGroupIdentifier:@"" accessControl:VALSecureEnclaveAccessControlBiometricCurrentSet];
+    XCTAssertNil(valet);
 }
 
 @end
+
+#endif
diff --git a/Tests/ValetTests/SinglePromptSecureEnclaveTests.swift b/Tests/ValetTests/SinglePromptSecureEnclaveTests.swift
@@ -14,14 +14,14 @@
 //  limitations under the License.
 //
 
+#if !os(tvOS)
 #if canImport(LocalAuthentication)
 
 import Foundation
 @testable import Valet
 import XCTest
 
 
-@available(tvOS 11.0, *)
 class SinglePromptSecureEnclaveTests: XCTestCase
 {
     static let identifier = Identifier(nonEmpty: "valet_testing")!
@@ -58,3 +58,4 @@ class SinglePromptSecureEnclaveTests: XCTestCase
 }
 
 #endif
+#endif