Merge pull request #706 from marle3003/develop

Develop

Author: marle3003

acceptance/acceptance_test.go

@@ -1,11 +1,13 @@
 package acceptance
 
 import (
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
+	"io"
 	"mokapi/config/static"
 	"testing"
-	"time"
+
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestAcceptance(t *testing.T) {
@@ -21,15 +23,12 @@ type BaseSuite struct {
 }
 
 func (suite *BaseSuite) initCmd(cfg *static.Config) {
-	//logrus.SetOutput(io.Discard)
+	logrus.SetOutput(io.Discard)
 
 	suite.cfg = cfg
 	cmd, err := Start(cfg)
 	require.NoError(suite.T(), err)
 	suite.cmd = cmd
-
-	// wait for server start
-	time.Sleep(2 * time.Second)
 }
 
 func (suite *BaseSuite) TearDownSuite() {

acceptance/cmd_test.go

@@ -16,6 +16,7 @@ import (
 	"mokapi/providers/swagger"
 	"mokapi/runtime"
 	"mokapi/safe"
+	"mokapi/schema/json/generator"
 	"mokapi/server"
 	"mokapi/server/cert"
 	"mokapi/version"
@@ -28,7 +29,6 @@ type Cmd struct {
 	App *runtime.App
 
 	server *server.Server
-	cancel context.CancelFunc
 }
 
 func Start(cfg *static.Config) (*Cmd, error) {
@@ -42,6 +42,7 @@ func Start(cfg *static.Config) (*Cmd, error) {
 
 	registerDynamicTypes()
 	app := runtime.New(cfg)
+	generator.SetConfig(cfg.DataGen)
 
 	watcher := server.NewConfigWatcher(cfg)
 
@@ -77,19 +78,21 @@ func Start(cfg *static.Config) (*Cmd, error) {
 	}
 
 	pool := safe.NewPool(context.Background())
-	ctx, cancel := context.WithCancel(context.Background())
 	s := server.NewServer(pool, app, watcher, kafka, http, mailManager, ldap, scriptEngine)
-	s.StartAsync(ctx)
+	go func() {
+		err := s.Start()
+		if err != nil {
+			panic(err)
+		}
+	}()
 
 	return &Cmd{
 		App:    app,
 		server: s,
-		cancel: cancel,
 	}, nil
 }
 
 func (cmd *Cmd) Stop() {
-	cmd.cancel()
 	cmd.server.Close()
 }
 

acceptance/ldap_test.go

@@ -18,6 +18,8 @@ type LdapSuite struct {
 
 func (suite *LdapSuite) SetupSuite() {
 	cfg := static.NewConfig()
+	port := try.GetFreePort()
+	cfg.Api.Port = fmt.Sprintf("%v", port)
 	cfg.Providers.File.Directories = []string{"./ldap"}
 	suite.initCmd(cfg)
 	// ensure scripts are executed
@@ -29,6 +31,7 @@ func (suite *LdapSuite) SetupSuite() {
 
 func (suite *LdapSuite) TearDownSuite() {
 	suite.Client.Close()
+	suite.BaseSuite.TearDownSuite()
 }
 
 func (suite *LdapSuite) AfterTest(_, _ string) {

acceptance/mail_test.go

@@ -4,7 +4,6 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"github.com/stretchr/testify/require"
 	"mokapi/config/static"
 	"mokapi/server/cert"
 	"mokapi/smtp/smtptest"
@@ -14,6 +13,10 @@ import (
 	"os"
 	"path"
 	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type MailSuite struct{ BaseSuite }
@@ -161,10 +164,10 @@ func (suite *MailSuite) TestSearch() {
 		try.AssertBody(func(t *testing.T, body string) {
 			var data map[string]any
 			err := json.Unmarshal([]byte(body), &data)
-			require.NoError(t, err)
-			require.NotNil(t, data)
+			assert.NoError(t, err)
+			assert.NotNil(t, data)
 
-			require.Equal(t, float64(5), data["total"])
+			assert.Equal(t, float64(5), data["total"])
 		}),
 	)
 }
@@ -220,15 +223,15 @@ It can be any text data.
 		try.AssertBody(func(t *testing.T, body string) {
 			var v any
 			err = json.Unmarshal([]byte(body), &v)
-			require.NoError(suite.T(), err)
+			assert.NoError(suite.T(), err)
 			a := v.([]any)
 			m := a[0].(map[string]any)
-			require.Len(t, m, 5)
-			require.NotEmpty(t, m["messageId"])
-			require.NotEmpty(t, m["date"])
-			require.Equal(t, []any{map[string]any{"address": "[email protected]"}}, m["from"])
-			require.Equal(t, []any{map[string]any{"address": "[email protected]"}}, m["to"])
-			require.Equal(t, "Example multipart/mixed message", m["subject"])
+			assert.Len(t, m, 5)
+			assert.NotEmpty(t, m["messageId"])
+			assert.NotEmpty(t, m["date"])
+			assert.Equal(t, []any{map[string]any{"address": "[email protected]"}}, m["from"])
+			assert.Equal(t, []any{map[string]any{"address": "[email protected]"}}, m["to"])
+			assert.Equal(t, "Example multipart/mixed message", m["subject"])
 			messageId = m["messageId"].(string)
 		}),
 	)
@@ -237,38 +240,46 @@ It can be any text data.
 		try.AssertBody(func(t *testing.T, body string) {
 			var v any
 			err = json.Unmarshal([]byte(body), &v)
-			require.NoError(suite.T(), err)
+			assert.NoError(suite.T(), err)
 			m := v.(map[string]any)
 			m = m["data"].(map[string]any)
-			require.Len(t, m, 10)
-			require.Regexp(t, ".*:8030", m["server"])
-			require.Equal(t, []any{map[string]any{"address": "[email protected]"}}, m["from"])
-			require.Equal(t, []any{map[string]any{"address": "[email protected]"}}, m["to"])
-			require.Equal(t, []any{
+			assert.Len(t, m, 10)
+			assert.Regexp(t, ".*:8030", m["server"])
+			assert.Equal(t, []any{map[string]any{"address": "[email protected]"}}, m["from"])
+			assert.Equal(t, []any{map[string]any{"address": "[email protected]"}}, m["to"])
+			assert.Equal(t, []any{
 				map[string]any{
 					"contentType": "text/plain",
 					"name":        "example.txt",
 					"size":        float64(64),
 				},
 			}, m["attachments"])
-			require.NotContains(t, m, "sender")
-			require.NotContains(t, m, "replyTo")
-			require.NotContains(t, m, "cc")
-			require.NotContains(t, m, "bcc")
-			require.NotEmpty(t, m["messageId"])
-			require.NotContains(t, m, "inReplyTo")
-			require.NotEmpty(t, m["date"])
-			require.Equal(t, "Example multipart/mixed message", m["subject"])
-			require.Equal(t, "text/plain; charset=\"UTF-8\"", m["contentType"])
-			require.NotContains(t, m, "contentTransferEncoding")
-			require.Equal(t, "Hello Bob,\n\nThis is the plain text part of the email.\n", m["body"])
-			require.Greater(t, m["size"], float64(0))
+			assert.NotContains(t, m, "sender")
+			assert.NotContains(t, m, "replyTo")
+			assert.NotContains(t, m, "cc")
+			assert.NotContains(t, m, "bcc")
+			assert.NotEmpty(t, m["messageId"])
+			assert.NotContains(t, m, "inReplyTo")
+			assert.NotEmpty(t, m["date"])
+			assert.Equal(t, "Example multipart/mixed message", m["subject"])
+			assert.Equal(t, "text/plain; charset=\"UTF-8\"", m["contentType"])
+			assert.NotContains(t, m, "contentTransferEncoding")
+			assert.Equal(t, "Hello Bob,\n\nThis is the plain text part of the email.\n", m["body"])
+			assert.Greater(t, m["size"], float64(0))
 		}),
 	)
 }
 
 func (suite *MailSuite) TestCustomServerCertificate() {
-	conn, err := net.Dial("tcp", "localhost:8993")
+	var conn net.Conn
+	var err error
+	for attempt := 1; attempt <= 10; attempt++ {
+		conn, err = net.Dial("tcp", "localhost:8993")
+		if err == nil {
+			break
+		}
+		time.Sleep(200 * time.Millisecond)
+	}
 	require.NoError(suite.T(), err)
 	defer func() { _ = conn.Close() }()
 

acceptance/petstore_test.go

@@ -3,18 +3,20 @@ package acceptance
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/brianvoe/gofakeit/v6"
-	"github.com/stretchr/testify/require"
 	"mokapi/config/static"
 	"mokapi/kafka"
 	"mokapi/kafka/fetch"
 	"mokapi/kafka/kafkatest"
 	"mokapi/kafka/metaData"
 	"mokapi/kafka/produce"
+	"mokapi/schema/json/generator"
 	"mokapi/try"
 	"net/http"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type PetStoreSuite struct{ BaseSuite }
@@ -29,7 +31,7 @@ func (suite *PetStoreSuite) SetupSuite() {
 }
 
 func (suite *PetStoreSuite) SetupTest() {
-	gofakeit.Seed(11)
+	generator.Seed(11)
 }
 
 func (suite *PetStoreSuite) TestApi() {
@@ -50,9 +52,6 @@ func (suite *PetStoreSuite) TestApi() {
 	})
 
 	suite.T().Run("get AsyncAPI service", func(t *testing.T) {
-		// ensure scripts are executed
-		time.Sleep(5 * time.Second)
-
 		expected := map[string]interface{}{
 			"version":     "1.0.0",
 			"name":        "A sample AsyncApi Kafka streaming api",
@@ -128,11 +127,23 @@ func (suite *PetStoreSuite) TestApi() {
 			}},
 		}
 
-		try.GetRequest(t, fmt.Sprintf("http://127.0.0.1:%v/api/services/kafka/A%%20sample%%20AsyncApi%%20Kafka%%20streaming%%20api", suite.cfg.Api.Port),
-			nil,
-			try.HasStatusCode(http.StatusOK),
-			try.BodyContainsData(expected),
-		)
+		deadline := time.Now().Add(5 * time.Second)
+		for time.Now().Before(deadline) {
+			try.GetRequest(t, fmt.Sprintf("http://127.0.0.1:%v/api/services/kafka/A%%20sample%%20AsyncApi%%20Kafka%%20streaming%%20api", suite.cfg.Api.Port),
+				nil,
+				try.HasStatusCode(http.StatusOK),
+				try.BodyContainsData(expected),
+			)
+			if !t.Failed() {
+				break
+			}
+			if time.Now().After(deadline) {
+				t.FailNow()
+			}
+			// reset test failure state before retrying
+			t.Cleanup(func() {})
+			time.Sleep(100 * time.Millisecond)
+		}
 	})
 }
 
@@ -158,7 +169,7 @@ func (suite *PetStoreSuite) TestJsHttpHandler() {
 	try.GetRequest(suite.T(), "http://127.0.0.1:18080/pet/5",
 		map[string]string{"Accept": "application/json", "api_key": "123"},
 		try.HasStatusCode(http.StatusOK),
-		try.BodyContains(`},"name":"Zoe","photoUrls":`))
+		try.BodyContains(`"name":"Zoe"`))
 
 	// test http metrics
 	try.GetRequest(suite.T(), fmt.Sprintf("http://127.0.0.1:%s/api/metrics/http?path=/pet/{petId}", suite.cfg.Api.Port), nil,
@@ -179,12 +190,13 @@ func (suite *PetStoreSuite) TestGetOrderById() {
 	try.GetRequest(suite.T(), "http://127.0.0.1:18080/store/order/1",
 		map[string]string{"Accept": "application/json"},
 		try.HasStatusCode(http.StatusOK),
-		try.HasBody(`{"id":98266,"petId":23377,"quantity":92,"shipDate":"2012-01-30T07:58:01Z","status":"approved","complete":false}`))
+		try.HasBody(`{"petId":23377,"quantity":92,"shipDate":"2012-01-30T07:58:01Z","complete":false}`))
 
 	try.GetRequest(suite.T(), "https://localhost:18443/store/order/10",
 		map[string]string{"Accept": "application/json"},
 		try.HasStatusCode(http.StatusOK),
-		try.HasBody(`{"id":12545,"petId":20895,"quantity":16,"shipDate":"2027-11-26T16:57:16Z","status":"approved","complete":true}`))
+		// properties like id or petId are optional
+		try.HasBody(`{"id":93761,"petId":83318,"quantity":27,"shipDate":"2014-02-04T10:00:17Z","status":"placed","complete":true}`))
 }
 
 func (suite *PetStoreSuite) TestTls() {
@@ -341,17 +353,17 @@ func (suite *PetStoreSuite) TestSearch_Paging() {
 		try.AssertBody(func(t *testing.T, body string) {
 			var data map[string]any
 			err := json.Unmarshal([]byte(body), &data)
-			require.NoError(t, err)
-			require.NotNil(t, data)
+			assert.NoError(t, err)
+			assert.NotNil(t, data)
 
-			require.Equal(t, float64(35), data["total"])
+			assert.Equal(t, float64(35), data["total"])
 
 			items := data["results"].([]any)
-			require.Len(t, items, 10)
+			assert.Len(t, items, 10)
 			evt := items[0].(map[string]interface{})
-			require.Equal(t, "HTTP", evt["type"])
-			require.Equal(t, "Swagger Petstore", evt["title"])
-			require.NotContains(t, evt, "domain")
+			assert.Equal(t, "HTTP", evt["type"])
+			assert.Equal(t, "Swagger Petstore", evt["title"])
+			assert.NotContains(t, evt, "domain")
 		}),
 	)
 
@@ -361,17 +373,17 @@ func (suite *PetStoreSuite) TestSearch_Paging() {
 		try.AssertBody(func(t *testing.T, body string) {
 			var data map[string]any
 			err := json.Unmarshal([]byte(body), &data)
-			require.NoError(t, err)
-			require.NotNil(t, data)
+			assert.NoError(t, err)
+			assert.NotNil(t, data)
 
-			require.Equal(t, float64(35), data["total"])
+			assert.Equal(t, float64(35), data["total"])
 
 			items := data["results"].([]any)
-			require.Len(t, items, 10)
+			assert.Len(t, items, 10)
 			evt := items[0].(map[string]interface{})
-			require.Equal(t, "HTTP", evt["type"])
-			require.Equal(t, "GET /pet/{petId}", evt["title"])
-			require.Equal(t, "Swagger Petstore", evt["domain"])
+			assert.Equal(t, "HTTP", evt["type"])
+			assert.Equal(t, "GET /pet/{petId}", evt["title"])
+			assert.Equal(t, "Swagger Petstore", evt["domain"])
 		}),
 	)
 }