Merge pull request #584 from kishikawakatsumi/osxmacos

change OSX to macOS
kishikawakatsumi · Nov 12, 2023 · 28055c5 · 28055c5
2 parents 6511d2a + 5cac110
commit 28055c5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/Lib/KeychainAccessTests/EnumTests.swift b/Lib/KeychainAccessTests/EnumTests.swift
@@ -262,7 +262,7 @@ class EnumTests: XCTestCase {
     }
 
     func testAccessibility() {
-        guard #available(OSX 10.10, *) else {
+        guard #available(macOS 10.10, *) else {
             return
         }
         do {

diff --git a/Lib/KeychainAccessTests/ErrorTypeTests.swift b/Lib/KeychainAccessTests/ErrorTypeTests.swift
@@ -46,7 +46,7 @@ class ErrorTypeTests: XCTestCase {
             XCTAssertEqual(status, .unimplemented)
             XCTAssertEqual(status?.description, "Function or operation not implemented.")
         }
-        #if os(OSX)
+        #if os(macOS)
         do {
             let status = Status(rawValue: errSecDiskFull)
             XCTAssertEqual(status, .diskFull)
@@ -70,7 +70,7 @@ class ErrorTypeTests: XCTestCase {
             XCTAssertEqual(status, .param)
             XCTAssertEqual(status?.description, "One or more parameters passed to a function were not valid.")
         }
-        #if os(OSX)
+        #if os(macOS)
         do {
             let status = Status(rawValue: errSecWrPerm)
             XCTAssertEqual(status, .wrPerm)
@@ -102,7 +102,7 @@ class ErrorTypeTests: XCTestCase {
             XCTAssertEqual(status, .notAvailable)
             XCTAssertEqual(status?.description, "No keychain is available. You may need to restart your computer.")
         }
-        #if os(OSX)
+        #if os(macOS)
         do {
             let status = Status(rawValue: errSecReadOnly)
             XCTAssertEqual(status, .readOnly)
@@ -114,7 +114,7 @@ class ErrorTypeTests: XCTestCase {
             XCTAssertEqual(status, .authFailed)
             XCTAssertEqual(status?.description, "The user name or passphrase you entered is not correct.")
         }
-        #if os(OSX)
+        #if os(macOS)
         do {
             let status = Status(rawValue: errSecNoSuchKeychain)
             XCTAssertEqual(status, .noSuchKeychain)
@@ -151,7 +151,7 @@ class ErrorTypeTests: XCTestCase {
             XCTAssertEqual(status, .itemNotFound)
             XCTAssertEqual(status?.description, "The specified item could not be found in the keychain.")
         }
-        #if os(OSX)
+        #if os(macOS)
         do {
             let status = Status(rawValue: errSecBufferTooSmall)
             XCTAssertEqual(status, .bufferTooSmall)
@@ -193,7 +193,7 @@ class ErrorTypeTests: XCTestCase {
             XCTAssertEqual(status, .interactionNotAllowed)
             XCTAssertEqual(status?.description, "User interaction is not allowed.")
         }
-        #if os(OSX)
+        #if os(macOS)
         do {
             let status = Status(rawValue: errSecReadOnlyAttr)
             XCTAssertEqual(status, .readOnlyAttr)
@@ -364,7 +364,7 @@ class ErrorTypeTests: XCTestCase {
             XCTAssertEqual(status, .internal)
             XCTAssertEqual(status?.description, "An internal error occurred in the Security framework.")
         }
-        #if os(OSX)
+        #if os(macOS)
         do {
             let status = Status(rawValue: errSecServiceNotAvailable)
             XCTAssertEqual(status, .serviceNotAvailable)

diff --git a/Lib/KeychainAccessTests/KeychainAccessTests.swift b/Lib/KeychainAccessTests/KeychainAccessTests.swift
@@ -1316,7 +1316,7 @@ class KeychainAccessTests: XCTestCase {
     // MARK:
 
     func testProperties() {
-        guard #available(OSX 10.10, *) else {
+        guard #available(macOS 10.10, *) else {
             return
         }
 
@@ -1357,7 +1357,7 @@ class KeychainAccessTests: XCTestCase {
                 return key1.compare(key2) == .orderedAscending || key1.compare(key2) == .orderedSame
             }
 
-            #if !os(OSX)
+            #if !os(macOS)
 
             let service: String
             let accessGroup: String
@@ -1431,7 +1431,7 @@ class KeychainAccessTests: XCTestCase {
                 return key1.compare(key2) == .orderedAscending || key1.compare(key2) == .orderedSame
             }
 
-            #if !os(OSX)
+            #if !os(macOS)
 
             let accessGroup: String
             #if targetEnvironment(macCatalyst)
@@ -1504,7 +1504,7 @@ class KeychainAccessTests: XCTestCase {
                 return key1.compare(key2) == .orderedAscending || key1.compare(key2) == .orderedSame
             }
 
-            #if !os(OSX)
+            #if !os(macOS)
             XCTAssertEqual(sortedItems[0]["synchronizable"] as? String, "false")
             XCTAssertEqual(sortedItems[0]["value"] as? String, "google.com_value1")
             XCTAssertEqual(sortedItems[0]["key"] as? String, "google.com_key1")
@@ -1544,7 +1544,7 @@ class KeychainAccessTests: XCTestCase {
             #endif
         }
 
-        #if !os(OSX)
+        #if !os(macOS)
         do {
             let allKeys = Keychain.allKeys(.genericPassword)
             XCTAssertEqual(allKeys.count, 5)
@@ -1598,7 +1598,7 @@ class KeychainAccessTests: XCTestCase {
     // MARK:
 
     func testAuthenticationPolicy() {
-        guard #available(iOS 9.0, OSX 10.11, *) else {
+        guard #available(iOS 9.0, macOS 10.11, *) else {
             return
         }
 
@@ -1796,7 +1796,7 @@ class KeychainAccessTests: XCTestCase {
             XCTAssertTrue(accessControl != nil)
         }
         #endif
-        #if os(OSX)
+        #if os(macOS)
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 

diff --git a/Lib/TestHost/AppDelegate.swift b/Lib/TestHost/AppDelegate.swift
@@ -23,7 +23,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if os(OSX)
+#if os(macOS)
 import Cocoa
 
 @NSApplicationMain
-Original file line number
+Diff line change
@@ Expand Up / @@ -262,7 +262,7 @@ class EnumTests: XCTestCase { @@
         }
         func testAccessibility() {
-            guard #available(OSX 10.10, *) else {
+            guard #available(macOS 10.10, *) else {
                 return
             }
             do {
@@ Expand Down @@