Skip to content

Commit 615577a

Browse files
committed
Migrated unit tests to Swift Testing
1 parent 40e88c4 commit 615577a

File tree

3 files changed

+144
-164
lines changed

3 files changed

+144
-164
lines changed

Tests/SwiftASCIITests/ASCIICharacter Tests.swift

Lines changed: 64 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -4,115 +4,105 @@
44
// © 2021-2024 Steffan Andrews • Licensed under MIT License
55
//
66

7+
import Foundation
78
import SwiftASCII
8-
import XCTest
9+
import Testing
910

10-
class ASCIICharacterTests: XCTestCase {
11-
override func setUp() { super.setUp() }
12-
override func tearDown() { super.tearDown() }
13-
14-
func testInit_exactly_Character() {
15-
// init(exactly: Character)
16-
17-
XCTAssertEqual(ASCIICharacter(exactly: Character("A"))?.characterValue, "A")
18-
XCTAssertEqual(ASCIICharacter(exactly: "A")?.characterValue, "A")
11+
@Suite struct ASCIICharacterTests {
12+
@Test("init(exactly: Character)") func init_exactly_Character() {
13+
#expect(ASCIICharacter(exactly: Character("A"))?.characterValue == "A")
14+
#expect(ASCIICharacter(exactly: "A")?.characterValue == "A")
1915

20-
XCTAssertNil(ASCIICharacter(exactly: "😃"))
21-
XCTAssertNil(ASCIICharacter(exactly: "Ä"))
16+
#expect(ASCIICharacter(exactly: "😃") == nil)
17+
#expect(ASCIICharacter(exactly: "Ä") == nil)
2218
}
2319

24-
func testInit_exactly_String() {
25-
// init(exactly: StringProtocol)
26-
27-
XCTAssertNil(ASCIICharacter(exactly: "A string"))
20+
@Test("init(exactly: StringProtocol)") func init_exactly_StringProtocol() {
21+
#expect(ASCIICharacter(exactly: "A string") == nil)
2822
}
2923

30-
func testInit_exactly_Data() {
31-
// init(BinaryInteger)
32-
33-
XCTAssertEqual(ASCIICharacter(exactly: Data([65])), "A")
24+
@Test("init(BinaryInteger)") func init_exactly_Data() {
25+
#expect(ASCIICharacter(exactly: Data([65])) == "A")
3426

3527
// non-printable ASCII chars
36-
XCTAssertEqual(ASCIICharacter(exactly: Data([0]))?.asciiValue, 0)
28+
#expect(ASCIICharacter(exactly: Data([0]))?.asciiValue == 0)
3729

3830
// non-ASCII char numbers
39-
XCTAssertNil(ASCIICharacter(exactly: Data([128]))) // extended ASCII
31+
#expect(ASCIICharacter(exactly: Data([128])) == nil) // extended ASCII
4032
}
4133

42-
func testInit_BinaryInteger() {
43-
// init(BinaryInteger)
44-
45-
XCTAssertEqual(ASCIICharacter(65), "A")
34+
@Test("init(BinaryInteger)") func init_BinaryInteger() {
35+
#expect(ASCIICharacter(65) == "A")
4636

4737
// non-printable ASCII chars
48-
XCTAssertEqual(ASCIICharacter(0)?.asciiValue, 0)
38+
#expect(ASCIICharacter(0)?.asciiValue == 0)
4939

5040
// non-ASCII char numbers
51-
XCTAssertNil(ASCIICharacter(128)) // extended ASCII
52-
XCTAssertNil(ASCIICharacter(300)) // out of bounds
41+
#expect(ASCIICharacter(128) == nil) // extended ASCII
42+
#expect(ASCIICharacter(300) == nil) // out of bounds
5343
}
5444

55-
func testasciiValue() {
56-
XCTAssertEqual(ASCIICharacter(65)?.asciiValue, 65)
45+
@Test("asciiValue") func asciiValue() {
46+
#expect(ASCIICharacter(65)?.asciiValue == 65)
5747

5848
// non-printable ASCII chars
59-
XCTAssertEqual(ASCIICharacter(0)?.asciiValue, 0)
49+
#expect(ASCIICharacter(0)?.asciiValue == 0)
6050

6151
// non-ASCII char numbers
62-
XCTAssertNil(ASCIICharacter(128)?.asciiValue) // extended ASCII
63-
XCTAssertNil(ASCIICharacter(300)?.asciiValue) // out of bounds
52+
#expect(ASCIICharacter(128)?.asciiValue == nil) // extended ASCII
53+
#expect(ASCIICharacter(300)?.asciiValue == nil) // out of bounds
6454
}
6555

66-
func testRawData() {
67-
XCTAssertEqual(ASCIICharacter(65)?.rawData, Data([65]))
56+
@Test("rawData") func rawData() {
57+
#expect(ASCIICharacter(65)?.rawData == Data([65]))
6858

6959
// non-printable ASCII chars
70-
XCTAssertEqual(ASCIICharacter(0)?.rawData, Data([0]))
60+
#expect(ASCIICharacter(0)?.rawData == Data([0]))
7161

7262
// non-ASCII char numbers
73-
XCTAssertNil(ASCIICharacter(128)?.rawData) // extended ASCII
74-
XCTAssertNil(ASCIICharacter(300)?.rawData) // out of bounds
63+
#expect(ASCIICharacter(128)?.rawData == nil) // extended ASCII
64+
#expect(ASCIICharacter(300)?.rawData == nil) // out of bounds
7565
}
7666

77-
func testCustomStringConvertible() {
78-
XCTAssertEqual(String(describing: ASCIICharacter(65)!), "A")
67+
@Test("CustomStringConvertible") func customStringConvertible() {
68+
#expect(String(describing: ASCIICharacter(65)!) == "A")
7969

8070
// non-printable ASCII chars
81-
XCTAssertEqual(String(describing: ASCIICharacter(0)!), "?")
71+
#expect(String(describing: ASCIICharacter(0)!) == "?")
8272
}
8373

84-
func testCustomDebugStringConvertible() {
85-
XCTAssertEqual(
86-
ASCIICharacter(65)!.debugDescription,
74+
@Test("CustomDebugStringConvertible") func customDebugStringConvertible() {
75+
#expect(
76+
ASCIICharacter(65)!.debugDescription ==
8777
#"ASCIICharacter(#65: "A")"#
8878
)
8979

9080
// non-printable ASCII chars
91-
XCTAssertEqual(
92-
ASCIICharacter(0)!.debugDescription,
81+
#expect(
82+
ASCIICharacter(0)!.debugDescription ==
9383
#"ASCIICharacter(#0: "?")"#
9484
)
9585
}
9686

97-
func testEquatable() {
87+
@Test("Equatable") func equatable() {
9888
// Self & Self
9989

100-
XCTAssertTrue(ASCIICharacter("A") == ASCIICharacter("A"))
101-
XCTAssertFalse(ASCIICharacter("A") != ASCIICharacter("A"))
90+
#expect(ASCIICharacter("A") == ASCIICharacter("A"))
91+
#expect((ASCIICharacter("A") != ASCIICharacter("A")) == false)
10292

103-
XCTAssertTrue(ASCIICharacter("A") == ASCIICharacter("A"))
104-
XCTAssertFalse(ASCIICharacter("A") != ASCIICharacter("A"))
93+
#expect(ASCIICharacter("A") == ASCIICharacter("A"))
94+
#expect((ASCIICharacter("A") != ASCIICharacter("A")) == false)
10595

10696
// Self & Character
10797

108-
XCTAssertTrue(ASCIICharacter("A") == Character("A"))
109-
XCTAssertFalse(ASCIICharacter("A") != Character("A"))
98+
#expect(ASCIICharacter("A") == Character("A"))
99+
#expect((ASCIICharacter("A") != Character("A")) == false)
110100

111-
XCTAssertTrue(Character("A") == ASCIICharacter("A"))
112-
XCTAssertFalse(Character("A") != ASCIICharacter("A"))
101+
#expect(Character("A") == ASCIICharacter("A"))
102+
#expect((Character("A") != ASCIICharacter("A")) == false)
113103
}
114104

115-
func testCodable() throws {
105+
@Test("Codable") func codable() throws {
116106
let encoder = JSONEncoder()
117107
let decoder = JSONDecoder()
118108

@@ -121,13 +111,13 @@ class ASCIICharacterTests: XCTestCase {
121111
let encoded = try encoder.encode(str)
122112
let decoded = try decoder.decode(ASCIICharacter.self, from: encoded)
123113

124-
XCTAssertEqual(str, decoded)
114+
#expect(str == decoded)
125115
}
126116

127-
func testStaticInits() {
117+
@Test("Static Constructors") func staticConstructors() {
128118
let str: ASCIICharacter = .lossy("😃")
129119

130-
XCTAssertEqual(str.characterValue, Character("?"))
120+
#expect(str.characterValue == Character("?"))
131121

132122
let _: [ASCIICharacter] = [
133123
.lossy("A"),
@@ -150,36 +140,36 @@ class ASCIICharacterTests: XCTestCase {
150140
]
151141
}
152142

153-
func testInterpolation() {
154-
XCTAssertEqual(
155-
ASCIICharacter("A") + ASCIICharacter("B"),
143+
@Test("String Interpolation") func interpolation() {
144+
#expect(
145+
ASCIICharacter("A") + ASCIICharacter("B") ==
156146
ASCIIString("AB")
157147
)
158148

159-
XCTAssertEqual(
160-
ASCIICharacter("A") + ASCIIString("BC"),
149+
#expect(
150+
ASCIICharacter("A") + ASCIIString("BC") ==
161151
ASCIIString("ABC")
162152
)
163153

164-
XCTAssertEqual(
165-
ASCIIString("AB") + ASCIICharacter("C"),
154+
#expect(
155+
ASCIIString("AB") + ASCIICharacter("C") ==
166156
ASCIIString("ABC")
167157
)
168158
}
169159

170-
func testJoined() {
171-
XCTAssertEqual(
172-
[ASCIICharacter("A"), ASCIICharacter("B")].joined(),
160+
@Test("joined()") func joined() {
161+
#expect(
162+
[ASCIICharacter("A"), ASCIICharacter("B")].joined() ==
173163
ASCIIString("AB")
174164
)
175165

176-
XCTAssertEqual(
177-
[ASCIICharacter("A"), ASCIICharacter("B")].joined(separator: "_"),
166+
#expect(
167+
[ASCIICharacter("A"), ASCIICharacter("B")].joined(separator: "_") ==
178168
ASCIIString("A_B")
179169
)
180170

181-
XCTAssertEqual(
182-
[ASCIICharacter("A"), ASCIICharacter("B")].joined(separator: "123"),
171+
#expect(
172+
[ASCIICharacter("A"), ASCIICharacter("B")].joined(separator: "123") ==
183173
ASCIIString("A123B")
184174
)
185175
}

0 commit comments

Comments
 (0)