Merge pull request #11 from FishGoddess/develop

v0.3.2

Author: FishGoddess

HISTORY.md

@@ -1,5 +1,11 @@
 ## ✒ 历史版本的特性介绍 (Features in old versions)
 
+### v0.3.2
+
+> 此版本发布于 2026-01-07
+
+* 完善单元测试，将覆盖率提升到 100%
+
 ### v0.3.1-alpha
 
 > 此版本发布于 2026-01-07

README.en.md

@@ -36,7 +36,7 @@ import (
 func main() {
 	ctx := context.Background()
 
-	// Limits the number of simultaneous goroutines and not reuses them.
+	// Limits goroutines.
 	limiter := goes.NewLimiter(4)
 
 	for i := 0; i < 20; i++ {
@@ -48,7 +48,7 @@ func main() {
 
 	limiter.Wait()
 
-	// Limits the number of simultaneous goroutines and reuses them.
+	// Reuses goroutines.
 	executor := goes.NewExecutor(4)
 	defer executor.Close()
 

README.md

@@ -36,7 +36,7 @@ import (
 func main() {
 	ctx := context.Background()
 
-	// Limits the number of simultaneous goroutines and not reuses them.
+	// Limits goroutines.
 	limiter := goes.NewLimiter(4)
 
 	for i := 0; i < 20; i++ {
@@ -48,7 +48,7 @@ func main() {
 
 	limiter.Wait()
 
-	// Limits the number of simultaneous goroutines and reuses them.
+	// Reuses goroutines.
 	executor := goes.NewExecutor(4)
 	defer executor.Close()
 

_examples/basic.go

@@ -15,7 +15,7 @@ import (
 func main() {
 	ctx := context.Background()
 
-	// Limits the number of simultaneous goroutines and not reuses them.
+	// Limits goroutines.
 	limiter := goes.NewLimiter(4)
 
 	for i := 0; i < 20; i++ {
@@ -27,7 +27,7 @@ func main() {
 
 	limiter.Wait()
 
-	// Limits the number of simultaneous goroutines and reuses them.
+	// Reuses goroutines.
 	executor := goes.NewExecutor(4)
 	defer executor.Close()
 

_icons/coverage.svg

@@ -24,10 +24,11 @@ var (
 type Executor struct {
 	conf *config
 
-	tasks  chan Task
-	done   chan struct{}
-	closed atomic.Bool
-	group  sync.WaitGroup
+	workers uint
+	tasks   chan Task
+	done    chan struct{}
+	closed  atomic.Bool
+	group   sync.WaitGroup
 }
 
 // NewExecutor creates a executor with workers.
@@ -43,9 +44,10 @@ func NewExecutor(workers uint, opts ...Option) *Executor {
 	}
 
 	executor := &Executor{
-		conf:  conf,
-		tasks: make(chan Task, conf.queueSize),
-		done:  make(chan struct{}),
+		conf:    conf,
+		workers: workers,
+		tasks:   make(chan Task, conf.queueSize),
+		done:    make(chan struct{}),
 	}
 
 	for range workers {

executor.go

@@ -49,3 +49,90 @@ func TestExecutor(t *testing.T) {
 		t.Fatalf("gotTotalCount %d != totalCount %d", gotTotalCount, totalCount)
 	}
 }
+
+// go test -v -cover -run=^TestExecutorMinMax$
+func TestExecutorMinMax(t *testing.T) {
+	executor := NewExecutor(minWorkers - 1)
+
+	if executor.workers != minWorkers {
+		t.Fatalf("got %d != want %d", executor.workers, minWorkers)
+	}
+
+	executor.Close()
+	executor = NewExecutor(maxWorkers + 1)
+
+	if executor.workers != maxWorkers {
+		t.Fatalf("got %d != want %d", executor.workers, maxWorkers)
+	}
+
+	executor.Close()
+}
+
+// go test -v -cover -run=^TestExecutorContext$
+func TestExecutorContext(t *testing.T) {
+	executor := NewExecutor(4, WithQueueSize(1))
+	defer executor.Close()
+
+	got := uint(cap(executor.tasks))
+	if got != executor.conf.queueSize {
+		t.Fatalf("got %d != want %d", got, executor.conf.queueSize)
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+	defer cancel()
+
+	for i := uint(0); i <= executor.workers; i++ {
+		err := executor.Submit(ctx, func() {
+			time.Sleep(200 * time.Millisecond)
+		})
+
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	err := executor.Submit(ctx, func() {})
+	if err != context.DeadlineExceeded {
+		t.Fatalf("got %+v != want %+v", err, context.DeadlineExceeded)
+	}
+}
+
+// go test -v -cover -run=^TestExecutorClose$
+func TestExecutorClose(t *testing.T) {
+	executor := NewExecutor(4, WithQueueSize(1))
+	defer executor.Close()
+
+	if executor.closed.Load() {
+		t.Fatal("executor is closed")
+	}
+
+	ctx := context.Background()
+	for i := uint(0); i <= executor.workers; i++ {
+		err := executor.Submit(ctx, func() {
+			time.Sleep(200 * time.Millisecond)
+		})
+
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	go func() {
+		err := executor.Submit(ctx, func() {})
+		if err != ErrExecutorClosed {
+			t.Errorf("got %+v != want %+v", err, ErrExecutorClosed)
+		}
+	}()
+
+	time.Sleep(10 * time.Millisecond)
+	executor.Close()
+
+	if !executor.closed.Load() {
+		t.Fatal("executor not closed")
+	}
+
+	err := executor.Submit(ctx, func() {})
+	if err != ErrExecutorClosed {
+		t.Errorf("got %+v != want %+v", err, ErrExecutorClosed)
+	}
+}

executor_test.go

@@ -46,3 +46,20 @@ func TestLimiter(t *testing.T) {
 		t.Fatalf("gotTotalCount %d != totalCount %d", gotTotalCount, totalCount)
 	}
 }
+
+// go test -v -cover -run=^TestLimiterMinMax$
+func TestLimiterMinMax(t *testing.T) {
+	limiter := NewLimiter(minLimit - 1)
+
+	got := cap(limiter.tokens)
+	if got != minLimit {
+		t.Fatalf("got %d != want %d", got, minLimit)
+	}
+
+	limiter = NewLimiter(maxLimit + 1)
+
+	got = cap(limiter.tokens)
+	if got != maxLimit {
+		t.Fatalf("got %d != want %d", got, maxLimit)
+	}
+}