@@ -21,7 +21,7 @@ import XCTest
21
21
class TestProgressManager : XCTestCase {
22
22
/// MARK: Helper methods that report progress
23
23
func doBasicOperationV1( reportTo subprogress: consuming Subprogress ) async {
24
- let manager = subprogress. manager ( totalCount: 8 )
24
+ let manager = subprogress. start ( totalCount: 8 )
25
25
for i in 1 ... 8 {
26
26
manager. complete ( count: 1 )
27
27
XCTAssertEqual ( manager. completedCount, i)
@@ -30,7 +30,7 @@ class TestProgressManager: XCTestCase {
30
30
}
31
31
32
32
func doBasicOperationV2( reportTo subprogress: consuming Subprogress ) async {
33
- let manager = subprogress. manager ( totalCount: 7 )
33
+ let manager = subprogress. start ( totalCount: 7 )
34
34
for i in 1 ... 7 {
35
35
manager. complete ( count: 1 )
36
36
XCTAssertEqual ( manager. completedCount, i)
@@ -39,7 +39,7 @@ class TestProgressManager: XCTestCase {
39
39
}
40
40
41
41
func doBasicOperationV3( reportTo subprogress: consuming Subprogress ) async {
42
- let manager = subprogress. manager ( totalCount: 11 )
42
+ let manager = subprogress. start ( totalCount: 11 )
43
43
for i in 1 ... 11 {
44
44
manager. complete ( count: 1 )
45
45
XCTAssertEqual ( manager. completedCount, i)
@@ -95,7 +95,7 @@ class TestProgressManager: XCTestCase {
95
95
XCTAssertFalse ( overall. isFinished)
96
96
97
97
let progress1 = overall. subprogress ( assigningCount: 2 )
98
- let manager1 = progress1. manager ( totalCount: 1 )
98
+ let manager1 = progress1. start ( totalCount: 1 )
99
99
100
100
manager1. complete ( count: 1 )
101
101
XCTAssertEqual ( manager1. totalCount, 1 )
@@ -125,7 +125,7 @@ class TestProgressManager: XCTestCase {
125
125
overall. complete ( count: 5 )
126
126
127
127
let progress1 = overall. subprogress ( assigningCount: 8 )
128
- let manager1 = progress1. manager ( totalCount: 1 )
128
+ let manager1 = progress1. start ( totalCount: 1 )
129
129
manager1. complete ( count: 1 )
130
130
131
131
XCTAssertEqual ( overall. completedCount, 13 )
@@ -181,11 +181,11 @@ class TestProgressManager: XCTestCase {
181
181
let overall = ProgressManager ( totalCount: 2 )
182
182
183
183
let progress1 = overall. subprogress ( assigningCount: 1 )
184
- let manager1 = progress1. manager ( totalCount: 5 )
184
+ let manager1 = progress1. start ( totalCount: 5 )
185
185
manager1. complete ( count: 5 )
186
186
187
187
let progress2 = overall. subprogress ( assigningCount: 1 )
188
- let manager2 = progress2. manager ( totalCount: 5 )
188
+ let manager2 = progress2. start ( totalCount: 5 )
189
189
manager2. withProperties { properties in
190
190
properties. totalFileCount = 10
191
191
}
@@ -216,10 +216,10 @@ class TestProgressManager: XCTestCase {
216
216
XCTAssertEqual ( overall. fractionCompleted, 0.0 )
217
217
218
218
let child1 = overall. subprogress ( assigningCount: 100 )
219
- let manager1 = child1. manager ( totalCount: 100 )
219
+ let manager1 = child1. start ( totalCount: 100 )
220
220
221
221
let grandchild1 = manager1. subprogress ( assigningCount: 100 )
222
- let grandchildManager1 = grandchild1. manager ( totalCount: 100 )
222
+ let grandchildManager1 = grandchild1. start ( totalCount: 100 )
223
223
224
224
XCTAssertEqual ( overall. fractionCompleted, 0.0 )
225
225
@@ -241,16 +241,16 @@ class TestProgressManager: XCTestCase {
241
241
XCTAssertEqual ( overall. fractionCompleted, 0.0 )
242
242
243
243
let child1 = overall. subprogress ( assigningCount: 100 )
244
- let manager1 = child1. manager ( totalCount: 100 )
244
+ let manager1 = child1. start ( totalCount: 100 )
245
245
246
246
let grandchild1 = manager1. subprogress ( assigningCount: 100 )
247
- let grandchildManager1 = grandchild1. manager ( totalCount: 100 )
247
+ let grandchildManager1 = grandchild1. start ( totalCount: 100 )
248
248
249
249
XCTAssertEqual ( overall. fractionCompleted, 0.0 )
250
250
251
251
252
252
let greatGrandchild1 = grandchildManager1. subprogress ( assigningCount: 100 )
253
- let greatGrandchildManager1 = greatGrandchild1. manager ( totalCount: 100 )
253
+ let greatGrandchildManager1 = greatGrandchild1. start ( totalCount: 100 )
254
254
255
255
greatGrandchildManager1. complete ( count: 50 )
256
256
XCTAssertEqual ( overall. fractionCompleted, 0.5 )
@@ -268,7 +268,7 @@ class TestProgressManager: XCTestCase {
268
268
/// Unit tests for propagation of type-safe metadata in ProgressManager tree.
269
269
class TestProgressManagerAdditionalProperties : XCTestCase {
270
270
func doFileOperation( reportTo subprogress: consuming Subprogress ) async {
271
- let manager = subprogress. manager ( totalCount: 100 )
271
+ let manager = subprogress. start ( totalCount: 100 )
272
272
manager. withProperties { properties in
273
273
properties. totalFileCount = 100
274
274
}
@@ -312,7 +312,7 @@ class TestProgressManagerAdditionalProperties: XCTestCase {
312
312
let overall = ProgressManager ( totalCount: 2 )
313
313
314
314
let progress1 = overall. subprogress ( assigningCount: 1 )
315
- let manager1 = progress1. manager ( totalCount: 10 )
315
+ let manager1 = progress1. start ( totalCount: 10 )
316
316
manager1. withProperties { properties in
317
317
properties. totalFileCount = 10
318
318
properties. completedFileCount = 0
@@ -336,15 +336,15 @@ class TestProgressManagerAdditionalProperties: XCTestCase {
336
336
let overall = ProgressManager ( totalCount: 2 )
337
337
338
338
let progress1 = overall. subprogress ( assigningCount: 1 )
339
- let manager1 = progress1. manager ( totalCount: 10 )
339
+ let manager1 = progress1. start ( totalCount: 10 )
340
340
341
341
manager1. withProperties { properties in
342
342
properties. totalFileCount = 11
343
343
properties. completedFileCount = 0
344
344
}
345
345
346
346
let progress2 = overall. subprogress ( assigningCount: 1 )
347
- let manager2 = progress2. manager ( totalCount: 10 )
347
+ let manager2 = progress2. start ( totalCount: 10 )
348
348
349
349
manager2. withProperties { properties in
350
350
properties. totalFileCount = 9
@@ -377,11 +377,11 @@ class TestProgressManagerAdditionalProperties: XCTestCase {
377
377
let overall = ProgressManager ( totalCount: 1 )
378
378
379
379
let progress1 = overall. subprogress ( assigningCount: 1 )
380
- let manager1 = progress1. manager ( totalCount: 5 )
380
+ let manager1 = progress1. start ( totalCount: 5 )
381
381
382
382
383
383
let childProgress1 = manager1. subprogress ( assigningCount: 3 )
384
- let childManager1 = childProgress1. manager ( totalCount: nil )
384
+ let childManager1 = childProgress1. start ( totalCount: nil )
385
385
childManager1. withProperties { properties in
386
386
properties. totalFileCount += 10
387
387
}
@@ -391,7 +391,7 @@ class TestProgressManagerAdditionalProperties: XCTestCase {
391
391
XCTAssertEqual ( preTotalFileValues, [ 0 , 0 , 10 ] )
392
392
393
393
let childProgress2 = manager1. subprogress ( assigningCount: 2 )
394
- let childManager2 = childProgress2. manager ( totalCount: nil )
394
+ let childManager2 = childProgress2. start ( totalCount: nil )
395
395
childManager2. withProperties { properties in
396
396
properties. totalFileCount += 10
397
397
}
@@ -425,7 +425,7 @@ class TestProgressManagerInterop: XCTestCase {
425
425
}
426
426
427
427
func doSomethingWithReporter( subprogress: consuming Subprogress ? ) async {
428
- let manager = subprogress? . manager ( totalCount: 4 )
428
+ let manager = subprogress? . start ( totalCount: 4 )
429
429
manager? . complete ( count: 2 )
430
430
manager? . complete ( count: 2 )
431
431
}
@@ -543,7 +543,7 @@ class TestProgressManagerInterop: XCTestCase {
543
543
}
544
544
545
545
func receiveProgress( progress: consuming Subprogress ) {
546
- let _ = progress. manager ( totalCount: 5 )
546
+ let _ = progress. start ( totalCount: 5 )
547
547
}
548
548
549
549
func testInteropProgressManagerParentProgressChildConsistency( ) async throws {
0 commit comments