Skip to content

Commit addd7bf

Browse files
Fix warnings in CommandBasedTests (#76)
**Describe your changes** - Fix the warnings in `CommandBasedTests` while building on macOS 10.15. ```sh warning: 'scanString(_:into:)' was deprecated in macOS 10.15 guard scanString(string, into: result) else { ^ warning: 'scanUpToCharacters(from:into:)' was deprecated in macOS 10.15 guard scanUpToCharacters(from: characterSet, into: result) else { ^ warning: 'scanUpToCharacters(from:into:)' was deprecated in macOS 10.15 guard scanUpToCharacters(from: characterSet, into: result) else { ^ warning: 'scanUpTo(_:into:)' was deprecated in macOS 10.15 guard scanUpTo(string, into: result) else { ^ warning: 'scanInt32' was deprecated in macOS 10.15 guard scanInt32(result) else { ``` - Removed `scanCharactersOrFail` method as it was not used **Testing performed** - Inspect the build output to verify there is no warnings Signed-off-by: Marcin Iwanicki <[email protected]>
1 parent 7a1e8a9 commit addd7bf

File tree

1 file changed

+36
-15
lines changed

1 file changed

+36
-15
lines changed

Tests/XCDiffCommandTests/CommandBasedTests.swift

+36-15
Original file line numberDiff line numberDiff line change
@@ -116,35 +116,56 @@ final class CommandBasedTests: XCTestCase {
116116

117117
private extension Scanner {
118118
func scanStringOrFail(_ string: String, into result: AutoreleasingUnsafeMutablePointer<NSString?>?) {
119-
guard scanString(string, into: result) else {
120-
fatalError("Missing token: \(string)")
121-
}
122-
}
123-
124-
func scanCharactersOrFail(from characterSet: CharacterSet,
125-
into result: AutoreleasingUnsafeMutablePointer<NSString?>?) {
126-
guard scanUpToCharacters(from: characterSet, into: result) else {
127-
fatalError("Missing token from character set: \(characterSet)")
119+
if #available(OSX 10.15, *) {
120+
guard let value = scanString(string) else {
121+
fatalError("Missing token: \(string)")
122+
}
123+
result?.pointee = value as NSString
124+
} else {
125+
guard scanString(string, into: result) else {
126+
fatalError("Missing token: \(string)")
127+
}
128128
}
129129
}
130130

131131
func scanUpToCharactersOrFail(from characterSet: CharacterSet,
132132
into result: AutoreleasingUnsafeMutablePointer<NSString?>?) {
133-
guard scanUpToCharacters(from: characterSet, into: result) else {
134-
fatalError("Missing token from character set: \(characterSet)")
133+
if #available(OSX 10.15, *) {
134+
guard let value = scanUpToCharacters(from: characterSet) else {
135+
fatalError("Missing token from character set: \(characterSet)")
136+
}
137+
result?.pointee = value as NSString
138+
} else {
139+
guard scanUpToCharacters(from: characterSet, into: result) else {
140+
fatalError("Missing token from character set: \(characterSet)")
141+
}
135142
}
136143
}
137144

138145
func scanUpToOrFail(_ string: String,
139146
into result: AutoreleasingUnsafeMutablePointer<NSString?>?) {
140-
guard scanUpTo(string, into: result) else {
141-
fatalError("Missing token: \(string)")
147+
if #available(OSX 10.15, *) {
148+
guard let value = scanUpToString(string) else {
149+
fatalError("Missing token: \(string)")
150+
}
151+
result?.pointee = value as NSString
152+
} else {
153+
guard scanUpTo(string, into: result) else {
154+
fatalError("Missing token: \(string)")
155+
}
142156
}
143157
}
144158

145159
func scanInt32OrFail(_ result: UnsafeMutablePointer<Int32>?) {
146-
guard scanInt32(result) else {
147-
fatalError("Missing int32")
160+
if #available(OSX 10.15, *) {
161+
guard let value = scanInt32() else {
162+
fatalError("Missing Int32")
163+
}
164+
result?.pointee = value
165+
} else {
166+
guard scanInt32(result) else {
167+
fatalError("Missing Int32")
168+
}
148169
}
149170
}
150171

0 commit comments

Comments
 (0)