This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/develop by this push:
new d8755c7e8 refactor(filter): remove config package dependency from
tests (#3209)
d8755c7e8 is described below
commit d8755c7e8fa1ee9d8e831fae65b0e06a0cc3d18c
Author: zbchi <[email protected]>
AuthorDate: Wed Feb 11 21:55:33 2026 +0800
refactor(filter): remove config package dependency from tests (#3209)
---
filter/graceful_shutdown/consumer_filter_test.go | 25 ---------------
filter/graceful_shutdown/provider_filter_test.go | 39 ------------------------
2 files changed, 64 deletions(-)
diff --git a/filter/graceful_shutdown/consumer_filter_test.go
b/filter/graceful_shutdown/consumer_filter_test.go
index 3a63e0176..a1e2b9457 100644
--- a/filter/graceful_shutdown/consumer_filter_test.go
+++ b/filter/graceful_shutdown/consumer_filter_test.go
@@ -31,7 +31,6 @@ import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/graceful_shutdown"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
@@ -55,27 +54,3 @@ func TestConsumerFilterInvokeWithGlobalPackage(t *testing.T)
{
assert.NotNil(t, result)
assert.NoError(t, result.Error())
}
-
-// only for compatibility with old config, able to directly remove after
config is deleted
-func TestConsumerFilterInvokeWithConfigPackage(t *testing.T) {
- var (
- baseUrl =
common.NewURLWithOptions(common.WithParams(url.Values{}))
- rpcInvocation = invocation.NewRPCInvocation("GetUser",
[]any{"OK"}, make(map[string]any))
- rootConfig = config.NewRootConfigBuilder().
- SetShutDown(config.NewShutDownConfigBuilder().
- SetTimeout("60s").
- SetStepTimeout("3s").
- Build()).Build()
- filterValue, _ =
extension.GetFilter(constant.GracefulShutdownConsumerFilterKey)
- )
-
- config.SetRootConfig(*rootConfig)
-
- filter := filterValue.(*consumerGracefulShutdownFilter)
- filter.Set(constant.GracefulShutdownFilterShutdownConfig,
config.GetShutDown())
- assert.Equal(t, filter.shutdownConfig,
compatGlobalShutdownConfig(config.GetShutDown()))
-
- result := filter.Invoke(context.Background(),
base.NewBaseInvoker(baseUrl), rpcInvocation)
- assert.NotNil(t, result)
- assert.NoError(t, result.Error())
-}
diff --git a/filter/graceful_shutdown/provider_filter_test.go
b/filter/graceful_shutdown/provider_filter_test.go
index e9cc0a6bb..4863b1f5e 100644
--- a/filter/graceful_shutdown/provider_filter_test.go
+++ b/filter/graceful_shutdown/provider_filter_test.go
@@ -34,7 +34,6 @@ import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/filter"
"dubbo.apache.org/dubbo-go/v3/graceful_shutdown"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
@@ -70,44 +69,6 @@ func TestProviderFilterInvokeWithGlobalPackage(t *testing.T)
{
assert.NotNil(t, invokeResult.Error().Error(), "Rejected")
}
-// only for compatibility with old config, able to directly remove after
config is deleted
-func TestProviderFilterInvokeWithConfigPackage(t *testing.T) {
- var (
- baseUrl =
common.NewURLWithOptions(common.WithParams(url.Values{}))
- rpcInvocation = invocation.NewRPCInvocation("GetUser",
[]any{"OK"}, make(map[string]any))
- rootConfig = config.NewRootConfigBuilder().
- SetShutDown(config.NewShutDownConfigBuilder().
- SetTimeout("60s").
- SetStepTimeout("3s").
- SetRejectRequestHandler("test").
- Build()).Build()
- filterValue, _ =
extension.GetFilter(constant.GracefulShutdownProviderFilterKey)
- )
-
- extension.SetRejectedExecutionHandler("test", func()
filter.RejectedExecutionHandler {
- return &TestRejectedExecutionHandler{}
- })
-
- config.SetRootConfig(*rootConfig)
-
- providerFilter := filterValue.(*providerGracefulShutdownFilter)
- providerFilter.Set(constant.GracefulShutdownFilterShutdownConfig,
config.GetShutDown())
- assert.Equal(t, providerFilter.shutdownConfig,
compatGlobalShutdownConfig(config.GetShutDown()))
-
- invokeResult := providerFilter.Invoke(context.Background(),
base.NewBaseInvoker(baseUrl), rpcInvocation)
- assert.NotNil(t, invokeResult)
- require.NoError(t, invokeResult.Error())
-
- // only use this way to set the RejectRequest, because the variable is
compact to GlobalShutdownConfig
- providerFilter.shutdownConfig.RejectRequest.Store(true)
- // not able to use this way to set the RejectRequest
- //config.GetShutDown().RejectRequest.Store(true)
-
- invokeResult = providerFilter.Invoke(context.Background(),
base.NewBaseInvoker(baseUrl), rpcInvocation)
- assert.NotNil(t, invokeResult)
- assert.NotNil(t, invokeResult.Error().Error(), "Rejected")
-}
-
type TestRejectedExecutionHandler struct{}
// RejectedExecution will do nothing, it only log the invocation.
