重构项目结构,将 orm 和 rds 包迁移到 web/globals
This commit is contained in:
@@ -4,11 +4,11 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"platform/pkg/orm"
|
||||
"platform/pkg/testutil"
|
||||
"platform/web/auth"
|
||||
g "platform/web/globals"
|
||||
"platform/web/globals/orm"
|
||||
"platform/web/models"
|
||||
testutil2 "platform/web/testutil"
|
||||
"reflect"
|
||||
"strings"
|
||||
"testing"
|
||||
@@ -101,7 +101,7 @@ func Test_chKey(t *testing.T) {
|
||||
}
|
||||
|
||||
func Test_cache(t *testing.T) {
|
||||
mr := testutil.SetupRedisTest(t)
|
||||
mr := testutil2.SetupRedisTest(t)
|
||||
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
@@ -202,7 +202,7 @@ func Test_cache(t *testing.T) {
|
||||
}
|
||||
|
||||
func Test_deleteCache(t *testing.T) {
|
||||
mr := testutil.SetupRedisTest(t)
|
||||
mr := testutil2.SetupRedisTest(t)
|
||||
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
@@ -270,10 +270,10 @@ func Test_deleteCache(t *testing.T) {
|
||||
}
|
||||
|
||||
func Test_channelService_CreateChannel(t *testing.T) {
|
||||
mr := testutil.SetupRedisTest(t)
|
||||
db := testutil.SetupDBTest(t)
|
||||
mc := testutil.SetupCloudClientMock(t)
|
||||
mg := testutil.SetupGatewayClientMock(t)
|
||||
mr := testutil2.SetupRedisTest(t)
|
||||
db := testutil2.SetupDBTest(t)
|
||||
mc := testutil2.SetupCloudClientMock(t)
|
||||
mg := testutil2.SetupGatewayClientMock(t)
|
||||
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
@@ -390,7 +390,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
|
||||
return nil
|
||||
}
|
||||
|
||||
mg.PortConfigsMock = func(c *testutil.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
mg.PortConfigsMock = func(c *testutil2.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
if c.Host != proxy.Host {
|
||||
return fmt.Errorf("代理主机不符合预期: %s", c.Host)
|
||||
}
|
||||
@@ -540,7 +540,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
|
||||
return nil
|
||||
}
|
||||
|
||||
mg.PortConfigsMock = func(c *testutil.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
mg.PortConfigsMock = func(c *testutil2.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
if c.Host != proxy.Host {
|
||||
return fmt.Errorf("代理主机不符合预期: %s", c.Host)
|
||||
}
|
||||
@@ -684,7 +684,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
|
||||
return nil
|
||||
}
|
||||
|
||||
mg.PortConfigsMock = func(c *testutil.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
mg.PortConfigsMock = func(c *testutil2.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
if c.Host != proxy.Host {
|
||||
return fmt.Errorf("代理主机不符合预期: %s", c.Host)
|
||||
}
|
||||
@@ -961,10 +961,10 @@ func Test_channelService_CreateChannel(t *testing.T) {
|
||||
}
|
||||
|
||||
func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
mr := testutil.SetupRedisTest(t)
|
||||
md := testutil.SetupDBTest(t)
|
||||
mg := testutil.SetupGatewayClientMock(t)
|
||||
mc := testutil.SetupCloudClientMock(t)
|
||||
mr := testutil2.SetupRedisTest(t)
|
||||
md := testutil2.SetupDBTest(t)
|
||||
mg := testutil2.SetupGatewayClientMock(t)
|
||||
mc := testutil2.SetupCloudClientMock(t)
|
||||
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
@@ -1055,7 +1055,7 @@ func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
}
|
||||
|
||||
// 模拟网关客户端的响应
|
||||
mg.PortActiveMock = func(m *testutil.MockGatewayClient, param ...g.PortActiveReq) (map[string]g.PortData, error) {
|
||||
mg.PortActiveMock = func(m *testutil2.MockGatewayClient, param ...g.PortActiveReq) (map[string]g.PortData, error) {
|
||||
switch {
|
||||
case m.Host == proxy.Host:
|
||||
return map[string]g.PortData{
|
||||
@@ -1069,7 +1069,7 @@ func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
}
|
||||
return nil, fmt.Errorf("代理主机不符合预期: %s", m.Host)
|
||||
}
|
||||
mg.PortConfigsMock = func(m *testutil.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
mg.PortConfigsMock = func(m *testutil2.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
switch {
|
||||
case m.Host == proxy.Host:
|
||||
for _, param := range params {
|
||||
@@ -1104,7 +1104,7 @@ func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
switch {
|
||||
case param.Uuid == proxy.Name:
|
||||
var edges = []string{"edge1", "edge2", "edge4"}
|
||||
if !testutil.SliceEqual(edges, param.Edge) {
|
||||
if !testutil2.SliceEqual(edges, param.Edge) {
|
||||
return 0, fmt.Errorf("边缘节点不符合预期3: %v", param.Edge)
|
||||
}
|
||||
if len(param.Config) != 0 {
|
||||
@@ -1113,7 +1113,7 @@ func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
return len(param.Edge), nil
|
||||
case param.Uuid == proxy2.Name:
|
||||
var edges = []string{"edge3"}
|
||||
if !testutil.SliceEqual(edges, param.Edge) {
|
||||
if !testutil2.SliceEqual(edges, param.Edge) {
|
||||
return 0, fmt.Errorf("边缘节点不符合预期4: %v", param.Edge)
|
||||
}
|
||||
if len(param.Config) != 0 {
|
||||
@@ -1169,7 +1169,7 @@ func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
}
|
||||
|
||||
// 模拟网关客户端的响应
|
||||
mg.PortActiveMock = func(m *testutil.MockGatewayClient, param ...g.PortActiveReq) (map[string]g.PortData, error) {
|
||||
mg.PortActiveMock = func(m *testutil2.MockGatewayClient, param ...g.PortActiveReq) (map[string]g.PortData, error) {
|
||||
switch {
|
||||
case m.Host == proxy.Host:
|
||||
return map[string]g.PortData{
|
||||
@@ -1183,7 +1183,7 @@ func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
}
|
||||
return nil, fmt.Errorf("代理主机不符合预期: %s", m.Host)
|
||||
}
|
||||
mg.PortConfigsMock = func(m *testutil.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
mg.PortConfigsMock = func(m *testutil2.MockGatewayClient, params []g.PortConfigsReq) error {
|
||||
switch {
|
||||
case m.Host == proxy.Host:
|
||||
for _, param := range params {
|
||||
@@ -1218,7 +1218,7 @@ func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
switch {
|
||||
case param.Uuid == proxy.Name:
|
||||
var edges = []string{"edge1", "edge2", "edge4"}
|
||||
if !testutil.SliceEqual(edges, param.Edge) {
|
||||
if !testutil2.SliceEqual(edges, param.Edge) {
|
||||
return 0, fmt.Errorf("边缘节点不符合预期7: %v", param.Edge)
|
||||
}
|
||||
if len(param.Config) != 0 {
|
||||
@@ -1227,7 +1227,7 @@ func Test_channelService_RemoveChannels(t *testing.T) {
|
||||
return len(param.Edge), nil
|
||||
case param.Uuid == proxy2.Name:
|
||||
var edges = []string{"edge3"}
|
||||
if !testutil.SliceEqual(edges, param.Edge) {
|
||||
if !testutil2.SliceEqual(edges, param.Edge) {
|
||||
return 0, fmt.Errorf("边缘节点不符合预期8: %v", param.Edge)
|
||||
}
|
||||
if len(param.Config) != 0 {
|
||||
|
||||
Reference in New Issue
Block a user