Fixed test's bug

dobyte · Jul 3, 2024 · 4ca8449 · 4ca8449
1 parent 025a6e8
commit 4ca8449
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 92 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -15,7 +15,7 @@ func init() {
 
 func TestWatch(t *testing.T) {
 	ticker1 := time.NewTicker(2 * time.Second)
-	ticker2 := time.After(time.Minute)
+	ticker2 := time.After(5 * time.Second)
 
 	for {
 		select {
@@ -29,20 +29,6 @@ func TestWatch(t *testing.T) {
 	}
 }
 
-func TestLoad(t *testing.T) {
-	ctx := context.Background()
-	filename := "config.json"
-	c, err := config.Load(ctx, file.Name, filename)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Log(c[0].Name)
-	t.Log(c[0].Path)
-	t.Log(c[0].Format)
-	t.Log(c[0].Content)
-}
-
 func TestStore(t *testing.T) {
 	ctx := context.Background()
 	filename := "config.json"
@@ -68,6 +54,20 @@ func TestStore(t *testing.T) {
 	}
 }
 
+func TestLoad(t *testing.T) {
+	ctx := context.Background()
+	filename := "config.json"
+	c, err := config.Load(ctx, file.Name, filename)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Log(c[0].Name)
+	t.Log(c[0].Path)
+	t.Log(c[0].Format)
+	t.Log(c[0].Content)
+}
+
 func BenchmarkGet(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		config.Get("config").Value()

diff --git a/internal/transporter/gate/server_test.go b/internal/transporter/gate/server_test.go
@@ -3,9 +3,11 @@ package gate_test
 import (
 	"context"
 	"fmt"
+	"github.com/dobyte/due/v2/cluster"
 	"github.com/dobyte/due/v2/internal/transporter/gate"
 	"github.com/dobyte/due/v2/session"
 	"testing"
+	"time"
 )
 
 func TestServer(t *testing.T) {
@@ -14,11 +16,11 @@ func TestServer(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	t.Logf("server listen on: %s", server.Addr())
+	t.Logf("server listen on: %s", server.ListenAddr())
 
-	if err = server.Start(); err != nil {
-		t.Fatal(err)
-	}
+	go server.Start()
+
+	<-time.After(20 * time.Second)
 }
 
 type provider struct {
@@ -72,3 +74,13 @@ func (p *provider) Stat(ctx context.Context, kind session.Kind) (total int64, er
 func (p *provider) Disconnect(ctx context.Context, kind session.Kind, target int64, isForce bool) error {
 	return nil
 }
+
+// GetState 获取状态
+func (p *provider) GetState() (cluster.State, error) {
+	return cluster.Work, nil
+}
+
+// SetState 设置状态
+func (p *provider) SetState(state cluster.State) error {
+	return nil
+}
diff --git a/internal/transporter/node/server_test.go b/internal/transporter/node/server_test.go
@@ -18,9 +18,9 @@ func TestServer(t *testing.T) {
 
 	t.Logf("server listen on: %s", server.ListenAddr())
 
-	if err = server.Start(); err != nil {
-		t.Fatal(err)
-	}
+	go server.Start()
+
+	<-time.After(20 * time.Second)
 }
 
 type provider struct {
@@ -53,3 +53,13 @@ func TestTimeout(t *testing.T) {
 		fmt.Println(2, time.Now().Unix())
 	}
 }
+
+// GetState 获取状态
+func (p *provider) GetState() (cluster.State, error) {
+	return cluster.Work, nil
+}
+
+// SetState 设置状态
+func (p *provider) SetState(state cluster.State) error {
+	return nil
+}
diff --git a/packet/packet_test.go b/packet/packet_test.go
@@ -1,6 +1,7 @@
 package packet_test
 
 import (
+	"bytes"
 	"github.com/dobyte/due/v2/packet"
 	"github.com/dobyte/due/v2/utils/xrand"
 	"testing"
@@ -65,82 +66,65 @@ func BenchmarkDefaultPacker_PackMessage(b *testing.B) {
 	}
 }
 
-func BenchmarkDefaultPacker_PackMessage2(b *testing.B) {
-	buffer := []byte(xrand.Letters(1024))
+func BenchmarkUnpack(b *testing.B) {
+	buf, err := packet.PackMessage(&packet.Message{
+		Seq:    1,
+		Route:  1,
+		Buffer: []byte("hello world"),
+	})
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	for i := 0; i < b.N; i++ {
+		_, err := packet.UnpackMessage(buf)
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkDefaultPacker_ReadMessage(b *testing.B) {
+	buf, err := packer.PackMessage(&packet.Message{
+		Seq:    1,
+		Route:  1,
+		Buffer: []byte(xrand.Letters(1024)),
+	})
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	reader := bytes.NewReader(buf)
 
 	b.ResetTimer()
+	b.SetBytes(int64(len(buf)))
 
 	for i := 0; i < b.N; i++ {
-		_, err := packet.PackMessage2(&packet.Message{
-			Seq:    1,
-			Route:  1,
-			Buffer: buffer,
-		})
-		if err != nil {
+		if _, err = packer.ReadMessage(reader); err != nil {
 			b.Fatal(err)
 		}
+
+		reader.Reset(buf)
 	}
 }
 
-//func BenchmarkUnpack(b *testing.B) {
-//	buf, err := packet.PackMessage(&packet.Message{
-//		Seq:    1,
-//		Route:  1,
-//		Buffer: []byte("hello world"),
-//	})
-//	if err != nil {
-//		b.Fatal(err)
-//	}
-//
-//	for i := 0; i < b.N; i++ {
-//		_, err := packet.UnpackMessage(buf)
-//		if err != nil {
-//			b.Fatal(err)
-//		}
-//	}
-//}
-
-//func BenchmarkDefaultPacker_ReadMessage(b *testing.B) {
-//	buf, err := packer.PackMessage(&packet.Message{
-//		Seq:    1,
-//		Route:  1,
-//		Buffer: []byte(xrand.Letters(1024)),
-//	})
-//	if err != nil {
-//		b.Fatal(err)
-//	}
-//
-//	reader := bytes.NewReader(buf)
-//
-//	b.ResetTimer()
-//	b.SetBytes(int64(len(buf)))
-//
-//	for i := 0; i < b.N; i++ {
-//		if _, err = packer.ReadMessage(reader); err != nil {
-//			b.Fatal(err)
-//		}
-//
-//		reader.Reset(buf)
-//	}
-//}
-//
-//func BenchmarkDefaultPacker_UnpackMessage(b *testing.B) {
-//	buf, err := packer.PackMessage(&packet.Message{
-//		Seq:    1,
-//		Route:  1,
-//		Buffer: []byte(xrand.Letters(1024)),
-//	})
-//	if err != nil {
-//		b.Fatal(err)
-//	}
-//
-//	b.ResetTimer()
-//	b.SetBytes(int64(len(buf)))
-//
-//	for i := 0; i < b.N; i++ {
-//		_, err := packer.UnpackMessage(buf)
-//		if err != nil {
-//			b.Fatal(err)
-//		}
-//	}
-//}
+func BenchmarkDefaultPacker_UnpackMessage(b *testing.B) {
+	buf, err := packer.PackMessage(&packet.Message{
+		Seq:    1,
+		Route:  1,
+		Buffer: []byte(xrand.Letters(1024)),
+	})
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	b.ResetTimer()
+	b.SetBytes(int64(len(buf)))
+
+	for i := 0; i < b.N; i++ {
+		_, err := packer.UnpackMessage(buf)
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}