From 8d1202fdc5a69d4c3e3128ea20f8dff1c0b16d02 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 5 Dec 2024 15:02:20 +0100
Subject: [PATCH] fixed test
---
internal/server/grpc_router.go | 2 +-
internal/server/middleware_test.go | 34 +++++++++++++++++-------------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/internal/server/grpc_router.go b/internal/server/grpc_router.go
index 5df67e5..35e9a7e 100644
--- a/internal/server/grpc_router.go
+++ b/internal/server/grpc_router.go
@@ -95,7 +95,7 @@ func createRueckfrageClient(grpcAddress string) (pb.AntragraumServiceClient, fun
target := GetGrpcServerUrl(grpcAddress, conf)
conn, err := grpc.NewClient(target, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
- log.WithError(err).Error("rueckfrage router failed to route: %v", err)
+ log.WithError(err).Error(fmt.Sprintf("rueckfrage router failed to route: %v", err))
return nil, nil, errors.New("rueckfrage router failed to route")
}
diff --git a/internal/server/middleware_test.go b/internal/server/middleware_test.go
index 3a7c158..ec965f6 100644
--- a/internal/server/middleware_test.go
+++ b/internal/server/middleware_test.go
@@ -31,46 +31,50 @@ import (
"github.com/stretchr/testify/assert"
"net/http"
"testing"
+ "log"
+ "github.com/sirupsen/logrus"
+ "go.elastic.co/ecslogrus"
)
func TestRequestLoggingMiddleware(t *testing.T) {
+ logger := logrus.New()
+ logger.SetFormatter(&ecslogrus.Formatter{})
+ log.SetOutput(logger.Writer())
+
t.Run("should log request", func(t *testing.T) {
+ logger.SetLevel(logrus.DebugLevel)
mock.SetUpGrpcServer()
SetUpGrpcRouter()
SetUpHttpGateway()
- var buf bytes.Buffer
- logger.BaseLogger.SetOutput(&buf)
-
- originalFlags := logger.BaseLogger.Flags()
- defer func() {
- logger.BaseLogger.SetOutput(nil)
- logger.BaseLogger.SetFlags(originalFlags)
- }()
-
jsonData := []byte(`{"postfachId": "testPostfachId"}`)
req, _ := http.NewRequest("POST", "http://localhost:8082/api/v1/rueckfragen", bytes.NewBuffer(jsonData))
req.Header.Set(GrpcAddressHeader, "localhost")
+ var buf bytes.Buffer
+ log.SetOutput(&buf)
+
+ defer func() {
+ log.SetOutput(nil)
+ }()
+
client := &http.Client{}
client.Do(req)
logOutput := buf.String()
- assert.Contains(t, logOutput, "received POST request for /api/v1/rueckfragen with body: {\"postfachId\": \"testPostfachId\"}")
- assert.Contains(t, logOutput, "successfully handled POST request for /api/v1/rueckfragen with body: {\"postfachId\": \"testPostfachId\"}")
+ assert.Contains(t, "successfully handled POST request for /api/v1/rueckfragen with body: {\"postfachId\": \"testPostfachId\"}", logOutput)
})
t.Run("should not log request", func(t *testing.T) {
+ logger.SetLevel(logrus.InfoLevel)
mock.SetUpGrpcServer()
SetUpHttpGateway()
var buf bytes.Buffer
- logger.BaseLogger.SetOutput(&buf)
+ log.SetOutput(&buf)
- originalFlags := logger.BaseLogger.Flags()
defer func() {
- logger.BaseLogger.SetOutput(nil)
- logger.BaseLogger.SetFlags(originalFlags)
+ log.SetOutput(nil)
}()
http.Get("http://localhost:8082/")
--
GitLab