add unit tests

LinuxSuRen · LinuxSuRen · commit ef9ce3eab513 · 2025-01-27T14:39:20.000+08:00
diff --git a/cmd/convert_test.go b/cmd/convert_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 API Testing Authors.
+Copyright 2023-2025 API Testing Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"strconv"
 	"testing"
 	"time"
 
@@ -36,7 +37,8 @@ func TestConvert(t *testing.T) {
 	c.SetOut(io.Discard)
 
 	t.Run("normal", func(t *testing.T) {
-		tmpFile := path.Join(os.TempDir(), time.Now().String())
+		now := strconv.Itoa(int(time.Now().Unix()))
+		tmpFile := path.Join(os.TempDir(), now)
 		defer os.RemoveAll(tmpFile)
 
 		c.SetArgs([]string{"convert", "-p=testdata/simple-suite.yaml", "--converter=jmeter", "--target", tmpFile})
diff --git a/cmd/extension_test.go b/cmd/extension_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
@@ -37,7 +38,7 @@ func TestExtensionCmd(t *testing.T) {
 
 	t.Run("normal", func(t *testing.T) {
 		d := downloader.NewStoreDownloader()
-		server := mock.NewInMemoryServer(0)
+		server := mock.NewInMemoryServer(context.Background(), 0)
 
 		err := server.Start(mock.NewLocalFileReader("../pkg/downloader/testdata/registry.yaml"), "/v2")
 		assert.NoError(t, err)
diff --git a/cmd/mock.go b/cmd/mock.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 API Testing Authors.
+Copyright 2024-2025 API Testing Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -53,6 +53,9 @@ func createMockCmd() (c *cobra.Command) {
 func (o *mockOption) runE(c *cobra.Command, args []string) (err error) {
 	reader := mock.NewLocalFileReader(args[0])
 	server := mock.NewInMemoryServer(c.Context(), o.port)
+	if o.metrics {
+		server.EnableMetrics()
+	}
 	if err = server.Start(reader, o.prefix); err != nil {
 		return
 	}
@@ -61,7 +64,6 @@ func (o *mockOption) runE(c *cobra.Command, args []string) (err error) {
 	signal.Notify(clean, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
 	printLocalIPs(c, o.port)
 	if o.metrics {
-		server.EnableMetrics()
 		c.Printf("Metrics available at http://localhost:%d%s/metrics\n", o.port, o.prefix)
 	}
 
diff --git a/cmd/server_test.go b/cmd/server_test.go
@@ -210,7 +210,7 @@ func TestFrontEndHandlerWithLocation(t *testing.T) {
 		resp := newFakeResponseWriter()
 
 		opt.getAtestBinary(resp, req, map[string]string{})
-		assert.Equal(t, `failed to read "atest": open : no such file or directory`, resp.GetBody().String())
+		assert.Contains(t, resp.GetBody().String(), `failed to read "atest"`)
 	})
 }
 
diff --git a/pkg/mock/in_memory.go b/pkg/mock/in_memory.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 API Testing Authors.
+Copyright 2024-2025 API Testing Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -74,6 +74,7 @@ func (s *inMemoryServer) SetupHandler(reader Reader, prefix string) (handler htt
 	s.mux = mux.NewRouter().PathPrefix(prefix).Subrouter()
 	s.prefix = prefix
 	handler = s.mux
+	s.metrics.AddMetricsHandler(s.mux)
 	err = s.Load()
 	return
 }
@@ -109,22 +110,31 @@ func (s *inMemoryServer) Load() (err error) {
 		memLogger.Info("start to proxy", "target", proxy.Target)
 		s.mux.HandleFunc(proxy.Path, func(w http.ResponseWriter, req *http.Request) {
 			api := fmt.Sprintf("%s/%s", proxy.Target, strings.TrimPrefix(req.URL.Path, s.prefix))
+			api, err = render.Render("proxy api", api, s)
+			if err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
+				memLogger.Error(err, "failed to render proxy api")
+				return
+			}
 			memLogger.Info("redirect to", "target", api)
 
 			targetReq, err := http.NewRequestWithContext(req.Context(), req.Method, api, req.Body)
 			if err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
 				memLogger.Error(err, "failed to create proxy request")
 				return
 			}
 
 			resp, err := http.DefaultClient.Do(targetReq)
 			if err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
 				memLogger.Error(err, "failed to do proxy request")
 				return
 			}
 
 			data, err := io.ReadAll(resp.Body)
 			if err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
 				memLogger.Error(err, "failed to read response body")
 				return
 			}
diff --git a/pkg/mock/in_memory_test.go b/pkg/mock/in_memory_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 API Testing Authors.
+Copyright 2024-2025 API Testing Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package mock
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"net/http"
 	"strings"
@@ -27,7 +28,8 @@ import (
 )
 
 func TestInMemoryServer(t *testing.T) {
-	server := NewInMemoryServer(0)
+	server := NewInMemoryServer(context.Background(), 0)
+	server.EnableMetrics()
 
 	err := server.Start(NewLocalFileReader("testdata/api.yaml"), "/mock")
 	assert.NoError(t, err)
@@ -165,28 +167,28 @@ func TestInMemoryServer(t *testing.T) {
 	})
 
 	t.Run("not found config file", func(t *testing.T) {
-		server := NewInMemoryServer(0)
+		server := NewInMemoryServer(context.Background(), 0)
 		err := server.Start(NewLocalFileReader("fake"), "/")
 		assert.Error(t, err)
 	})
 
 	t.Run("invalid webhook", func(t *testing.T) {
-		server := NewInMemoryServer(0)
+		server := NewInMemoryServer(context.Background(), 0)
 		err := server.Start(NewInMemoryReader(`webhooks:
   - timer: aa
     name: fake`), "/")
 		assert.Error(t, err)
 	})
 
 	t.Run("missing name or timer in webhook", func(t *testing.T) {
-		server := NewInMemoryServer(0)
+		server := NewInMemoryServer(context.Background(), 0)
 		err := server.Start(NewInMemoryReader(`webhooks:
   - timer: 1s`), "/")
 		assert.Error(t, err)
 	})
 
 	t.Run("invalid webhook payload", func(t *testing.T) {
-		server := NewInMemoryServer(0)
+		server := NewInMemoryServer(context.Background(), 0)
 		err := server.Start(NewInMemoryReader(`webhooks:
   - name: invalid
     timer: 1ms
@@ -196,7 +198,7 @@ func TestInMemoryServer(t *testing.T) {
 	})
 
 	t.Run("invalid webhook api template", func(t *testing.T) {
-		server := NewInMemoryServer(0)
+		server := NewInMemoryServer(context.Background(), 0)
 		err := server.Start(NewInMemoryReader(`webhooks:
   - name: invalid
     timer: 1ms
@@ -205,4 +207,20 @@ func TestInMemoryServer(t *testing.T) {
       path: "{{.fake"`), "/")
 		assert.NoError(t, err)
 	})
+
+	t.Run("proxy", func(t *testing.T) {
+		resp, err = http.Get(api + "/v1/myProjects")
+		assert.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+
+		resp, err = http.Get(api + "/v1/invalid-template")
+		assert.NoError(t, err)
+		assert.Equal(t, http.StatusInternalServerError, resp.StatusCode)
+	})
+
+	t.Run("metrics", func(t *testing.T) {
+		resp, err = http.Get(api + "/metrics")
+		assert.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+	})
 }
diff --git a/pkg/mock/metrics.go b/pkg/mock/metrics.go
@@ -16,10 +16,16 @@ limitations under the License.
 package mock
 
 import (
+	"encoding/json"
 	"net/http"
 	"sync"
+	"time"
+
+	"github.com/gorilla/mux"
 )
 
+var _ RequestMetrics = &NoopMetrics{}
+
 // NoopMetrics implements RequestMetrics but does nothing
 type NoopMetrics struct{}
 
@@ -32,56 +38,69 @@ func NewNoopMetrics() *NoopMetrics {
 func (m *NoopMetrics) RecordRequest(path string) {}
 
 // GetMetrics implements RequestMetrics but returns empty map
-func (m *NoopMetrics) GetMetrics() map[string]int {
-	return make(map[string]int)
+func (m *NoopMetrics) GetMetrics() MetricData {
+	return MetricData{}
 }
 
 // AddMetricsHandler implements RequestMetrics but does nothing
-func (m *NoopMetrics) AddMetricsHandler(mux *http.ServeMux, prefix string) {}
+func (m *NoopMetrics) AddMetricsHandler(mux MetricsHandler) {}
+
+type MetricsHandler interface {
+	HandleFunc(path string, f func(http.ResponseWriter, *http.Request)) *mux.Route
+}
+
+type MetricData struct {
+	FirstRequestTime time.Time
+	LastRequestTime  time.Time
+	Requests         map[string]int
+}
 
 // RequestMetrics represents an interface for collecting request metrics
 type RequestMetrics interface {
 	RecordRequest(path string)
-	GetMetrics() map[string]int
-	AddMetricsHandler(mux *http.ServeMux, prefix string)
+	GetMetrics() MetricData
+	AddMetricsHandler(MetricsHandler)
 }
 
+var _ RequestMetrics = &InMemoryMetrics{}
+
 // InMemoryMetrics implements RequestMetrics with in-memory storage
 type InMemoryMetrics struct {
-	requests map[string]int
-	mu       sync.RWMutex
+	MetricData
+	mu sync.RWMutex
 }
 
 // NewInMemoryMetrics creates a new InMemoryMetrics instance
 func NewInMemoryMetrics() *InMemoryMetrics {
 	return &InMemoryMetrics{
-		requests: make(map[string]int),
+		MetricData: MetricData{
+			Requests: make(map[string]int),
+		},
 	}
 }
 
 // RecordRequest records a request for the given path
 func (m *InMemoryMetrics) RecordRequest(path string) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	m.requests[path]++
+	m.Requests[path]++
+	if m.FirstRequestTime.IsZero() {
+		m.FirstRequestTime = time.Now()
+	}
+	m.LastRequestTime = time.Now()
 }
 
 // GetMetrics returns a copy of the current metrics
-func (m *InMemoryMetrics) GetMetrics() map[string]int {
+func (m *InMemoryMetrics) GetMetrics() MetricData {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
-
-	// Return a copy to avoid map races
-	result := make(map[string]int)
-	for k, v := range m.requests {
-		result[k] = v
-	}
-	return result
+	return m.MetricData
 }
 
-func (m *InMemoryMetrics) AddMetricsHandler(mux *http.ServeMux, prefix string) {
+func (m *InMemoryMetrics) AddMetricsHandler(mux MetricsHandler) {
 	// Add metrics endpoint
-	mux.HandleFunc(prefix+"/metrics", func(w http.ResponseWriter, r *http.Request) {
-		// metrics handling code
+	mux.HandleFunc("/metrics", func(w http.ResponseWriter, r *http.Request) {
+		metrics := m.GetMetrics()
+		_ = json.NewEncoder(w).Encode(metrics)
 	})
 }
diff --git a/pkg/mock/testdata/api.yaml b/pkg/mock/testdata/api.yaml
@@ -49,6 +49,11 @@ items:
             "status": "success"
           }]
         }
+proxies:
+  - path: /v1/myProjects
+    target: http://localhost:{{.GetPort}}
+  - path: /v1/invalid-template
+    target: http://localhost:{{.GetPort}
 webhooks:
   - timer: 1ms
     name: baidu

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ func TestFrontEndHandlerWithLocation(t *testing.T) {`
`210`	`210`	`resp := newFakeResponseWriter()`
`211`	`211`
`212`	`212`	`opt.getAtestBinary(resp, req, map[string]string{})`
`213`		- assert.Equal(t, `failed to read "atest": open : no such file or directory`, resp.GetBody().String())
	`213`	+ assert.Contains(t, resp.GetBody().String(), `failed to read "atest"`)
`214`	`214`	`})`
`215`	`215`	`}`
`216`	`216`