Skip to content

Commit 40f5714

Browse files
committed
Move StdlibUnittest tests to their own directory.
StdlibUnittest.swift became StdlibUnittest/Common.swift; all others just dropped the "StdlibUnittest" prefix.
1 parent 67dad60 commit 40f5714

19 files changed

+11
-11
lines changed

validation-test/stdlib/StdlibUnittest.swift validation-test/StdlibUnittest/Common.swift

+11-11
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ TestSuiteWithSetUpFails.setUp {
299299
}
300300
// CHECK: [ RUN ] TestSuiteWithSetUpFails.fails
301301
// CHECK: stdout>>> setUp
302-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
302+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
303303
// CHECK: stdout>>> test body
304304
// CHECK: [ FAIL ] TestSuiteWithSetUpFails.fails
305305
// CHECK: TestSuiteWithSetUpFails: Some tests failed, aborting
@@ -332,7 +332,7 @@ TestSuiteWithTearDownFails.tearDown {
332332
// CHECK: [ RUN ] TestSuiteWithTearDownFails.fails
333333
// CHECK: stdout>>> test body
334334
// CHECK: stdout>>> tearDown
335-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
335+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
336336
// CHECK: [ FAIL ] TestSuiteWithTearDownFails.fails
337337
// CHECK: TestSuiteWithTearDownFails: Some tests failed, aborting
338338

@@ -349,7 +349,7 @@ AssertionsTestSuite.test("expectFailure/Pass") {
349349
}
350350
}
351351
// CHECK: [ RUN ] Assertions.expectFailure/Pass
352-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
352+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
353353
// CHECK: stdout>>> expected: 1 (of type Swift.Int)
354354
// CHECK: stdout>>> actual: 2 (of type Swift.Int)
355355
// CHECK: [ OK ] Assertions.expectFailure/Pass
@@ -363,7 +363,7 @@ AssertionsTestSuite.test("expectFailure/UXPass")
363363
}
364364
}
365365
// CHECK: [ RUN ] Assertions.expectFailure/UXPass ({{X}}FAIL: [Custom(reason: test)])
366-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
366+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
367367
// CHECK: stdout>>> expected: 1 (of type Swift.Int)
368368
// CHECK: stdout>>> actual: 2 (of type Swift.Int)
369369
// CHECK: [ UXPASS ] Assertions.expectFailure/UXPass
@@ -374,7 +374,7 @@ AssertionsTestSuite.test("expectFailure/Fail") {
374374
}
375375
}
376376
// CHECK: [ RUN ] Assertions.expectFailure/Fail
377-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
377+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
378378
// CHECK: stdout>>> expected: true
379379
// CHECK: stdout>>> running `body` should produce an expected failure
380380
// CHECK: [ FAIL ] Assertions.expectFailure/Fail
@@ -387,7 +387,7 @@ AssertionsTestSuite.test("expectFailure/XFail")
387387
}
388388
}
389389
// CHECK: [ RUN ] Assertions.expectFailure/XFail ({{X}}FAIL: [Custom(reason: test)])
390-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
390+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
391391
// CHECK: stdout>>> expected: true
392392
// CHECK: stdout>>> running `body` should produce an expected failure
393393
// CHECK: [ XFAIL ] Assertions.expectFailure/XFail
@@ -400,10 +400,10 @@ AssertionsTestSuite.test("expectFailure/AfterFailure/Fail") {
400400
}
401401
}
402402
// CHECK: [ RUN ] Assertions.expectFailure/AfterFailure/Fail
403-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
403+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
404404
// CHECK: stdout>>> expected: 1 (of type Swift.Int)
405405
// CHECK: stdout>>> actual: 2 (of type Swift.Int)
406-
// CHECK: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
406+
// CHECK: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
407407
// CHECK: stdout>>> expected: 3 (of type Swift.Int)
408408
// CHECK: stdout>>> actual: 4 (of type Swift.Int)
409409
// CHECK: [ FAIL ] Assertions.expectFailure/AfterFailure/Fail
@@ -418,10 +418,10 @@ AssertionsTestSuite.test("expectFailure/AfterFailure/XFail")
418418
}
419419
}
420420
// CHECK: [ RUN ] Assertions.expectFailure/AfterFailure/XFail ({{X}}FAIL: [Custom(reason: test)])
421-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
421+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
422422
// CHECK: stdout>>> expected: 1 (of type Swift.Int)
423423
// CHECK: stdout>>> actual: 2 (of type Swift.Int)
424-
// CHECK: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
424+
// CHECK: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
425425
// CHECK: stdout>>> expected: 3 (of type Swift.Int)
426426
// CHECK: stdout>>> actual: 4 (of type Swift.Int)
427427
// CHECK: [ XFAIL ] Assertions.expectFailure/AfterFailure/XFail
@@ -430,7 +430,7 @@ AssertionsTestSuite.test("expectUnreachable") {
430430
expectUnreachable()
431431
}
432432
// CHECK: [ RUN ] Assertions.expectUnreachable
433-
// CHECK-NEXT: stdout>>> check failed at {{.*}}/stdlib/StdlibUnittest.swift, line
433+
// CHECK-NEXT: stdout>>> check failed at {{.*}}/StdlibUnittest/Common.swift, line
434434
// CHECK: stdout>>> this code should not be executed
435435
// CHECK: [ FAIL ] Assertions.expectUnreachable
436436

0 commit comments

Comments
 (0)