Skip to content

Commit 13094af

Browse files
committed
Fixed indentation
1 parent 31b96ad commit 13094af

File tree

2 files changed

+67
-68
lines changed

2 files changed

+67
-68
lines changed

stdlib/public/SDK/XCTest/XCTest.swift

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,36 +1031,36 @@ public func XCTAssertThrowsError<T>(_ expression: @autoclosure () throws -> T, _
10311031
}
10321032

10331033
public func XCTAssertNoThrow<T>(_ expression: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (_ error: Error) -> Void = { _ in }) {
1034-
let assertionType = _XCTAssertionType.assertion_NoThrow
1034+
let assertionType = _XCTAssertionType.assertion_NoThrow
10351035

1036-
// evaluate expression exactly once
1037-
var caughtErrorOptional: Error?
1036+
// evaluate expression exactly once
1037+
var caughtErrorOptional: Error?
10381038

1039-
let result = _XCTRunThrowableBlock {
1040-
do {
1041-
_ = try expression()
1042-
} catch {
1043-
caughtErrorOptional = error
1044-
}
1045-
}
1039+
let result = _XCTRunThrowableBlock {
1040+
do {
1041+
_ = try expression()
1042+
} catch {
1043+
caughtErrorOptional = error
1044+
}
1045+
}
10461046

1047-
switch result {
1048-
case .success:
1049-
guard let caughtError = caughtErrorOptional else {
1050-
return
1051-
}
1047+
switch result {
1048+
case .success:
1049+
guard let caughtError = caughtErrorOptional else {
1050+
return
1051+
}
10521052

1053-
_XCTRegisterFailure(true, "XCTAssertNoThrow failed: threw error \"\(caughtError)\"", message, file, line)
1053+
_XCTRegisterFailure(true, "XCTAssertNoThrow failed: threw error \"\(caughtError)\"", message, file, line)
10541054

1055-
case .failedWithError(let error):
1056-
_XCTRegisterFailure(true, "XCTAssertNoThrow failed: threw error \"\(error)\"", message, file, line)
1055+
case .failedWithError(let error):
1056+
_XCTRegisterFailure(true, "XCTAssertNoThrow failed: threw error \"\(error)\"", message, file, line)
10571057

1058-
case .failedWithException(_, _, let reason):
1059-
_XCTRegisterFailure(true, _XCTFailureDescription(assertionType, 1, reason as NSString), message, file, line)
1058+
case .failedWithException(_, _, let reason):
1059+
_XCTRegisterFailure(true, _XCTFailureDescription(assertionType, 1, reason as NSString), message, file, line)
10601060

1061-
case .failedWithUnknownException:
1062-
_XCTRegisterFailure(true, _XCTFailureDescription(assertionType, 2), message, file, line)
1063-
}
1061+
case .failedWithUnknownException:
1062+
_XCTRegisterFailure(true, _XCTFailureDescription(assertionType, 2), message, file, line)
1063+
}
10641064

10651065
}
10661066

validation-test/stdlib/XCTest.swift

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -322,51 +322,50 @@ XCTestTestSuite.test("XCTAssertNoThrow") {
322322

323323

324324
XCTestTestSuite.test("XCTAsserts with throwing expressions") {
325-
class ErrorTestCase: XCTestCase {
326-
var doThrow = true
327-
var errorCode = 42
328-
329-
dynamic func throwSomething() throws -> String {
330-
if doThrow {
331-
throw NSError(domain: "MyDomain", code: errorCode, userInfo: nil)
332-
}
333-
return "Hello"
334-
}
335-
336-
dynamic func test_withThrowing() {
337-
XCTAssertEqual(try throwSomething(), "Hello")
338-
}
339-
}
340-
341-
// Try success case
342-
do {
343-
let testCase = ErrorTestCase(selector: #selector(ErrorTestCase.test_withThrowing))
344-
testCase.doThrow = false
345-
execute(testCase.run)
346-
let testRun = testCase.testRun!
347-
348-
expectEqual(1, testRun.testCaseCount)
349-
expectEqual(1, testRun.executionCount)
350-
expectEqual(0, testRun.failureCount)
351-
expectEqual(0, testRun.unexpectedExceptionCount)
352-
expectEqual(0, testRun.totalFailureCount)
353-
expectTrue(testRun.hasSucceeded)
354-
}
355-
356-
// Now try when the expression throws
357-
do {
358-
let testCase = ErrorTestCase(selector: #selector(ErrorTestCase.test_withThrowing))
359-
execute(testCase.run)
360-
let testRun = testCase.testRun!
361-
362-
expectEqual(1, testRun.testCaseCount)
363-
expectEqual(1, testRun.executionCount)
364-
expectEqual(0, testRun.failureCount)
365-
expectEqual(1, testRun.unexpectedExceptionCount)
366-
expectEqual(1, testRun.totalFailureCount)
367-
expectFalse(testRun.hasSucceeded)
368-
}
369-
325+
class ErrorTestCase: XCTestCase {
326+
var doThrow = true
327+
var errorCode = 42
328+
329+
dynamic func throwSomething() throws -> String {
330+
if doThrow {
331+
throw NSError(domain: "MyDomain", code: errorCode, userInfo: nil)
332+
}
333+
return "Hello"
334+
}
335+
336+
dynamic func test_withThrowing() {
337+
XCTAssertEqual(try throwSomething(), "Hello")
338+
}
339+
}
340+
341+
// Try success case
342+
do {
343+
let testCase = ErrorTestCase(selector: #selector(ErrorTestCase.test_withThrowing))
344+
testCase.doThrow = false
345+
execute(testCase.run)
346+
let testRun = testCase.testRun!
347+
348+
expectEqual(1, testRun.testCaseCount)
349+
expectEqual(1, testRun.executionCount)
350+
expectEqual(0, testRun.failureCount)
351+
expectEqual(0, testRun.unexpectedExceptionCount)
352+
expectEqual(0, testRun.totalFailureCount)
353+
expectTrue(testRun.hasSucceeded)
354+
}
355+
356+
// Now try when the expression throws
357+
do {
358+
let testCase = ErrorTestCase(selector: #selector(ErrorTestCase.test_withThrowing))
359+
execute(testCase.run)
360+
let testRun = testCase.testRun!
361+
362+
expectEqual(1, testRun.testCaseCount)
363+
expectEqual(1, testRun.executionCount)
364+
expectEqual(0, testRun.failureCount)
365+
expectEqual(1, testRun.unexpectedExceptionCount)
366+
expectEqual(1, testRun.totalFailureCount)
367+
expectFalse(testRun.hasSucceeded)
368+
}
370369
}
371370

372371
XCTestTestSuite.test("Test methods that wind up throwing") {

0 commit comments

Comments
 (0)