refactor: create task worker testing

Author: appleboy

queue_test.go

@@ -1,7 +1,6 @@
 package queue
 
 import (
-	"context"
 	"testing"
 	"time"
 
@@ -107,37 +106,3 @@ func TestCloseQueueAfterShutdown(t *testing.T) {
 	assert.Error(t, err)
 	assert.Equal(t, ErrQueueShutdown, err)
 }
-
-func TestQueueTaskJob(t *testing.T) {
-	w := &taskWorker{
-		messages: make(chan QueuedMessage, 10),
-	}
-	q, err := NewQueue(
-		WithWorker(w),
-		WithWorkerCount(5),
-		WithLogger(NewLogger()),
-	)
-	assert.NoError(t, err)
-	assert.NotNil(t, q)
-	q.Start()
-	assert.NoError(t, q.QueueTask(func(ctx context.Context) error {
-		time.Sleep(120 * time.Millisecond)
-		q.logger.Info("Add new task 1")
-		return nil
-	}))
-	assert.NoError(t, q.QueueTask(func(ctx context.Context) error {
-		time.Sleep(100 * time.Millisecond)
-		q.logger.Info("Add new task 2")
-		return nil
-	}))
-	assert.NoError(t, q.QueueTaskWithTimeout(50*time.Millisecond, func(ctx context.Context) error {
-		time.Sleep(80 * time.Millisecond)
-		return nil
-	}))
-	time.Sleep(50 * time.Millisecond)
-	q.Shutdown()
-	assert.Equal(t, ErrQueueShutdown, q.QueueTask(func(ctx context.Context) error {
-		return nil
-	}))
-	q.Wait()
-}

worker_message.go

@@ -39,6 +39,6 @@ func (w *messageWorker) Request() (QueuedMessage, error) {
 	case task := <-w.messages:
 		return task, nil
 	default:
-		return nil, errors.New("no message in queue")
+		return nil, ErrNoTaskInQueue
 	}
 }

worker_task.go

@@ -40,6 +40,6 @@ func (w *taskWorker) Request() (QueuedMessage, error) {
 	case task := <-w.messages:
 		return task, nil
 	default:
-		return nil, errors.New("no message in queue")
+		return nil, ErrNoTaskInQueue
 	}
 }

worker_task_test.go

@@ -0,0 +1,43 @@
+package queue
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestQueueTaskJob(t *testing.T) {
+	w := &taskWorker{
+		messages: make(chan QueuedMessage, 10),
+	}
+	q, err := NewQueue(
+		WithWorker(w),
+		WithWorkerCount(5),
+		WithLogger(NewLogger()),
+	)
+	assert.NoError(t, err)
+	assert.NotNil(t, q)
+	q.Start()
+	assert.NoError(t, q.QueueTask(func(ctx context.Context) error {
+		time.Sleep(120 * time.Millisecond)
+		q.logger.Info("Add new task 1")
+		return nil
+	}))
+	assert.NoError(t, q.QueueTask(func(ctx context.Context) error {
+		time.Sleep(100 * time.Millisecond)
+		q.logger.Info("Add new task 2")
+		return nil
+	}))
+	assert.NoError(t, q.QueueTaskWithTimeout(50*time.Millisecond, func(ctx context.Context) error {
+		time.Sleep(80 * time.Millisecond)
+		return nil
+	}))
+	time.Sleep(50 * time.Millisecond)
+	q.Shutdown()
+	assert.Equal(t, ErrQueueShutdown, q.QueueTask(func(ctx context.Context) error {
+		return nil
+	}))
+	q.Wait()
+}