111

Author: lvan100

util/goutil/goutil_test.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"testing"
+	"time"
 
 	"github.com/go-spring/spring-base/testing/assert"
 	"github.com/go-spring/spring-core/util/goutil"
@@ -39,45 +40,54 @@ func TestGo(t *testing.T) {
 	assert.That(t, s).Equal("hello world!")
 }
 
-func TestGoFunc(t *testing.T) {
-
-	var s string
-	goutil.GoFunc(func() {
-		panic("something is wrong")
-	}).Wait()
-	assert.That(t, s).Equal("")
-
-	goutil.GoFunc(func() {
-		s = "hello world!"
-	}).Wait()
-	assert.That(t, s).Equal("hello world!")
-}
-
 func TestGoValue(t *testing.T) {
 
 	s, err := goutil.GoValue(t.Context(), func(ctx context.Context) (string, error) {
 		panic("something is wrong")
 	}).Wait()
 	assert.That(t, s).Equal("")
-	assert.That(t, err).Equal(errors.New("panic occurred"))
+	assert.Error(t, err).Matches("panic recovered: .*")
+
+	i, err := goutil.GoValue(t.Context(), func(ctx context.Context) (int, error) {
+		return 42, nil
+	}).Wait()
+	assert.That(t, err).Nil()
+	assert.That(t, i).Equal(42)
 
 	s, err = goutil.GoValue(t.Context(), func(ctx context.Context) (string, error) {
 		return "hello world!", nil
 	}).Wait()
-	assert.That(t, s).Equal("hello world!")
 	assert.That(t, err).Nil()
+	assert.That(t, s).Equal("hello world!")
 
 	var arr []*goutil.ValueStatus[int]
 	for i := range 3 {
 		arr = append(arr, goutil.GoValue(t.Context(), func(ctx context.Context) (int, error) {
 			return i, nil
 		}))
 	}
-
-	var v int
 	for i, g := range arr {
-		v, err = g.Wait()
+		v, err := g.Wait()
 		assert.That(t, v).Equal(i)
 		assert.That(t, err).Nil()
 	}
+
+	expectedErr := errors.New("expected error")
+	_, err = goutil.GoValue(t.Context(), func(ctx context.Context) (string, error) {
+		return "", expectedErr
+	}).Wait()
+	assert.That(t, err).Equal(expectedErr)
+
+	t.Run("context cancel", func(t *testing.T) {
+		ctx, cancel := context.WithCancel(t.Context())
+		go func() {
+			time.Sleep(10 * time.Millisecond)
+			cancel()
+		}()
+		_, err := goutil.GoValue(ctx, func(ctx context.Context) (string, error) {
+			time.Sleep(100 * time.Millisecond)
+			return "done", nil
+		}).Wait()
+		assert.That(t, err).Nil()
+	})
 }