refactor(gs): clean code

Author: lvan100

gs/gs.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"reflect"
 	"runtime"
+	"strings"
 
 	"github.com/go-spring/log"
 	"github.com/go-spring/spring-core/conf"
@@ -189,7 +190,7 @@ func Property(key string, val string) {
 	_, file, _, _ := runtime.Caller(1)
 	fileID := gs_conf.SysConf.AddFile(file)
 	if err := gs_conf.SysConf.Set(key, val, fileID); err != nil {
-		log.Errorf(context.Background(), log.TagAppDef, "failed to set property key=%s, err=%v", key, err)
+		log.Errorf(context.Background(), log.TagAppDef, "failed to set property key=%s err=%v", key, err)
 	}
 }
 
@@ -223,7 +224,8 @@ func Module(conditions []ConditionOnProperty, fn func(p conf.Properties) error)
 }
 
 // Group registers beans in a group based on configuration properties.
-func Group[T any, R any](key string, fn func(c T) (R, error), d func(R) error) {
+func Group[T any, R any](tag string, fn func(c T) (R, error), d func(R) error) {
+	key := strings.TrimSuffix(strings.TrimPrefix(tag, "${"), "}")
 	app.C.Module([]ConditionOnProperty{
 		OnProperty(key),
 	}, func(p conf.Properties) error {

gs/gs_test.go

@@ -27,30 +27,28 @@ import (
 )
 
 func init() {
-	Module(
-		[]ConditionOnProperty{
-			OnEnableServers(),
-			OnProperty(EnableSimpleHttpServerProp).HavingValue("true").MatchIfMissing(),
-		},
-		func(p conf.Properties) error {
-
-			// Register the default ServeMux as a bean if no other ServeMux instance exists
-			Object(http.DefaultServeMux).Export(gs.As[http.Handler]()).Condition(
-				OnMissingBean[http.Handler](),
-			)
-
-			// Provide a new SimpleHttpServer instance with configuration bindings.
-			Provide(
-				NewSimpleHttpServer,
-				IndexArg(1, BindArg(SetHttpServerAddr, TagArg("${http.server.addr:=0.0.0.0:9090}"))),
-				IndexArg(1, BindArg(SetHttpServerReadTimeout, TagArg("${http.server.readTimeout:=5s}"))),
-				IndexArg(1, BindArg(SetHttpServerHeaderTimeout, TagArg("${http.server.headerTimeout:=1s}"))),
-				IndexArg(1, BindArg(SetHttpServerWriteTimeout, TagArg("${http.server.writeTimeout:=5s}"))),
-				IndexArg(1, BindArg(SetHttpServerIdleTimeout, TagArg("${http.server.idleTimeout:=60s}"))),
-			).AsServer()
-
-			return nil
-		})
+	Module([]ConditionOnProperty{
+		OnEnableServers(),
+		OnProperty(EnableSimpleHttpServerProp).HavingValue("true").MatchIfMissing(),
+	}, func(p conf.Properties) error {
+
+		// Register the default ServeMux as a bean if no other ServeMux instance exists
+		Object(http.DefaultServeMux).Export(gs.As[http.Handler]()).Condition(
+			OnMissingBean[http.Handler](),
+		)
+
+		// Provide a new SimpleHttpServer instance with configuration bindings.
+		Provide(
+			NewSimpleHttpServer,
+			IndexArg(1, BindArg(SetHttpServerAddr, TagArg("${http.server.addr:=0.0.0.0:9090}"))),
+			IndexArg(1, BindArg(SetHttpServerReadTimeout, TagArg("${http.server.readTimeout:=5s}"))),
+			IndexArg(1, BindArg(SetHttpServerHeaderTimeout, TagArg("${http.server.headerTimeout:=1s}"))),
+			IndexArg(1, BindArg(SetHttpServerWriteTimeout, TagArg("${http.server.writeTimeout:=5s}"))),
+			IndexArg(1, BindArg(SetHttpServerIdleTimeout, TagArg("${http.server.idleTimeout:=60s}"))),
+		).AsServer()
+
+		return nil
+	})
 }
 
 // HttpServerConfig holds configuration options for the HTTP server.

gs/http.go

@@ -25,19 +25,20 @@ import (
 	"github.com/go-spring/spring-core/util"
 )
 
-// BeanMock is a mock for bean.
+// BeanMock represents a mock bean for testing.
 type BeanMock[T any] struct {
 	selector gs.BeanSelector
 }
 
-// MockFor creates a mock for bean.
+// MockFor creates a BeanMock for the given type and optional bean name.
 func MockFor[T any](name ...string) BeanMock[T] {
 	return BeanMock[T]{
 		selector: gs.BeanSelectorFor[T](name...),
 	}
 }
 
-// With registers a mock bean.
+// With registers a mock instance into the IoC container,
+// replacing the target bean defined by the selector.
 func (m BeanMock[T]) With(obj T) {
 	app.C.AddMock(gs.BeanMock{
 		Object: obj,
@@ -47,23 +48,29 @@ func (m BeanMock[T]) With(obj T) {
 
 var testers []any
 
-// AddTester adds a tester to the test suite.
+// AddTester registers a tester instance into the test suite.
+// The tester will be scanned for methods prefixed with 'Test'
+// and automatically added as Go test functions.
 func AddTester(t any) {
 	testers = append(testers, t)
 	app.C.RootBean(app.C.Object(t))
 }
 
-// TestMain is the entry point for testing.
+// TestMain is the custom entry point for the Go test framework.
+// It patches the internal 'tests' slice of testing.M to include
+// methods defined in registered testers, then runs the app and tests.
 func TestMain(m *testing.M) {
 
-	// patch m.tests
+	// Patch m.tests using reflection (non-standard hack).
 	mValue := util.PatchValue(reflect.ValueOf(m))
 	fValue := util.PatchValue(mValue.Elem().FieldByName("tests"))
 	tests := fValue.Interface().([]testing.InternalTest)
+
+	// Scan all registered testers for methods starting with 'Test'.
 	for _, tester := range testers {
 		tt := reflect.TypeOf(tester)
 		typeName := tt.Elem().String()
-		for i := range tt.NumMethod() {
+		for i := 0; i < tt.NumMethod(); i++ {
 			methodType := tt.Method(i)
 			if strings.HasPrefix(methodType.Name, "Test") {
 				tests = append(tests, testing.InternalTest{
@@ -78,15 +85,15 @@ func TestMain(m *testing.M) {
 	}
 	fValue.Set(reflect.ValueOf(tests))
 
-	// run app
+	// Run the application asynchronously.
 	stop, err := RunAsync()
 	if err != nil {
 		panic(err)
 	}
 
-	// run test
+	// Run the tests.
 	m.Run()
 
-	// stop app
+	// Stop the application gracefully after tests complete.
 	stop()
 }

gs/test.go

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2025 The Go-Spring Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gs_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/go-spring/gs-assert/assert"
+	"github.com/go-spring/spring-core/gs"
+)
+
+func init() {
+	gs.Object(&GreetingService{})
+	gs.AddTester(&GreetingTester{})
+}
+
+func init() {
+	gs.MockFor[*GreetingService]().With(
+		&GreetingService{
+			Message: "Hello, World!",
+		},
+	)
+}
+
+func TestMain(m *testing.M) {
+	gs.TestMain(m)
+}
+
+func TestGreeting(t *testing.T) {
+	fmt.Println(t.Name()) // TestGreeting
+}
+
+func TestFarewell(t *testing.T) {
+	fmt.Println(t.Name()) // TestFarewell
+}
+
+type GreetingService struct {
+	Message string `value:"${app.greeting:=Hello, Go-Spring!}"`
+}
+
+type GreetingTester struct {
+	Svc *GreetingService `autowire:""`
+}
+
+func (u *GreetingTester) TestGreeting(t *testing.T) {
+	fmt.Println(t.Name()) // gs_test.GreetingTester.TestFarewell
+	assert.That(t, u.Svc).NotNil()
+	assert.ThatString(t, u.Svc.Message).Equal("Hello, World!")
+}
+
+func (u *GreetingTester) TestFarewell(t *testing.T) {
+	fmt.Println(t.Name()) // gs_test.GreetingTester.TestGreeting
+	assert.That(t, u.Svc).NotNil()
+	assert.ThatString(t, u.Svc.Message).Equal("Hello, World!")
+}