Skip to content

Commit 5628de8

Browse files
authored
Merge pull request #72 from alexopryshko/fix_tests
Fix queue tests
2 parents bf6ba07 + 439146e commit 5628de8

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

queue/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func ExampleConnection_Queue() {
6060

6161
task, err = q.TakeTimeout(2 * time.Second)
6262
if task != nil {
63-
fmt.Printf("Task should be nil, but %s", task)
63+
fmt.Printf("Task should be nil, but %d", task.Id())
6464
return
6565
}
6666
}

queue/queue_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,14 @@ func TestFifoQueue_Take(t *testing.T) {
194194
}
195195

196196
if !task.IsTaken() {
197-
t.Errorf("Task status after take is not taken. Status = ", task.Status())
197+
t.Errorf("Task status after take is not taken. Status = %s", task.Status())
198198
}
199199

200200
err = task.Ack()
201201
if err != nil {
202202
t.Errorf("Failed ack %s", err.Error())
203203
} else if !task.IsDone() {
204-
t.Errorf("Task status after take is not done. Status = ", task.Status())
204+
t.Errorf("Task status after take is not done. Status = %s", task.Status())
205205
}
206206
}
207207
}
@@ -300,14 +300,14 @@ func TestFifoQueue_TakeTyped(t *testing.T) {
300300
t.Errorf("Task data after take not equal with example. %#v != %#v", task.Data(), putData)
301301
}
302302
if !task.IsTaken() {
303-
t.Errorf("Task status after take is not taken. Status = ", task.Status())
303+
t.Errorf("Task status after take is not taken. Status = %s", task.Status())
304304
}
305305

306306
err = task.Ack()
307307
if err != nil {
308308
t.Errorf("Failed ack %s", err.Error())
309309
} else if !task.IsDone() {
310-
t.Errorf("Task status after take is not done. Status = ", task.Status())
310+
t.Errorf("Task status after take is not done. Status = %s", task.Status())
311311
}
312312
}
313313
}
@@ -366,7 +366,7 @@ func TestFifoQueue_Peek(t *testing.T) {
366366
}
367367

368368
if !task.IsReady() {
369-
t.Errorf("Task status after peek is not ready. Status = ", task.Status())
369+
t.Errorf("Task status after peek is not ready. Status = %s", task.Status())
370370
}
371371
}
372372
}
@@ -419,7 +419,7 @@ func TestFifoQueue_Bury_Kick(t *testing.T) {
419419
t.Errorf("Failed bury task %s", err.Error())
420420
return
421421
} else if !task.IsBuried() {
422-
t.Errorf("Task status after bury is not buried. Status = ", task.Status())
422+
t.Errorf("Task status after bury is not buried. Status = %s", task.Status())
423423
}
424424

425425
//Kick
@@ -444,14 +444,14 @@ func TestFifoQueue_Bury_Kick(t *testing.T) {
444444
}
445445

446446
if !task.IsTaken() {
447-
t.Errorf("Task status after take is not taken. Status = ", task.Status())
447+
t.Errorf("Task status after take is not taken. Status = %s", task.Status())
448448
}
449449

450450
err = task.Ack()
451451
if err != nil {
452452
t.Errorf("Failed ack %s", err.Error())
453453
} else if !task.IsDone() {
454-
t.Errorf("Task status after take is not done. Status = ", task.Status())
454+
t.Errorf("Task status after take is not done. Status = %s", task.Status())
455455
}
456456
}
457457
}
@@ -510,7 +510,7 @@ func TestFifoQueue_Delete(t *testing.T) {
510510
t.Errorf("Failed bury task %s", err.Error())
511511
return
512512
} else if !tasks[0].IsDone() {
513-
t.Errorf("Task status after delete is not done. Status = ", tasks[0].Status())
513+
t.Errorf("Task status after delete is not done. Status = %s", tasks[0].Status())
514514
}
515515

516516
//Delete by task ID
@@ -519,7 +519,7 @@ func TestFifoQueue_Delete(t *testing.T) {
519519
t.Errorf("Failed bury task %s", err.Error())
520520
return
521521
} else if !tasks[0].IsDone() {
522-
t.Errorf("Task status after delete is not done. Status = ", tasks[0].Status())
522+
t.Errorf("Task status after delete is not done. Status = %s", tasks[0].Status())
523523
}
524524

525525
//Take
@@ -528,7 +528,7 @@ func TestFifoQueue_Delete(t *testing.T) {
528528
if err != nil {
529529
t.Errorf("Failed take from queue: %s", err.Error())
530530
} else if tasks[i] != nil {
531-
t.Errorf("Task is not nil after take. Task is %s", tasks[i])
531+
t.Errorf("Task is not nil after take. Task is %d", tasks[i].Id())
532532
}
533533
}
534534
}
@@ -587,7 +587,7 @@ func TestFifoQueue_Release(t *testing.T) {
587587
//Release
588588
err = task.Release()
589589
if err != nil {
590-
t.Errorf("Failed release task% %s", err.Error())
590+
t.Errorf("Failed release task %s", err.Error())
591591
return
592592
}
593593

@@ -610,14 +610,14 @@ func TestFifoQueue_Release(t *testing.T) {
610610
}
611611

612612
if !task.IsTaken() {
613-
t.Errorf("Task status after take is not taken. Status = ", task.Status())
613+
t.Errorf("Task status after take is not taken. Status = %s", task.Status())
614614
}
615615

616616
err = task.Ack()
617617
if err != nil {
618618
t.Errorf("Failed ack %s", err.Error())
619619
} else if !task.IsDone() {
620-
t.Errorf("Task status after take is not done. Status = ", task.Status())
620+
t.Errorf("Task status after take is not done. Status = %s", task.Status())
621621
}
622622
}
623623
}
@@ -735,14 +735,14 @@ func TestTtlQueue_Put(t *testing.T) {
735735
}
736736

737737
if !task.IsTaken() {
738-
t.Errorf("Task status after take is not taken. Status = ", task.Status())
738+
t.Errorf("Task status after take is not taken. Status = %s", task.Status())
739739
}
740740

741741
err = task.Ack()
742742
if err != nil {
743743
t.Errorf("Failed ack %s", err.Error())
744744
} else if !task.IsDone() {
745-
t.Errorf("Task status after take is not done. Status = ", task.Status())
745+
t.Errorf("Task status after take is not done. Status = %s", task.Status())
746746
}
747747
}
748748
}

0 commit comments

Comments
 (0)