Skip to content

Commit e0a9e8a

Browse files
Merge pull request #3706 from SwiftPackageIndex/issue-3655-swift-testing-part-23
Issue 3655 swift testing part 23
2 parents 7372b54 + 3369831 commit e0a9e8a

File tree

7 files changed

+830
-772
lines changed

7 files changed

+830
-772
lines changed

Tests/AppTests/ReAnalyzeVersionsTests.swift

Lines changed: 142 additions & 137 deletions
Large diffs are not rendered by default.

Tests/AppTests/RecentViewsTests.swift

Lines changed: 188 additions & 179 deletions
Large diffs are not rendered by default.

Tests/AppTests/ReconcilerTests.swift

Lines changed: 190 additions & 176 deletions
Large diffs are not rendered by default.

Tests/AppTests/ReferenceTests.swift

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,71 +12,71 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import XCTest
15+
import Foundation
1616

1717
@testable import App
1818

1919
import SemanticVersion
20+
import Testing
2021

2122

22-
class ReferenceTests: XCTestCase {
23+
@Suite struct ReferenceTests {
2324

24-
func test_init() throws {
25-
XCTAssertEqual(Reference("1.2.3"), .tag(1, 2, 3))
26-
XCTAssertEqual(Reference("1.2.3-b1"), .tag(1, 2, 3, "b1"))
27-
XCTAssertEqual(Reference("main"), .branch("main"))
25+
@Test func Refernce_init() throws {
26+
#expect(Reference("1.2.3") == .tag(1, 2, 3))
27+
#expect(Reference("1.2.3-b1") == .tag(1, 2, 3, "b1"))
28+
#expect(Reference("main") == .branch("main"))
2829
}
2930

30-
func test_Codable() throws {
31+
@Test func Codable() throws {
3132
do { // branch
3233
let ref = Reference.branch("foo")
3334
let json = try JSONEncoder().encode(ref)
3435
let decoded = try JSONDecoder().decode(Reference.self, from: json)
35-
XCTAssertEqual(decoded, .branch("foo"))
36+
#expect(decoded == .branch("foo"))
3637
}
3738
do { // tag
3839
let ref = Reference.tag(.init(1, 2, 3))
3940
let json = try JSONEncoder().encode(ref)
4041
let decoded = try JSONDecoder().decode(Reference.self, from: json)
41-
XCTAssertEqual(decoded, .tag(.init(1, 2, 3)))
42+
#expect(decoded == .tag(.init(1, 2, 3)))
4243
}
4344
}
4445

45-
func test_isRelease() throws {
46-
XCTAssertTrue(Reference.tag(.init(1, 0, 0)).isRelease)
47-
XCTAssertFalse(Reference.tag(.init(1, 0, 0, "beta1")).isRelease)
48-
XCTAssertFalse(Reference.branch("main").isRelease)
46+
@Test func isRelease() throws {
47+
#expect(Reference.tag(.init(1, 0, 0)).isRelease)
48+
#expect(!Reference.tag(.init(1, 0, 0, "beta1")).isRelease)
49+
#expect(!Reference.branch("main").isRelease)
4950
}
5051

51-
func test_tagName() throws {
52-
XCTAssertEqual(Reference.tag(.init(1, 2, 3)).tagName, "1.2.3")
53-
XCTAssertEqual(Reference.tag(.init(1, 2, 3), "v1.2.3").tagName, "v1.2.3")
54-
XCTAssertEqual(Reference.tag(.init(1, 2, 3, "b1")).tagName, "1.2.3-b1")
55-
XCTAssertEqual(Reference.tag(.init(1, 2, 3, "b1", "test")).tagName,
56-
"1.2.3-b1+test")
57-
XCTAssertEqual(Reference.branch("").tagName, nil)
52+
@Test func tagName() throws {
53+
#expect(Reference.tag(.init(1, 2, 3)).tagName == "1.2.3")
54+
#expect(Reference.tag(.init(1, 2, 3), "v1.2.3").tagName == "v1.2.3")
55+
#expect(Reference.tag(.init(1, 2, 3, "b1")).tagName == "1.2.3-b1")
56+
#expect(Reference.tag(.init(1, 2, 3, "b1", "test")).tagName == "1.2.3-b1+test")
57+
#expect(Reference.branch("").tagName == nil)
5858
}
5959

60-
func test_versionKind() throws {
61-
XCTAssertEqual(Reference.tag(.init(1, 2, 3)).versionKind, .release)
62-
XCTAssertEqual(Reference.tag(.init(1, 2, 3, "b1")).versionKind, .preRelease)
63-
XCTAssertEqual(Reference.tag(.init(1, 2, 3, "b1", "test")).versionKind, .preRelease)
64-
XCTAssertEqual(Reference.branch("main").versionKind, .defaultBranch)
65-
XCTAssertEqual(Reference.branch("").versionKind, .defaultBranch)
60+
@Test func versionKind() throws {
61+
#expect(Reference.tag(.init(1, 2, 3)).versionKind == .release)
62+
#expect(Reference.tag(.init(1, 2, 3, "b1")).versionKind == .preRelease)
63+
#expect(Reference.tag(.init(1, 2, 3, "b1", "test")).versionKind == .preRelease)
64+
#expect(Reference.branch("main").versionKind == .defaultBranch)
65+
#expect(Reference.branch("").versionKind == .defaultBranch)
6666
}
6767

68-
func test_pathEncoded() throws {
69-
XCTAssertEqual(Reference.branch("foo").pathEncoded, "foo")
70-
XCTAssertEqual(Reference.branch("foo/bar").pathEncoded, "foo-bar")
71-
XCTAssertEqual(Reference.branch("foo-bar").pathEncoded, "foo-bar")
72-
XCTAssertEqual(Reference.tag(.init("1.2.3")!).pathEncoded, "1.2.3")
68+
@Test func pathEncoded() throws {
69+
#expect(Reference.branch("foo").pathEncoded == "foo")
70+
#expect(Reference.branch("foo/bar").pathEncoded == "foo-bar")
71+
#expect(Reference.branch("foo-bar").pathEncoded == "foo-bar")
72+
#expect(Reference.tag(.init("1.2.3")!).pathEncoded == "1.2.3")
7373
do {
74-
let s = try XCTUnwrap(SemanticVersion(1, 2, 3, "foo/bar"))
75-
XCTAssertEqual(Reference.tag(s).pathEncoded, "1.2.3-foo-bar")
74+
let s = try #require(SemanticVersion(1, 2, 3, "foo/bar"))
75+
#expect(Reference.tag(s).pathEncoded == "1.2.3-foo-bar")
7676
}
7777
do {
78-
let s = try XCTUnwrap(SemanticVersion(1, 2, 3, "foo/bar", "bar/baz"))
79-
XCTAssertEqual(Reference.tag(s).pathEncoded, "1.2.3-foo-bar+bar-baz")
78+
let s = try #require(SemanticVersion(1, 2, 3, "foo/bar", "bar/baz"))
79+
#expect(Reference.tag(s).pathEncoded == "1.2.3-foo-bar+bar-baz")
8080
}
8181
}
8282

0 commit comments

Comments
 (0)