refactor(gs): using AddTester

Author: lvan100

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/go-spring/barky v1.0.3
 	github.com/go-spring/gs-assert v1.0.2
 	github.com/go-spring/gs-mock v0.0.4
-	github.com/go-spring/log v0.0.5
+	github.com/go-spring/log v0.0.6
 	github.com/magiconair/properties v1.8.10
 	github.com/pelletier/go-toml v1.9.5
 	github.com/spf13/cast v1.9.2

go.sum

@@ -8,8 +8,8 @@ github.com/go-spring/gs-assert v1.0.2 h1:9vDppl7ZwMvQE4c83ac7GzN0VxZC5BrQue7dND7
 github.com/go-spring/gs-assert v1.0.2/go.mod h1:FfibkqWz4HUBpbig1cKMlzW8Ha7RywTB93f1Q/NuF9I=
 github.com/go-spring/gs-mock v0.0.4 h1:f34YN+ntXflfn13aLa3ZVCB78IG7wWZGK4y5tB+OGpI=
 github.com/go-spring/gs-mock v0.0.4/go.mod h1:QK0PqZ+Vu9F+BU97zl8fip5XKibvDSoN+ofky413Z6Q=
-github.com/go-spring/log v0.0.5 h1:a8yiGmZTS7MPYvYvePXtc0hIdaQ76pLdsXt8iJwgQBQ=
-github.com/go-spring/log v0.0.5/go.mod h1:9SWgPEVWSGgloRTGR7niBliqfwC5UCjPUOl2jyJOimM=
+github.com/go-spring/log v0.0.6 h1:R+0mKWCNzaEIZtqdfCc4e/Ha4FBhr01If5oJXjEwRO0=
+github.com/go-spring/log v0.0.6/go.mod h1:WrLbwbjmU8Vk5ampzBXjG4rTv+BoxmmTXxX82L2hugg=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

gs/app.go

@@ -54,26 +54,22 @@ func (s *AppStarter) RunWith(fn func(ctx context.Context) error) {
 	if err = s.initApp(); err != nil {
 		return
 	}
-	if err = gs_app.GS.RunWith(fn); err != nil {
+	if err = app.RunWith(fn); err != nil {
 		return
 	}
-	if logRefreshed {
-		log.Destroy()
-	}
+	log.Destroy()
 }
 
 // RunAsync runs the app asynchronously and returns a function to stop the app.
 func (s *AppStarter) RunAsync() (func(), error) {
 	if err := s.initApp(); err != nil {
 		return nil, err
 	}
-	if err := gs_app.GS.Start(); err != nil {
+	if err := app.Start(); err != nil {
 		return nil, err
 	}
 	return func() {
-		gs_app.GS.Stop()
-		if logRefreshed {
-			log.Destroy()
-		}
+		app.Stop()
+		log.Destroy()
 	}, nil
 }

gs/gs.go

@@ -164,8 +164,7 @@ func OnEnableServers() ConditionOnProperty {
 /************************************ ioc ************************************/
 
 type (
-	BeanID   = gs.BeanID
-	BeanMock = gs.BeanMock
+	BeanID = gs.BeanID
 )
 
 type (
@@ -212,6 +211,7 @@ type (
 )
 
 var B = gs_app.NewBoot()
+var app = gs_app.NewApp()
 
 // funcRunner is a function type that implements the Runner interface.
 type funcRunner func() error
@@ -260,74 +260,77 @@ func RunAsync() (func(), error) {
 
 // Exiting returns a boolean indicating whether the application is exiting.
 func Exiting() bool {
-	return gs_app.GS.Exiting()
+	return app.Exiting()
 }
 
 // ShutDown shuts down the app with an optional message.
 func ShutDown() {
-	gs_app.GS.ShutDown()
+	app.ShutDown()
 }
 
 // Config returns the app configuration.
 func Config() *gs_conf.AppConfig {
-	return gs_app.GS.P
+	return app.P
 }
 
 // Component registers a bean definition for a given object.
 func Component[T any](i T) T {
 	b := gs_bean.NewBean(reflect.ValueOf(i))
-	gs_app.GS.C.Register(b).Caller(1)
+	app.C.Register(b).Caller(1)
 	return i
 }
 
 // RootBean registers a root bean definition.
 func RootBean(b *RegisteredBean) {
-	gs_app.GS.C.RootBean(b)
+	app.C.RootBean(b)
 }
 
 // Object registers a bean definition for a given object.
 func Object(i any) *RegisteredBean {
 	b := gs_bean.NewBean(reflect.ValueOf(i))
-	return gs_app.GS.C.Register(b).Caller(1)
+	return app.C.Register(b).Caller(1)
 }
 
 // Provide registers a bean definition for a given constructor.
 func Provide(ctor any, args ...Arg) *RegisteredBean {
 	b := gs_bean.NewBean(ctor, args...)
-	return gs_app.GS.C.Register(b).Caller(1)
+	return app.C.Register(b).Caller(1)
 }
 
 // Register registers a bean definition.
 func Register(b *BeanDefinition) *RegisteredBean {
-	return gs_app.GS.C.Register(b)
+	return app.C.Register(b)
 }
 
 // Module registers a module.
 func Module(conditions []ConditionOnProperty, fn func(p conf.Properties) error) {
-	gs_app.GS.C.Module(conditions, fn)
+	app.C.Module(conditions, fn)
 }
 
 // Group registers a module for a group of beans.
-func Group[T any, R any](key string, fn func(c T) (R, error)) {
-	gs_app.GS.C.Module([]ConditionOnProperty{
+func Group[T any, R any](key string, fn func(c T) (R, error), d func(R) error) {
+	app.C.Module([]ConditionOnProperty{
 		OnProperty(key),
 	}, func(p conf.Properties) error {
 		var m map[string]T
 		if err := p.Bind(&m, "${"+key+"}"); err != nil {
 			return err
 		}
 		for name, c := range m {
-			Provide(fn, ValueArg(c)).Name(name)
+			b := Provide(fn, ValueArg(c)).Name(name)
+			if d != nil {
+				b.Destroy(d)
+			}
 		}
 		return nil
 	})
 }
 
 // RefreshProperties refreshes the app configuration.
 func RefreshProperties() error {
-	p, err := gs_app.GS.P.Refresh()
+	p, err := app.P.Refresh()
 	if err != nil {
 		return err
 	}
-	return gs_app.GS.C.RefreshProperties(p)
+	return app.C.RefreshProperties(p)
 }

gs/gstest/testdata/biz/biz.go renamed to gs/gs_test.go

@@ -14,23 +14,33 @@
  * limitations under the License.
  */
 
-package biz
+package gs_test
 
 import (
 	"fmt"
+	"testing"
 
 	"github.com/go-spring/spring-core/gs"
-	"github.com/go-spring/spring-core/gs/gstest/testdata/dao"
 )
 
-func init() {
-	gs.Object(&Service{})
+func TestMain(m *testing.M) {
+	gs.AddTester(&Tester{})
+	gs.Object(&Dep{})
+	gs.TestMain(m)
 }
 
-type Service struct {
-	Dao *dao.Dao `autowire:""`
+func TestAA(t *testing.T) {
+
+}
+
+type Dep struct {
+	Name string `value:"${name:=TestAA}"`
+}
+
+type Tester struct {
+	Dep *Dep `autowire:""`
 }
 
-func (s *Service) Hello(name string) string {
-	return fmt.Sprintf("hello %s", name)
+func (o *Tester) TestAA(t *testing.T) {
+	fmt.Println(o.Dep.Name)
 }