Skip to content

Commit 20cd39d

Browse files
tonyfreemantonyfreeman
committed
[Tests] Reflect API changes
1 parent 26d6e02 commit 20cd39d

File tree

13 files changed

+67
-67
lines changed

13 files changed

+67
-67
lines changed

‎Tests/Stream/BufferedInputStream/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class TestInputStreamSequence: InputStream {
1616
}
1717
}
1818

19-
test.case("BufferedInputStream") {
19+
test("BufferedInputStream") {
2020
let baseStream = TestInputStreamSequence()
2121
let stream = BufferedInputStream(baseStream: baseStream, capacity: 10)
2222
expect(stream.allocated == 10)
@@ -56,10 +56,10 @@ test.case("BufferedInputStream") {
5656
expect(stream.writePosition == stream.storage)
5757
}
5858

59-
test.case("BufferedInputStreamDefaultCapacity") {
59+
test("BufferedInputStreamDefaultCapacity") {
6060
let stream = BufferedInputStream(baseStream: ByteArrayInputStream([]))
6161
expect(stream.allocated == 256)
6262
expect(stream.buffered == 0)
6363
}
6464

65-
test.run()
65+
await run()

‎Tests/Stream/BufferedOutputStream/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Test
22
@testable import Stream
33

4-
test.case("BufferedOutputStream") {
4+
test("BufferedOutputStream") {
55
let byteStream = ByteArrayOutputStream()
66
let stream = BufferedOutputStream(baseStream: byteStream, capacity: 10)
77
expect(stream.allocated == 10)
@@ -42,10 +42,10 @@ test.case("BufferedOutputStream") {
4242
expect(byteStream.bytes == [0,1])
4343
}
4444

45-
test.case("BufferedOutputStreamDefaultCapacity") {
45+
test("BufferedOutputStreamDefaultCapacity") {
4646
let stream = BufferedOutputStream(baseStream: ByteArrayOutputStream())
4747
expect(stream.allocated == 256)
4848
expect(stream.buffered == 0)
4949
}
5050

51-
test.run()
51+
await run()

‎Tests/Stream/BufferedStream/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extension BufferedStream {
99
}
1010
}
1111

12-
test.case("BufferedStream") {
12+
test("BufferedStream") {
1313
let stream = BufferedStream(baseStream: TestStream(), capacity: 10)
1414

1515
let result = try await stream.write(from: [0,1,2,3,4])
@@ -24,12 +24,12 @@ test.case("BufferedStream") {
2424
expect(stream.inputStream.buffered == 0)
2525
}
2626

27-
test.case("BufferedStreamDefaultCapacity") {
27+
test("BufferedStreamDefaultCapacity") {
2828
let stream = BufferedStream(baseStream: TestStream())
2929
expect(stream.inputStream.allocated == 4096)
3030
expect(stream.inputStream.buffered == 0)
3131
expect(stream.outputStream.allocated == 4096)
3232
expect(stream.outputStream.buffered == 0)
3333
}
3434

35-
test.run()
35+
await run()

‎Tests/Stream/BufferedStreamReader/main.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fileprivate class TestStream: InputStream {
2929
}
3030
}
3131

32-
test.case("Read") {
32+
test("Read") {
3333
let stream = BufferedInputStream(
3434
baseStream: TestStream(),
3535
capacity: 1)
@@ -87,7 +87,7 @@ test.case("Read") {
8787
expect(stream.allocated == 40)
8888
}
8989

90-
test.case("ReadReservingCapacity") {
90+
test("ReadReservingCapacity") {
9191
let stream = BufferedInputStream(
9292
baseStream: TestStream(),
9393
capacity: 10)
@@ -105,7 +105,7 @@ test.case("ReadReservingCapacity") {
105105
expect(stream.writePosition == stream.storage)
106106
}
107107

108-
test.case("ReadFixedCapacity") {
108+
test("ReadFixedCapacity") {
109109
let stream = BufferedInputStream(
110110
baseStream: TestStream(),
111111
capacity: 10,
@@ -137,7 +137,7 @@ test.case("ReadFixedCapacity") {
137137
expect(stream.writePosition == stream.storage + 10)
138138
}
139139

140-
test.case("ReadByte") {
140+
test("ReadByte") {
141141
let stream = BufferedInputStream(
142142
baseStream: TestStream(byteLimit: 4),
143143
capacity: 2)
@@ -152,7 +152,7 @@ test.case("ReadByte") {
152152
}
153153
}
154154

155-
test.case("ReadWhile") {
155+
test("ReadWhile") {
156156
let stream = BufferedInputStream(
157157
baseStream: TestStream(),
158158
capacity: 5)
@@ -170,7 +170,7 @@ test.case("ReadWhile") {
170170
expect(stream.writePosition == stream.storage + 26)
171171
}
172172

173-
test.case("ReadWhileUntilEnd") {
173+
test("ReadWhileUntilEnd") {
174174
let stream = BufferedInputStream(
175175
baseStream: TestStream(byteLimit: 5),
176176
capacity: 5)
@@ -184,7 +184,7 @@ test.case("ReadWhileUntilEnd") {
184184
_ = try await stream.read(mode: .untilEnd, while: { $0 == 1 })
185185
}
186186

187-
test.case("ReadUntil") {
187+
test("ReadUntil") {
188188
let stream = BufferedInputStream(
189189
baseStream: TestStream(),
190190
capacity: 5)
@@ -202,7 +202,7 @@ test.case("ReadUntil") {
202202
expect(stream.writePosition == stream.storage + 26)
203203
}
204204

205-
test.case("Peek") {
205+
test("Peek") {
206206
let stream = BufferedInputStream(
207207
baseStream: TestStream(byteLimit: 10),
208208
capacity: 10,
@@ -224,7 +224,7 @@ test.case("Peek") {
224224
expect(try await stream.cache(count: 5) == false)
225225
}
226226

227-
test.case("Consume") {
227+
test("Consume") {
228228
let stream = BufferedInputStream(
229229
baseStream: TestStream(),
230230
capacity: 10)
@@ -247,7 +247,7 @@ test.case("Consume") {
247247
expect(stream.writePosition == stream.storage + 10)
248248
}
249249

250-
test.case("ConsumeNotExpandable") {
250+
test("ConsumeNotExpandable") {
251251
let stream = BufferedInputStream(
252252
baseStream: TestStream(),
253253
capacity: 10,
@@ -270,7 +270,7 @@ test.case("ConsumeNotExpandable") {
270270
expect(stream.writePosition == stream.storage)
271271
}
272272

273-
test.case("ConsumeByte") {
273+
test("ConsumeByte") {
274274
let stream = BufferedInputStream(baseStream: TestStream(byteLimit: 2))
275275
expect(stream.buffered == 0)
276276

@@ -288,7 +288,7 @@ test.case("ConsumeByte") {
288288
}
289289
}
290290

291-
test.case("ConsumeWhile") {
291+
test("ConsumeWhile") {
292292
let stream = BufferedInputStream(
293293
baseStream: TestStream(),
294294
capacity: 2)
@@ -318,7 +318,7 @@ test.case("ConsumeWhile") {
318318
expect(stream.writePosition == stream.storage + 24)
319319
}
320320

321-
test.case("ConsumeUntil") {
321+
test("ConsumeUntil") {
322322
let stream = BufferedInputStream(
323323
baseStream: TestStream(),
324324
capacity: 2)
@@ -348,14 +348,14 @@ test.case("ConsumeUntil") {
348348
expect(stream.writePosition == stream.storage + 24)
349349
}
350350

351-
test.case("ConsumeEmpty") {
351+
test("ConsumeEmpty") {
352352
let stream = BufferedInputStream(baseStream: ByteArrayInputStream([]))
353353
await expect(throws: StreamError.insufficientData) {
354354
try await stream.consume(count: 1)
355355
}
356356
}
357357

358-
test.case("FeedLessThanReadCount") {
358+
test("FeedLessThanReadCount") {
359359
let stream = BufferedInputStream(
360360
baseStream: TestStream(byteLimit: 20),
361361
capacity: 10)
@@ -366,19 +366,19 @@ test.case("FeedLessThanReadCount") {
366366
expect([UInt8](buffer) == [UInt8](repeating: 1, count: 20))
367367
}
368368

369-
test.case("AdvancePositionBeforeCallback") {
369+
test("AdvancePositionBeforeCallback") {
370370
let stream = BufferedInputStream(
371371
baseStream: ByteArrayInputStream([0,1,2,3,4,5,6,7,8,9]))
372372
try await stream.readUntilEnd { bytes in
373373
expect(stream.readPosition == stream.writePosition)
374374
}
375375
}
376376

377-
test.case("ReadLine") {
377+
test("ReadLine") {
378378
let stream = BufferedInputStream(
379379
baseStream: ByteArrayInputStream([UInt8]("line1\r\nline2\n".utf8)))
380380
expect(try await stream.readLine() == "line1")
381381
expect(try await stream.readLine() == "line2")
382382
}
383383

384-
test.run()
384+
await run()

‎Tests/Stream/BufferedStreamWriter/main.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Test
22
@testable import Stream
33

4-
test.case("WriteByte") {
4+
test("WriteByte") {
55
let stream = ByteArrayOutputStream()
66
let output = BufferedOutputStream(baseStream: stream, capacity: 5)
77

@@ -11,4 +11,4 @@ test.case("WriteByte") {
1111
expect(stream.bytes == [42])
1212
}
1313

14-
test.run()
14+
await run()

‎Tests/Stream/ByteArrayInputStream/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import Test
22
@testable import Stream
33

4-
test.case("ByteArrayInputStream") {
4+
test("ByteArrayInputStream") {
55
let inputStream = ByteArrayInputStream([])
66
var buffer = [UInt8]()
77
expect(try inputStream.read(to: &buffer, byteCount: 0) == 0)
88
}
99

10-
test.case("ByteArrayInputStream advance position before callback") {
10+
test("ByteArrayInputStream advance position before callback") {
1111
let input = ByteArrayInputStream([0,1,2,3,4,5,6,7,8,9])
1212
try await input.readUntilEnd { bytes in
1313
expect(input.position == input.bytes.count)
1414
}
1515
}
1616

17-
test.run()
17+
await run()

‎Tests/Stream/ByteArrayOutputStream/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import Test
22
@testable import Stream
33

4-
test.case("ByteArrayOutputStream") {
4+
test("ByteArrayOutputStream") {
55
let outputStream = ByteArrayOutputStream()
66
let bytes = [UInt8]()
77
expect(outputStream.write(from: bytes, byteCount: 0) == 0)
88
}
99

10-
test.case("ByteArrayOutputStream Numeric") {
10+
test("ByteArrayOutputStream Numeric") {
1111
let outputStream = ByteArrayOutputStream()
1212

1313
outputStream.write(Int(-1))
@@ -35,4 +35,4 @@ test.case("ByteArrayOutputStream Numeric") {
3535
expect(try inputStream.read(UInt64.self) == 5)
3636
}
3737

38-
test.run()
38+
await run()

‎Tests/Stream/MemoryStream/main.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
import Test
22
@testable import Stream
33

4-
test.case("MemoryStream") {
4+
test("MemoryStream") {
55
let stream = MemoryStream()
66
expect((stream as Any) is MemoryStream)
77
}
88

9-
test.case("InputStream") {
9+
test("InputStream") {
1010
let stream = MemoryStream()
1111
expect((stream as Any) is InputStream)
1212
}
1313

14-
test.case("OutputStream") {
14+
test("OutputStream") {
1515
let stream = MemoryStream()
1616
expect((stream as Any) is OutputStream)
1717
}
1818

19-
test.case("InitialSize") {
19+
test("InitialSize") {
2020
let stream = MemoryStream()
2121
expect(stream.capacity == 0)
2222
expect(stream.position == 0)
2323
expect(stream.remain == 0)
2424
}
2525

26-
test.case("WriteEmpty") {
26+
test("WriteEmpty") {
2727
let stream = MemoryStream()
2828
let written = try stream.write(from: [], byteCount: 0)
2929
expect(written == 0)
3030
}
3131

32-
test.case("ReadEmpty") {
32+
test("ReadEmpty") {
3333
let stream = MemoryStream()
3434
var buffer: [UInt8] = [0]
3535

3636
let read = try stream.read(to: &buffer, byteCount: 1)
3737
expect(read == 0)
3838
}
3939

40-
test.case("Seek") {
40+
test("Seek") {
4141
let stream = MemoryStream()
4242
expect((stream as Any) is Seekable)
4343
expect(stream.position == 0)
@@ -89,7 +89,7 @@ test.case("Seek") {
8989
}
9090
}
9191

92-
test.case("Write") {
92+
test("Write") {
9393
let stream = MemoryStream()
9494
let data: [UInt8] = [1, 2, 3, 4]
9595

@@ -120,7 +120,7 @@ test.case("Write") {
120120
expect(buffer == data)
121121
}
122122

123-
test.case("Read") {
123+
test("Read") {
124124
let stream = MemoryStream()
125125
let data: [UInt8] = [1, 2, 3, 4]
126126
_ = try stream.write(from: data, byteCount: 4)
@@ -151,7 +151,7 @@ test.case("Read") {
151151
expect(stream.count == 4)
152152
}
153153

154-
test.case("Reallocate") {
154+
test("Reallocate") {
155155
let stream = MemoryStream()
156156
let data: [UInt8] = [1, 2, 3, 4, 5, 6, 7, 8]
157157

@@ -182,7 +182,7 @@ test.case("Reallocate") {
182182
expect(stream.count == 308)
183183
}
184184

185-
test.case("Capacity") {
185+
test("Capacity") {
186186
let stream = MemoryStream(capacity: 4)
187187
let data: [UInt8] = [1, 2, 3, 4]
188188
_ = try stream.write(from: data, byteCount: 2)
@@ -192,7 +192,7 @@ test.case("Capacity") {
192192
}
193193
}
194194

195-
test.case("Trivial") {
195+
test("Trivial") {
196196
let stream = MemoryStream()
197197
var buffer = [UInt8](repeating: 0, count: 8)
198198

@@ -236,7 +236,7 @@ test.case("Trivial") {
236236
}
237237
}
238238

239-
test.case("Buffer") {
239+
test("Buffer") {
240240
let stream = MemoryStream(capacity: 4)
241241
let data: [UInt8] = [1, 2, 3, 4]
242242

@@ -249,4 +249,4 @@ test.case("Buffer") {
249249
expect([1, 2, 3, 4] == [UInt8](stream.buffer))
250250
}
251251

252-
test.run()
252+
await run()

0 commit comments

Comments
 (0)