fix test

uber-go · Nov 12, 2020 · 0816a67 · 0816a67
1 parent a771bac
commit 0816a67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/with_annotated.go b/with_annotated.go
@@ -21,6 +21,7 @@
 package fx
 
 import (
+ "errors"
  "fmt"
  "reflect"
 )
@@ -61,7 +62,9 @@ func WithAnnotated(names ...string) func(interface{}) interface{} {
  userFunc := reflect.ValueOf(f)
  userFuncType := userFunc.Type()
  if userFuncType.Kind() != reflect.Func {
- panic("WithAnnotated returned function must be called with a function")
+ return func() error {
+ return errors.New("WithAnnotated returned function must be called with a function")
+ }
  }
  numArgs := userFuncType.NumIn()
  digInStructFields := []reflect.StructField{{

diff --git a/with_annotated_test.go b/with_annotated_test.go
@@ -21,7 +21,6 @@
 package fx_test
 
 import (
- "context"
  "testing"
 
  "github.com/stretchr/testify/require"
@@ -92,8 +91,8 @@ func TestWithAnnotatedError(t *testing.T) {
  ),
  fx.Invoke(fx.WithAnnotated("foo")("")),
  )
- err := app.Start(context.TODO())
+ err := app.Err()
  require.Error(t, err)
- assert.Contains(t, err.Error(), " WithAnnotated returned function must be called with a function")
+ assert.Contains(t, err.Error(), "WithAnnotated returned function must be called with a function")
  })
 }