averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

stdlib tests: fix coding style

Browse Source 
Swift SVN r28071
This commit is contained in:
Dmitri Hrybenko
2015-05-02 03:33:10 +00:00
parent 0388c87613
commit b08a57f752
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
test/1_stdlib/NSStringAPI.swift
View File

@@ -98,24 +98,25 @@ NSStringAPIs.test("localizedStringWithFormat(_:...)") {
NSStringAPIs.test("pathWithComponents(_:)") { NSStringAPIs.test("pathWithComponents(_:)") {
expectEqual("flugelhorn/baritone/bass", expectEqual("flugelhorn/baritone/bass",
String.pathWithComponents(["flugelhorn", "baritone", "bass"])) String.pathWithComponents(["flugelhorn", "baritone", "bass"]))
} }
NSStringAPIs.test("init(contentsOfFile:encoding:error:)") { NSStringAPIs.test("init(contentsOfFile:encoding:error:)") {
let (existingPath, nonExistentPath) = createNSStringTemporaryFile() let (existingPath, nonExistentPath) = createNSStringTemporaryFile()
do { do {
let content = try String(contentsOfFile: existingPath, let content = try String(
encoding: NSASCIIStringEncoding) contentsOfFile: existingPath, encoding: NSASCIIStringEncoding)
expectEqual("Lorem ipsum dolor sit amet, consectetur adipisicing elit,", expectEqual(
content._lines[0]) "Lorem ipsum dolor sit amet, consectetur adipisicing elit,",
content._lines[0])
} catch { } catch {
expectUnreachableCatch(error) expectUnreachableCatch(error)
} }
do { do {
let content = try String(contentsOfFile: nonExistentPath, let content = try String(
encoding: NSASCIIStringEncoding) contentsOfFile: nonExistentPath, encoding: NSASCIIStringEncoding)
expectUnreachable() expectUnreachable()
} catch { } catch {
} }
@@ -126,19 +127,19 @@ NSStringAPIs.test("init(contentsOfFile:usedEncoding:error:)") {
do { do {
var usedEncoding: NSStringEncoding = 0 var usedEncoding: NSStringEncoding = 0
let content = try String(contentsOfFile: existingPath, let content = try String(
usedEncoding: &usedEncoding) contentsOfFile: existingPath, usedEncoding: &usedEncoding)
expectNotEqual(0, usedEncoding) expectNotEqual(0, usedEncoding)
expectEqual( expectEqual(
"Lorem ipsum dolor sit amet, consectetur adipisicing elit,", "Lorem ipsum dolor sit amet, consectetur adipisicing elit,",
content._lines[0]) content._lines[0])
} catch { } catch {
expectUnreachableCatch(error) expectUnreachableCatch(error)
} }
var usedEncoding: NSStringEncoding = 0 var usedEncoding: NSStringEncoding = 0
do { do {
var content = try String(contentsOfFile: nonExistentPath) try String(contentsOfFile: nonExistentPath)
expectUnreachable() expectUnreachable()
} catch { } catch {
expectEqual(0, usedEncoding) expectEqual(0, usedEncoding)
@@ -151,18 +152,17 @@ NSStringAPIs.test("init(contentsOfURL:encoding:error:)") {
let existingURL = NSURL(string: "file://" + existingPath)! let existingURL = NSURL(string: "file://" + existingPath)!
let nonExistentURL = NSURL(string: "file://" + nonExistentPath)! let nonExistentURL = NSURL(string: "file://" + nonExistentPath)!
do { do {
var content = try String(contentsOfURL: existingURL, let content = try String(
encoding: NSASCIIStringEncoding) contentsOfURL: existingURL, encoding: NSASCIIStringEncoding)
expectEqual( expectEqual(
"Lorem ipsum dolor sit amet, consectetur adipisicing elit,", "Lorem ipsum dolor sit amet, consectetur adipisicing elit,",
content._lines[0]) content._lines[0])
} catch { } catch {
expectUnreachableCatch(error) expectUnreachableCatch(error)
} }
do { do {
var content = try String(contentsOfURL: nonExistentURL, try String(contentsOfURL: nonExistentURL, encoding: NSASCIIStringEncoding)
encoding: NSASCIIStringEncoding)
expectUnreachable() expectUnreachable()
} catch { } catch {
} }
@@ -174,21 +174,20 @@ NSStringAPIs.test("init(contentsOfURL:usedEncoding:error:)") {
let nonExistentURL = NSURL(string: "file://" + nonExistentPath)! let nonExistentURL = NSURL(string: "file://" + nonExistentPath)!
do { do {
var usedEncoding: NSStringEncoding = 0 var usedEncoding: NSStringEncoding = 0
var content = try String(contentsOfURL: existingURL, let content = try String(
usedEncoding: &usedEncoding) contentsOfURL: existingURL, usedEncoding: &usedEncoding)
expectNotEqual(0, usedEncoding) expectNotEqual(0, usedEncoding)
expectEqual( expectEqual(
"Lorem ipsum dolor sit amet, consectetur adipisicing elit,", "Lorem ipsum dolor sit amet, consectetur adipisicing elit,",
content._lines[0]) content._lines[0])
} catch { } catch {
expectUnreachableCatch(error) expectUnreachableCatch(error)
} }
var usedEncoding: NSStringEncoding = 0 var usedEncoding: NSStringEncoding = 0
do { do {
var content = try String(contentsOfURL: nonExistentURL, try String(contentsOfURL: nonExistentURL, usedEncoding: &usedEncoding)
usedEncoding: &usedEncoding)
expectUnreachable() expectUnreachable()
} catch { } catch {
expectEqual(0, usedEncoding) expectEqual(0, usedEncoding)
@@ -1558,9 +1557,10 @@ NSStringAPIs.test("writeToFile(_:atomically:encoding:error:)") {
try s.writeToFile( try s.writeToFile(
nonExistentPath, atomically: false, encoding: NSASCIIStringEncoding) nonExistentPath, atomically: false, encoding: NSASCIIStringEncoding)
expectEqual( let content = try String(
s, try String(contentsOfFile: contentsOfFile: nonExistentPath, encoding: NSASCIIStringEncoding)
nonExistentPath, encoding: NSASCIIStringEncoding))
expectEqual(s, content)
} catch { } catch {
expectUnreachableCatch(error) expectUnreachableCatch(error)
} }
@@ -1574,9 +1574,10 @@ NSStringAPIs.test("writeToURL(_:atomically:encoding:error:)") {
try s.writeToURL( try s.writeToURL(
nonExistentURL, atomically: false, encoding: NSASCIIStringEncoding) nonExistentURL, atomically: false, encoding: NSASCIIStringEncoding)
expectEqual( let content = try String(
s, try String(contentsOfFile: contentsOfFile: nonExistentPath, encoding: NSASCIIStringEncoding)
nonExistentPath, encoding: NSASCIIStringEncoding))
expectEqual(s, content)
} catch { } catch {
expectUnreachableCatch(error) expectUnreachableCatch(error)
} }

4
validation-test/stdlib/String.swift
View File

@@ -1032,8 +1032,8 @@ StringTests.test("unicodeViews") {
StringTests.test("indexConversion") { StringTests.test("indexConversion") {
let re : NSRegularExpression let re : NSRegularExpression
do { do {
re = try NSRegularExpression(pattern: "([^ ]+)er", re = try NSRegularExpression(
options: NSRegularExpressionOptions()) pattern: "([^ ]+)er", options: NSRegularExpressionOptions())
} catch { fatalError("couldn't build regexp: \(error)") } } catch { fatalError("couldn't build regexp: \(error)") }
let s = "go further into the larder to barter." let s = "go further into the larder to barter."