@@ -12,9 +12,8 @@ import (
1212func TestParallel (t * testing.T ) {
1313 a := assert .New (t )
1414
15- out , index , err := Parallel (0 )
15+ out , err := Parallel (0 )
1616 a .NilNow (err )
17- a .EqualNow (index , - 1 )
1817 a .EqualNow (out , [][]any {})
1918
2019 a .PanicNow (func () {
@@ -35,10 +34,9 @@ func TestParallelWithoutConcurrencyLimit(t *testing.T) {
3534 }
3635
3736 start := time .Now ()
38- out , index , err := Parallel (0 , funcs ... )
37+ out , err := Parallel (0 , funcs ... )
3938 dur := time .Since (start )
4039 a .NilNow (err )
41- a .EqualNow (index , - 1 )
4240 a .TrueNow (dur - 100 * time .Millisecond < 30 * time .Millisecond ) // allow 30ms deviation
4341 a .EqualNow (out , [][]any {{0 , nil }, {1 , nil }, {2 , nil }, {3 , nil }, {4 , nil }})
4442}
@@ -56,10 +54,9 @@ func TestParallelWithConcurrencyLimit(t *testing.T) {
5654 }
5755
5856 start := time .Now ()
59- out , index , err := Parallel (2 , funcs ... )
57+ out , err := Parallel (2 , funcs ... )
6058 dur := time .Since (start )
6159 a .NilNow (err )
62- a .EqualNow (index , - 1 )
6360 a .TrueNow (dur - 300 * time .Millisecond < 30 * time .Millisecond ) // allow 30ms deviation
6461 a .EqualNow (out , [][]any {{0 , nil }, {1 , nil }, {2 , nil }, {3 , nil }, {4 , nil }})
6562}
@@ -84,10 +81,10 @@ func TestParallelWithFailedTask(t *testing.T) {
8481 }
8582
8683 start := time .Now ()
87- out , index , err := Parallel (2 , funcs ... )
84+ out , err := Parallel (2 , funcs ... )
8885 dur := time .Since (start )
89- a .EqualNow (err , expectedErr )
90- a .EqualNow (index , 2 )
86+ a .NotNilNow (err )
87+ a .EqualNow (err . Error (), "function 2 error: expected error" )
9188 a .TrueNow (dur - 150 * time .Millisecond < 30 * time .Millisecond ) // allow 30ms deviation
9289 a .EqualNow (out , [][]any {{0 , nil }, {1 , nil }, {2 , expectedErr }, nil , nil })
9390}
@@ -106,9 +103,8 @@ func TestParallelWithContext(t *testing.T) {
106103 })
107104 }
108105
109- out , index , err := ParallelWithContext (context .Background (), 2 , funcs ... )
106+ out , err := ParallelWithContext (context .Background (), 2 , funcs ... )
110107 a .NilNow (err )
111- a .EqualNow (index , - 1 )
112108 a .EqualNow (out , [][]any {{0 , nil }, {1 , nil }, {2 , nil }, {3 , nil }, {4 , nil }})
113109
114110 finishedNum := 0
@@ -137,9 +133,9 @@ func TestParallelWithTimedOutContext(t *testing.T) {
137133 ctx , canFunc := context .WithTimeout (context .Background (), 150 * time .Millisecond )
138134 defer canFunc ()
139135
140- out , index , err := ParallelWithContext (ctx , 2 , funcs ... )
136+ out , err := ParallelWithContext (ctx , 2 , funcs ... )
137+ a .NotNilNow (err )
141138 a .TrueNow (errors .Is (err , ErrContextCanceled ))
142- a .EqualNow (index , - 1 )
143139 a .EqualNow (res , []bool {true , true , false , false , false })
144140 a .EqualNow (out , [][]any {{0 , nil }, {1 , nil }, nil , nil , nil })
145141}
0 commit comments