@@ -277,7 +277,7 @@ collections += [(array, 'RandomAccess') for array in other_array_types]
277
277
% label = ''
278
278
% end
279
279
280
- JoinTestSuite . test ( " ${Base}.join( ) " ) {
280
+ JoinTestSuite . test ( " ${Base}.joined(separator: ) " ) {
281
281
for test in joinWithSeparatorTests {
282
282
let elements = ${ Base} ( ${ label} test. elements. map {
283
283
${ Base} ( ${ label} $0)
@@ -288,7 +288,7 @@ JoinTestSuite.test("${Base}.join()") {
288
288
}
289
289
}
290
290
291
- JoinTestSuite . test ( " ${Base}.join( )/_copyToContiguousArray() " ) {
291
+ JoinTestSuite . test ( " ${Base}.joined(separator: )/_copyToContiguousArray() " ) {
292
292
for test in joinWithSeparatorTests {
293
293
let elements = ${ Base} ( ${ label} test. elements. map {
294
294
${ Base} ( ${ label} $0)
@@ -301,47 +301,43 @@ JoinTestSuite.test("${Base}.join()/_copyToContiguousArray()") {
301
301
302
302
% end
303
303
304
- func join( _ separator: String , _ elements: [ String ] ) -> String {
305
- return elements. joined ( separator: separator)
306
- }
307
-
308
- JoinTestSuite . test ( " String.joined(separator:) " ) {
309
- //
310
- // Test the free function.
311
- //
304
+ JoinTestSuite . test ( " Sequence<String>.joined(separator:) " ) {
305
+ // Default separator (empty).
306
+ expectEqual ( " " , [ ] . joined ( ) )
307
+ expectEqual ( " " , [ " " ] . joined ( ) )
308
+ expectEqual ( " " , [ " " , " " ] . joined ( ) )
309
+ expectEqual ( " " , [ " " , " " , " " ] . joined ( ) )
310
+ expectEqual ( " a " , [ " a " ] . joined ( ) )
311
+ expectEqual ( " ab " , [ " a " , " b " ] . joined ( ) )
312
+ expectEqual ( " abc " , [ " a " , " b " , " c " ] . joined ( ) )
313
+ expectEqual ( " abcdef " , [ " ab " , " cd " , " ef " ] . joined ( ) )
312
314
313
315
// Empty separator.
314
- expectEqual ( " " , join ( " " , [ ] ) )
315
- expectEqual ( " " , join ( " " , [ " " ] ) )
316
- expectEqual ( " " , join ( " " , [ " " , " " ] ) )
317
- expectEqual ( " " , join ( " " , [ " " , " " , " " ] ) )
318
- expectEqual ( " a " , join ( " " , [ " a " ] ) )
319
- expectEqual ( " ab " , join ( " " , [ " a " , " b " ] ) )
320
- expectEqual ( " abc " , join ( " " , [ " a " , " b " , " c " ] ) )
321
- expectEqual ( " abcdef " , join ( " " , [ " ab " , " cd " , " ef " ] ) )
316
+ expectEqual ( " " , [ ] . joined ( separator : " " ) )
317
+ expectEqual ( " " , [ " " ] . joined ( separator : " " ) )
318
+ expectEqual ( " " , [ " " , " " ] . joined ( separator : " " ) )
319
+ expectEqual ( " " , [ " " , " " , " " ] . joined ( separator : " " ) )
320
+ expectEqual ( " a " , [ " a " ] . joined ( separator : " " ) )
321
+ expectEqual ( " ab " , [ " a " , " b " ] . joined ( separator : " " ) )
322
+ expectEqual ( " abc " , [ " a " , " b " , " c " ] . joined ( separator : " " ) )
323
+ expectEqual ( " abcdef " , [ " ab " , " cd " , " ef " ] . joined ( separator : " " ) )
322
324
323
325
// 1-element separator.
324
- expectEqual ( " " , join ( " x " , [ " " ] ) )
325
- expectEqual ( " x " , join ( " x " , [ " " , " " ] ) )
326
- expectEqual ( " xx " , join ( " x " , [ " " , " " , " " ] ) )
327
- expectEqual ( " a " , join ( " x " , [ " a " ] ) )
328
- expectEqual ( " axb " , join ( " x " , [ " a " , " b " ] ) )
329
- expectEqual ( " axbxc " , join ( " x " , [ " a " , " b " , " c " ] ) )
330
- expectEqual ( " abxcdxef " , join ( " x " , [ " ab " , " cd " , " ef " ] ) )
326
+ expectEqual ( " " , [ " " ] . joined ( separator : " x " ) )
327
+ expectEqual ( " x " , [ " " , " " ] . joined ( separator : " x " ) )
328
+ expectEqual ( " xx " , [ " " , " " , " " ] . joined ( separator : " x " ) )
329
+ expectEqual ( " a " , [ " a " ] . joined ( separator : " x " ) )
330
+ expectEqual ( " axb " , [ " a " , " b " ] . joined ( separator : " x " ) )
331
+ expectEqual ( " axbxc " , [ " a " , " b " , " c " ] . joined ( separator : " x " ) )
332
+ expectEqual ( " abxcdxef " , [ " ab " , " cd " , " ef " ] . joined ( separator : " x " ) )
331
333
332
334
// 2-element separator.
333
- expectEqual ( " " , join ( " xy " , [ " " ] ) )
334
- expectEqual ( " xy " , join ( " xy " , [ " " , " " ] ) )
335
- expectEqual ( " xyxy " , join ( " xy " , [ " " , " " , " " ] ) )
336
- expectEqual ( " a " , join ( " xy " , [ " a " ] ) )
337
- expectEqual ( " axyb " , join ( " xy " , [ " a " , " b " ] ) )
338
- expectEqual ( " axybxyc " , join ( " xy " , [ " a " , " b " , " c " ] ) )
339
- expectEqual ( " abxycdxyef " , join ( " xy " , [ " ab " , " cd " , " ef " ] ) )
340
-
341
- //
342
- // Test forwarding instance function.
343
- //
344
-
335
+ expectEqual ( " " , [ " " ] . joined ( separator: " xy " ) )
336
+ expectEqual ( " xy " , [ " " , " " ] . joined ( separator: " xy " ) )
337
+ expectEqual ( " xyxy " , [ " " , " " , " " ] . joined ( separator: " xy " ) )
338
+ expectEqual ( " a " , [ " a " ] . joined ( separator: " xy " ) )
339
+ expectEqual ( " axyb " , [ " a " , " b " ] . joined ( separator: " xy " ) )
340
+ expectEqual ( " axybxyc " , [ " a " , " b " , " c " ] . joined ( separator: " xy " ) )
345
341
expectEqual ( " abxycdxyef " , [ " ab " , " cd " , " ef " ] . joined ( separator: " xy " ) )
346
342
}
347
343
0 commit comments