mirror of
https://github.com/go-kratos/kratos.git
synced 2025-11-06 08:59:18 +02:00
test:remove testify go mod (#1766)
* test:remove testify go mod * tidy go mdo * fix test
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"reflect"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -12,7 +13,6 @@ import (
|
||||
|
||||
"github.com/go-kratos/kratos/v2/middleware"
|
||||
"github.com/go-kratos/kratos/v2/transport"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
type headerCarrier http.Header
|
||||
@@ -145,11 +145,17 @@ func TestServer(t *testing.T) {
|
||||
})(next)
|
||||
}
|
||||
_, err2 := server(test.ctx, test.name)
|
||||
assert.Equal(t, test.exceptErr, err2)
|
||||
if !errors.Is(test.exceptErr, err2) {
|
||||
t.Errorf("except error %v, but got %v", test.exceptErr, err2)
|
||||
}
|
||||
if test.exceptErr == nil {
|
||||
assert.NotNil(t, testToken)
|
||||
if testToken == nil {
|
||||
t.Errorf("except testToken not nil, but got nil")
|
||||
}
|
||||
_, ok := testToken.(jwt.MapClaims)
|
||||
assert.True(t, ok)
|
||||
if !ok {
|
||||
t.Errorf("except testToken is jwt.MapClaims, but got %T", testToken)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -189,9 +195,13 @@ func TestClient(t *testing.T) {
|
||||
handler := Client(test.tokenProvider)(next)
|
||||
header := &headerCarrier{}
|
||||
_, err2 := handler(transport.NewClientContext(context.Background(), &Transport{reqHeader: header}), "ok")
|
||||
assert.Equal(t, test.expectError, err2)
|
||||
if !errors.Is(test.expectError, err2) {
|
||||
t.Errorf("except error %v, but got %v", test.expectError, err2)
|
||||
}
|
||||
if err2 == nil {
|
||||
assert.Equal(t, fmt.Sprintf(bearerFormat, token), header.Get(authorizationKey))
|
||||
if !reflect.DeepEqual(header.Get(authorizationKey), fmt.Sprintf(bearerFormat, token)) {
|
||||
t.Errorf("except header %s, but got %s", fmt.Sprintf(bearerFormat, token), header.Get(authorizationKey))
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -217,7 +227,9 @@ func TestTokenExpire(t *testing.T) {
|
||||
return []byte(testKey), nil
|
||||
}, WithSigningMethod(jwt.SigningMethodHS256))(next)
|
||||
_, err2 := server(ctx, "test expire token")
|
||||
assert.Equal(t, ErrTokenExpired, err2)
|
||||
if !errors.Is(ErrTokenExpired, err2) {
|
||||
t.Errorf("except error %v, but got %v", ErrTokenExpired, err2)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMissingKeyFunc(t *testing.T) {
|
||||
@@ -252,9 +264,13 @@ func TestMissingKeyFunc(t *testing.T) {
|
||||
}
|
||||
server := Server(nil)(next)
|
||||
_, err2 := server(test.ctx, test.name)
|
||||
assert.Equal(t, test.exceptErr, err2)
|
||||
if !errors.Is(test.exceptErr, err2) {
|
||||
t.Errorf("except error %v, but got %v", test.exceptErr, err2)
|
||||
}
|
||||
if test.exceptErr == nil {
|
||||
assert.NotNil(t, testToken)
|
||||
if testToken == nil {
|
||||
t.Errorf("except testToken not nil, but got nil")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -287,9 +303,13 @@ func TestClientWithClaims(t *testing.T) {
|
||||
handler := Client(test.tokenProvider, WithClaims(mapClaims))(next)
|
||||
header := &headerCarrier{}
|
||||
_, err2 := handler(transport.NewClientContext(context.Background(), &Transport{reqHeader: header}), "ok")
|
||||
assert.Equal(t, test.expectError, err2)
|
||||
if !errors.Is(test.expectError, err2) {
|
||||
t.Errorf("except error %v, but got %v", test.expectError, err2)
|
||||
}
|
||||
if err2 == nil {
|
||||
assert.Equal(t, fmt.Sprintf(bearerFormat, token), header.Get(authorizationKey))
|
||||
if !reflect.DeepEqual(header.Get(authorizationKey), fmt.Sprintf(bearerFormat, token)) {
|
||||
t.Errorf("except header %s, but got %s", fmt.Sprintf(bearerFormat, token), header.Get(authorizationKey))
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -318,8 +338,12 @@ func TestClientWithHeader(t *testing.T) {
|
||||
handler := Client(tProvider, WithClaims(mapClaims), WithTokenHeader(tokenHeader))(next)
|
||||
header := &headerCarrier{}
|
||||
_, err2 := handler(transport.NewClientContext(context.Background(), &Transport{reqHeader: header}), "ok")
|
||||
assert.Equal(t, nil, err2)
|
||||
assert.Equal(t, fmt.Sprintf(bearerFormat, token), header.Get(authorizationKey))
|
||||
if err2 != nil {
|
||||
t.Errorf("except error nil, but got %v", err2)
|
||||
}
|
||||
if !reflect.DeepEqual(header.Get(authorizationKey), fmt.Sprintf(bearerFormat, token)) {
|
||||
t.Errorf("except header %s, but got %s", fmt.Sprintf(bearerFormat, token), header.Get(authorizationKey))
|
||||
}
|
||||
}
|
||||
|
||||
func TestClientMissKey(t *testing.T) {
|
||||
@@ -351,9 +375,13 @@ func TestClientMissKey(t *testing.T) {
|
||||
handler := Client(test.tokenProvider, WithClaims(mapClaims))(next)
|
||||
header := &headerCarrier{}
|
||||
_, err2 := handler(transport.NewClientContext(context.Background(), &Transport{reqHeader: header}), "ok")
|
||||
assert.Equal(t, test.expectError, err2)
|
||||
if !errors.Is(test.expectError, err2) {
|
||||
t.Errorf("except error %v, but got %v", test.expectError, err2)
|
||||
}
|
||||
if err2 == nil {
|
||||
assert.Equal(t, fmt.Sprintf(bearerFormat, token), header.Get(authorizationKey))
|
||||
if !reflect.DeepEqual(header.Get(authorizationKey), fmt.Sprintf(bearerFormat, token)) {
|
||||
t.Errorf("except header %s, but got %s", fmt.Sprintf(bearerFormat, token), header.Get(authorizationKey))
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -3,8 +3,6 @@ package metrics
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestMetrics(t *testing.T) {
|
||||
@@ -12,8 +10,12 @@ func TestMetrics(t *testing.T) {
|
||||
return req.(string) + "https://go-kratos.dev", nil
|
||||
}
|
||||
_, err := Server()(next)(context.Background(), "test:")
|
||||
assert.Equal(t, err, nil)
|
||||
if err != nil {
|
||||
t.Errorf("expect %v, got %v", nil, err)
|
||||
}
|
||||
|
||||
_, err = Client()(next)(context.Background(), "test:")
|
||||
assert.Equal(t, err, nil)
|
||||
if err != nil {
|
||||
t.Errorf("expect %v, got %v", nil, err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,9 +3,8 @@ package middleware
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
var i int
|
||||
@@ -18,9 +17,15 @@ func TestChain(t *testing.T) {
|
||||
}
|
||||
|
||||
got, err := Chain(test1Middleware, test2Middleware, test3Middleware)(next)(context.Background(), "hello kratos!")
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, got, "reply")
|
||||
assert.Equal(t, i, 16)
|
||||
if err != nil {
|
||||
t.Errorf("expect %v, got %v", nil, err)
|
||||
}
|
||||
if !reflect.DeepEqual(got, "reply") {
|
||||
t.Errorf("expect %v, got %v", "reply", got)
|
||||
}
|
||||
if !reflect.DeepEqual(i, 16) {
|
||||
t.Errorf("expect %v, got %v", 16, i)
|
||||
}
|
||||
}
|
||||
|
||||
func test1Middleware(handler Handler) Handler {
|
||||
|
||||
@@ -3,12 +3,12 @@ package selector
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"reflect"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/go-kratos/kratos/v2/middleware"
|
||||
"github.com/go-kratos/kratos/v2/transport"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
var _ transport.Transporter = &Transport{}
|
||||
@@ -167,8 +167,12 @@ func TestFunc(t *testing.T) {
|
||||
return false
|
||||
}).Build()(next)
|
||||
reply, err := next(test.ctx, test.name)
|
||||
assert.Equal(t, reply, "reply")
|
||||
assert.Nil(t, err)
|
||||
if err != nil {
|
||||
t.Errorf("expect error is nil, but got %v", err)
|
||||
}
|
||||
if !reflect.DeepEqual(reply, "reply") {
|
||||
t.Errorf("expect reply is reply,but got %v", reply)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -227,8 +231,12 @@ func TestHeaderFunc(t *testing.T) {
|
||||
return false
|
||||
}).Build()(next)
|
||||
reply, err := next(test.ctx, test.name)
|
||||
assert.Equal(t, reply, "reply")
|
||||
assert.Nil(t, err)
|
||||
if err != nil {
|
||||
t.Errorf("expect error is nil, but got %v", err)
|
||||
}
|
||||
if !reflect.DeepEqual(reply, "reply") {
|
||||
t.Errorf("expect reply is reply,but got %v", reply)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,12 +2,12 @@ package tracing
|
||||
|
||||
import (
|
||||
"context"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/go-kratos/kratos/v2"
|
||||
"github.com/go-kratos/kratos/v2/metadata"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"go.opentelemetry.io/otel/propagation"
|
||||
)
|
||||
|
||||
@@ -77,13 +77,19 @@ func TestMetadata_Extract(t *testing.T) {
|
||||
b := Metadata{}
|
||||
ctx := b.Extract(tt.args.parent, tt.args.carrier)
|
||||
md, ok := metadata.FromServerContext(ctx)
|
||||
assert.Equal(t, ok, true)
|
||||
assert.Equal(t, md.Get(serviceHeader), tt.want)
|
||||
if !ok {
|
||||
t.Errorf("expect %v, got %v", true, ok)
|
||||
}
|
||||
if !reflect.DeepEqual(md.Get(serviceHeader), tt.want) {
|
||||
t.Errorf("expect %v, got %v", tt.want, md.Get(serviceHeader))
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestFields(t *testing.T) {
|
||||
b := Metadata{}
|
||||
assert.Equal(t, b.Fields(), []string{"x-md-service-name"})
|
||||
if !reflect.DeepEqual(b.Fields(), []string{"x-md-service-name"}) {
|
||||
t.Errorf("expect %v, got %v", []string{"x-md-service-name"}, b.Fields())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,11 +4,11 @@ import (
|
||||
"context"
|
||||
"net/http"
|
||||
"os"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/go-kratos/kratos/v2/log"
|
||||
"github.com/go-kratos/kratos/v2/transport"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"go.opentelemetry.io/otel/propagation"
|
||||
tracesdk "go.opentelemetry.io/otel/sdk/trace"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
@@ -127,19 +127,33 @@ func TestServer(t *testing.T) {
|
||||
)(next)(ctx, "test server: ")
|
||||
|
||||
span.End()
|
||||
assert.NoError(t, err)
|
||||
assert.NotEmpty(t, childSpanID)
|
||||
assert.NotEqual(t, span.SpanContext().SpanID().String(), childSpanID)
|
||||
assert.Equal(t, span.SpanContext().TraceID().String(), childTraceID)
|
||||
if err != nil {
|
||||
t.Errorf("expected nil, got %v", err)
|
||||
}
|
||||
if childSpanID == "" {
|
||||
t.Errorf("expected empty, got %v", childSpanID)
|
||||
}
|
||||
if reflect.DeepEqual(span.SpanContext().SpanID().String(), childSpanID) {
|
||||
t.Errorf("span.SpanContext().SpanID().String()(%v) is not equal to childSpanID(%v)", span.SpanContext().SpanID().String(), childSpanID)
|
||||
}
|
||||
if !reflect.DeepEqual(span.SpanContext().TraceID().String(), childTraceID) {
|
||||
t.Errorf("expected %v, got %v", childTraceID, span.SpanContext().TraceID().String())
|
||||
}
|
||||
|
||||
_, err = Server(
|
||||
WithTracerProvider(tracesdk.NewTracerProvider()),
|
||||
WithPropagator(propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{})),
|
||||
)(next)(context.Background(), "test server: ")
|
||||
|
||||
assert.NoError(t, err)
|
||||
assert.Empty(t, childSpanID)
|
||||
assert.Empty(t, childTraceID)
|
||||
if err != nil {
|
||||
t.Errorf("expected error, got nil")
|
||||
}
|
||||
if childSpanID != "" {
|
||||
t.Errorf("expected empty, got %v", childSpanID)
|
||||
}
|
||||
if childTraceID != "" {
|
||||
t.Errorf("expected empty, got %v", childTraceID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestClient(t *testing.T) {
|
||||
@@ -185,8 +199,16 @@ func TestClient(t *testing.T) {
|
||||
)(next)(ctx, "test client: ")
|
||||
|
||||
span.End()
|
||||
assert.NoError(t, err)
|
||||
assert.NotEmpty(t, childSpanID)
|
||||
assert.NotEqual(t, span.SpanContext().SpanID().String(), childSpanID)
|
||||
assert.Equal(t, span.SpanContext().TraceID().String(), childTraceID)
|
||||
if err != nil {
|
||||
t.Errorf("expected nil, got %v", err)
|
||||
}
|
||||
if childSpanID == "" {
|
||||
t.Errorf("expected empty, got %v", childSpanID)
|
||||
}
|
||||
if reflect.DeepEqual(span.SpanContext().SpanID().String(), childSpanID) {
|
||||
t.Errorf("span.SpanContext().SpanID().String()(%v) is not equal to childSpanID(%v)", span.SpanContext().SpanID().String(), childSpanID)
|
||||
}
|
||||
if !reflect.DeepEqual(span.SpanContext().TraceID().String(), childTraceID) {
|
||||
t.Errorf("expected %v, got %v", childTraceID, span.SpanContext().TraceID().String())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user