unistack-org/micro-tests
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update all deps to latest versions

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2021-01-29 16:47:26 +03:00
parent 3876ba5705
commit ac192b7ef5
21 changed files with 338 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/router/registry_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/unistack-org/micro/v3/registry"
"github.com/unistack-org/micro/v3/register"
)
func TestStoreRegex(t *testing.T) {
@@ -15,11 +15,11 @@ func TestStoreRegex(t *testing.T) {
if err != nil {
t.Fatal(err)
}
router.store([]*registry.Service{
router.store([]*register.Service{
{
Name: "Foobar",
Version: "latest",
Endpoints: []*registry.Endpoint{
Endpoints: []*register.Endpoint{
{
Name: "foo",
Metadata: map[string]string{

32
api/router/router_test.go
View File

@@ -12,14 +12,14 @@ import (
"time"
rpc "github.com/unistack-org/micro-api-handler-rpc/v3"
rregistry "github.com/unistack-org/micro-api-router-registry/v3"
rregister "github.com/unistack-org/micro-api-router-register/v3"
rstatic "github.com/unistack-org/micro-api-router-static/v3"
bmemory "github.com/unistack-org/micro-broker-memory/v3"
gcli "github.com/unistack-org/micro-client-grpc/v3"
jsoncodec "github.com/unistack-org/micro-codec-json/v3"
protocodec "github.com/unistack-org/micro-codec-proto/v3"
rmemory "github.com/unistack-org/micro-registry-memory/v3"
regRouter "github.com/unistack-org/micro-router-registry/v3"
rmemory "github.com/unistack-org/micro-register-memory/v3"
regRouter "github.com/unistack-org/micro-router-register/v3"
gsrv "github.com/unistack-org/micro-server-grpc/v3"
pb "github.com/unistack-org/micro-tests/server/grpc/proto"
"github.com/unistack-org/micro/v3/api"
@@ -48,12 +48,12 @@ func (s *testServer) Call(ctx context.Context, req *pb.Request, rsp *pb.Response
func initial(t *testing.T) (server.Server, client.Client) {
//logger.DefaultLogger = logger.NewLogger(logger.WithLevel(logger.TraceLevel))
r := rmemory.NewRegistry()
r := rmemory.NewRegister()
if err := r.Init(); err != nil {
t.Fatal(err)
}
b := bmemory.NewBroker(broker.Registry(r))
b := bmemory.NewBroker(broker.Register(r))
if err := b.Init(); err != nil {
t.Fatal(err)
}
@@ -65,12 +65,12 @@ func initial(t *testing.T) (server.Server, client.Client) {
server.Codec("application/json", jsoncodec.NewCodec()),
server.Name("foo"),
server.Broker(b),
server.Registry(r),
server.Register(r),
server.RegisterInterval(1*time.Second),
)
rtr := regRouter.NewRouter(
rt.Registry(r),
rt.Register(r),
)
if err := rtr.Init(); err != nil {
@@ -82,7 +82,7 @@ func initial(t *testing.T) (server.Server, client.Client) {
client.Codec("application/grpc+proto", protocodec.NewCodec()),
client.Codec("application/grpc+json", protocodec.NewCodec()),
client.Codec("application/json", jsoncodec.NewCodec()),
client.Registry(r),
client.Register(r),
client.Router(rtr),
client.Broker(b),
)
@@ -134,9 +134,9 @@ func TestApiTimeout(t *testing.T) {
s, c := initial(t)
defer s.Stop()
router := rregistry.NewRouter(
router := rregister.NewRouter(
router.WithHandler(rpc.Handler),
router.WithRegistry(s.Options().Registry),
router.WithRegister(s.Options().Register),
)
if err := router.Init(); err != nil {
t.Fatal(err)
@@ -164,13 +164,13 @@ func TestApiTimeout(t *testing.T) {
check(t, hsrv.Addr, "http://%s/api/v0/test/call/TEST", `{"Id":"go.micro.client","Code":408,"Detail":"context deadline exceeded","Status":"Request Timeout"}`, true)
}
func TestRouterRegistryPcre(t *testing.T) {
func TestRouterRegisterPcre(t *testing.T) {
s, c := initial(t)
defer s.Stop()
router := rregistry.NewRouter(
router := rregister.NewRouter(
router.WithHandler(rpc.Handler),
router.WithRegistry(s.Options().Registry),
router.WithRegister(s.Options().Register),
)
if err := router.Init(); err != nil {
t.Fatal(err)
@@ -204,7 +204,7 @@ func TestRouterStaticPcre(t *testing.T) {
router := rstatic.NewRouter(
router.WithHandler(rpc.Handler),
router.WithRegistry(s.Options().Registry),
router.WithRegister(s.Options().Register),
)
if err := router.Init(); err != nil {
t.Fatal(err)
@@ -248,7 +248,7 @@ func TestRouterStaticGpath(t *testing.T) {
router := rstatic.NewRouter(
router.WithHandler(rpc.Handler),
router.WithRegistry(s.Options().Registry),
router.WithRegister(s.Options().Register),
)
err := router.Register(&api.Endpoint{
@@ -292,7 +292,7 @@ func TestRouterStaticPcreInvalid(t *testing.T) {
router := rstatic.NewRouter(
router.WithHandler(rpc.Handler),
router.WithRegistry(s.Options().Registry),
router.WithRegister(s.Options().Register),
)
ep = &api.Endpoint{