refactor: use testutil helpers in server tests
This commit is contained in:
parent
8681472c4b
commit
4678cb5483
@ -22,8 +22,8 @@ import (
|
|||||||
"github.com/valyala/fasthttp"
|
"github.com/valyala/fasthttp"
|
||||||
"rua.plus/lolly/internal/cache"
|
"rua.plus/lolly/internal/cache"
|
||||||
"rua.plus/lolly/internal/config"
|
"rua.plus/lolly/internal/config"
|
||||||
"rua.plus/lolly/internal/loadbalance"
|
|
||||||
"rua.plus/lolly/internal/proxy"
|
"rua.plus/lolly/internal/proxy"
|
||||||
|
"rua.plus/lolly/internal/testutil"
|
||||||
"rua.plus/lolly/internal/utils"
|
"rua.plus/lolly/internal/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -798,7 +798,7 @@ func TestPurgeHandler_PurgeByPath_WithRealCache(t *testing.T) {
|
|||||||
MaxAge: 10 * time.Second,
|
MaxAge: 10 * time.Second,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
p, err := proxy.NewProxy(cfg, targets, nil, nil)
|
p, err := proxy.NewProxy(cfg, targets, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewProxy() error: %v", err)
|
t.Fatalf("NewProxy() error: %v", err)
|
||||||
@ -888,7 +888,7 @@ func TestPurgeHandler_PurgeByPattern_WithRealCache(t *testing.T) {
|
|||||||
MaxAge: 10 * time.Second,
|
MaxAge: 10 * time.Second,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
p, err := proxy.NewProxy(cfg, targets, nil, nil)
|
p, err := proxy.NewProxy(cfg, targets, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewProxy() error: %v", err)
|
t.Fatalf("NewProxy() error: %v", err)
|
||||||
@ -959,13 +959,8 @@ func TestPurgeHandler_PurgeByPattern_WithRealCache(t *testing.T) {
|
|||||||
// TestPurgeHandler_PurgeByPath_WithProxyNoCache 测试代理没有缓存时的情况。
|
// TestPurgeHandler_PurgeByPath_WithProxyNoCache 测试代理没有缓存时的情况。
|
||||||
func TestPurgeHandler_PurgeByPath_WithProxyNoCache(t *testing.T) {
|
func TestPurgeHandler_PurgeByPath_WithProxyNoCache(t *testing.T) {
|
||||||
// 创建禁用缓存的代理
|
// 创建禁用缓存的代理
|
||||||
cfg := &config.ProxyConfig{
|
cfg := testutil.NewTestProxyConfig("/api")
|
||||||
Path: "/api",
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
LoadBalance: "round_robin",
|
|
||||||
Timeout: config.ProxyTimeout{Connect: 5 * time.Second},
|
|
||||||
// Cache 未启用
|
|
||||||
}
|
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
|
||||||
p, err := proxy.NewProxy(cfg, targets, nil, nil)
|
p, err := proxy.NewProxy(cfg, targets, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewProxy() error: %v", err)
|
t.Fatalf("NewProxy() error: %v", err)
|
||||||
@ -997,12 +992,8 @@ func TestPurgeHandler_PurgeByPath_WithProxyNoCache(t *testing.T) {
|
|||||||
// TestPurgeHandler_PurgeByPattern_WithProxyNoCache 测试代理没有缓存时的情况。
|
// TestPurgeHandler_PurgeByPattern_WithProxyNoCache 测试代理没有缓存时的情况。
|
||||||
func TestPurgeHandler_PurgeByPattern_WithProxyNoCache(t *testing.T) {
|
func TestPurgeHandler_PurgeByPattern_WithProxyNoCache(t *testing.T) {
|
||||||
// 创建禁用缓存的代理
|
// 创建禁用缓存的代理
|
||||||
cfg := &config.ProxyConfig{
|
cfg := testutil.NewTestProxyConfig("/api")
|
||||||
Path: "/api",
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
LoadBalance: "round_robin",
|
|
||||||
Timeout: config.ProxyTimeout{Connect: 5 * time.Second},
|
|
||||||
}
|
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
|
||||||
p, err := proxy.NewProxy(cfg, targets, nil, nil)
|
p, err := proxy.NewProxy(cfg, targets, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewProxy() error: %v", err)
|
t.Fatalf("NewProxy() error: %v", err)
|
||||||
|
|||||||
@ -25,13 +25,13 @@ import (
|
|||||||
|
|
||||||
"github.com/valyala/fasthttp"
|
"github.com/valyala/fasthttp"
|
||||||
"rua.plus/lolly/internal/config"
|
"rua.plus/lolly/internal/config"
|
||||||
"rua.plus/lolly/internal/loadbalance"
|
|
||||||
"rua.plus/lolly/internal/lua"
|
"rua.plus/lolly/internal/lua"
|
||||||
"rua.plus/lolly/internal/matcher"
|
"rua.plus/lolly/internal/matcher"
|
||||||
"rua.plus/lolly/internal/middleware/accesslog"
|
"rua.plus/lolly/internal/middleware/accesslog"
|
||||||
"rua.plus/lolly/internal/middleware/security"
|
"rua.plus/lolly/internal/middleware/security"
|
||||||
"rua.plus/lolly/internal/proxy"
|
"rua.plus/lolly/internal/proxy"
|
||||||
"rua.plus/lolly/internal/ssl"
|
"rua.plus/lolly/internal/ssl"
|
||||||
|
"rua.plus/lolly/internal/testutil"
|
||||||
"rua.plus/lolly/internal/version"
|
"rua.plus/lolly/internal/version"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -1525,7 +1525,7 @@ func TestServer_GetProxyCacheStats_SingleProxyWithCache(t *testing.T) {
|
|||||||
MaxAge: 10 * time.Second,
|
MaxAge: 10 * time.Second,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
p, err := proxy.NewProxy(proxyCfg, targets, nil, nil)
|
p, err := proxy.NewProxy(proxyCfg, targets, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewProxy() error: %v", err)
|
t.Fatalf("NewProxy() error: %v", err)
|
||||||
@ -1555,13 +1555,8 @@ func TestServer_GetProxyCacheStats_SingleProxyNoCache(t *testing.T) {
|
|||||||
s := New(cfg)
|
s := New(cfg)
|
||||||
|
|
||||||
// 创建不带缓存的代理
|
// 创建不带缓存的代理
|
||||||
proxyCfg := &config.ProxyConfig{
|
proxyCfg := testutil.NewTestProxyConfig("/api")
|
||||||
Path: "/api",
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
LoadBalance: "round_robin",
|
|
||||||
Timeout: config.ProxyTimeout{Connect: 5 * time.Second},
|
|
||||||
// Cache 未启用
|
|
||||||
}
|
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
|
||||||
p, err := proxy.NewProxy(proxyCfg, targets, nil, nil)
|
p, err := proxy.NewProxy(proxyCfg, targets, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewProxy() error: %v", err)
|
t.Fatalf("NewProxy() error: %v", err)
|
||||||
@ -1591,7 +1586,7 @@ func TestServer_GetProxyCacheStats_MultipleProxies(t *testing.T) {
|
|||||||
s := New(cfg)
|
s := New(cfg)
|
||||||
|
|
||||||
// 创建多个代理:部分带缓存,部分不带
|
// 创建多个代理:部分带缓存,部分不带
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
|
|
||||||
// 代理1:带缓存
|
// 代理1:带缓存
|
||||||
proxyCfg1 := &config.ProxyConfig{
|
proxyCfg1 := &config.ProxyConfig{
|
||||||
@ -1609,11 +1604,7 @@ func TestServer_GetProxyCacheStats_MultipleProxies(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 代理2:不带缓存
|
// 代理2:不带缓存
|
||||||
proxyCfg2 := &config.ProxyConfig{
|
proxyCfg2 := testutil.NewTestProxyConfig("/static")
|
||||||
Path: "/static",
|
|
||||||
LoadBalance: "round_robin",
|
|
||||||
Timeout: config.ProxyTimeout{Connect: 5 * time.Second},
|
|
||||||
}
|
|
||||||
p2, err := proxy.NewProxy(proxyCfg2, targets, nil, nil)
|
p2, err := proxy.NewProxy(proxyCfg2, targets, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewProxy() error: %v", err)
|
t.Fatalf("NewProxy() error: %v", err)
|
||||||
@ -1657,7 +1648,7 @@ func TestServer_GetProxyCacheStats_AllProxiesWithCache(t *testing.T) {
|
|||||||
|
|
||||||
s := New(cfg)
|
s := New(cfg)
|
||||||
|
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
|
|
||||||
// 创建多个带缓存的代理
|
// 创建多个带缓存的代理
|
||||||
proxies := make([]*proxy.Proxy, 3)
|
proxies := make([]*proxy.Proxy, 3)
|
||||||
@ -1701,16 +1692,12 @@ func TestServer_GetProxyCacheStats_AllProxiesNoCache(t *testing.T) {
|
|||||||
|
|
||||||
s := New(cfg)
|
s := New(cfg)
|
||||||
|
|
||||||
targets := []*loadbalance.Target{{URL: "http://localhost:8080"}}
|
targets := testutil.NewTestTargets("http://localhost:8080")
|
||||||
|
|
||||||
// 创建多个不带缓存的代理
|
// 创建多个不带缓存的代理
|
||||||
proxies := make([]*proxy.Proxy, 3)
|
proxies := make([]*proxy.Proxy, 3)
|
||||||
for i := range 3 {
|
for i := range 3 {
|
||||||
proxyCfg := &config.ProxyConfig{
|
proxyCfg := testutil.NewTestProxyConfig(fmt.Sprintf("/api%d", i))
|
||||||
Path: fmt.Sprintf("/api%d", i),
|
|
||||||
LoadBalance: "round_robin",
|
|
||||||
Timeout: config.ProxyTimeout{Connect: 5 * time.Second},
|
|
||||||
}
|
|
||||||
p, err := proxy.NewProxy(proxyCfg, targets, nil, nil)
|
p, err := proxy.NewProxy(proxyCfg, targets, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewProxy() error: %v", err)
|
t.Fatalf("NewProxy() error: %v", err)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user