lib9p

commit 4a1fa9877ce303098dedd5c4127e5aa043cdb70a
parent 09ff73e4d321b41f9cb218f61947e94bc4250a7e
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Fri, 27 Oct 2023 08:20:34 +0900

update test

Diffstat:
M
fcall_test.go
 | 
2
+-
M
req_test.go
 | 
7
++++++-
M
server_test.go
 | 
96
++++++++++++++++++++++++++++++++++++++++----------------------------------------

3 files changed, 55 insertions(+), 50 deletions(-)
diff --git a/fcall_test.go b/fcall_test.go
@@ -23,7 +23,7 @@ func TestFcallParse(t *testing.T) {
 	}
 	rawFile := io.MultiReader(tFile, rFile)
 	for {
-		mb, err := read9PMsg(rawFile)
+		mb, err := readMsg(rawFile)
 		if err == io.EOF {
 			break
 		} else if err != nil {
diff --git a/req_test.go b/req_test.go
@@ -1,10 +1,13 @@
 package lib9p
 
+/*
 import (
 	"context"
 	"io"
 	"testing"
 	"time"
+
+	"git.mtkn.jp/lib9p/client" // TODO: import cycle
 )
 
 func TestFlush(t *testing.T) {
@@ -25,7 +28,7 @@ func TestFlush(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	go s.Serve(ctx)
-	c := NewClient(mSize, uname, cr, cw)
+	c := client.NewClient(mSize, uname, cr, cw)
 	defer c.Stop()
 	tPool := newTagPool()
 	rmsize, rversion, err := c.Version(ctx, NOTAG, mSize, "9P2000")
@@ -92,3 +95,4 @@ func TestFlush(t *testing.T) {
 	t.Logf("read data: %v, err: %v", data, err)
 	t.Log(tPool)
 }
+*/
+\ No newline at end of file
diff --git a/server_test.go b/server_test.go
@@ -9,12 +9,12 @@ import (
 )
 
 func newReq(s *Server, msg Msg) (*Req, error) {
-	r, err := s.rPool.add(msg.Tag())
+	r, err := s.rPool.add(msg.GetTag())
 	if err != nil {
-		return nil, fmt.Errorf("ReqPool.add(%d): %w", msg.Tag(), err)
+		return nil, fmt.Errorf("ReqPool.add(%d): %w", msg.GetTag(), err)
 	}
 	r.srv = s
-	r.tag = msg.Tag()
+	r.tag = msg.GetTag()
 	r.ifcall = msg
 	return r, nil
 }
@@ -82,70 +82,70 @@ func TestServer(t *testing.T) {
 	defer sw.Close()
 	msg := []Msg{
 		&TVersion{
-			tag:     NOTAG,
-			mSize:   1024,
-			version: "9P2000",
+			Tag:     NOTAG,
+			Msize:   1024,
+			Version: "9P2000",
 		},
 		&TAttach{
-			tag:   0,
-			fid:   0,
-			afid:  NOFID,
-			uname: "glenda",
-			aname: "",
+			Tag:   0,
+			Fid:   0,
+			Afid:  NOFID,
+			Uname: "glenda",
+			Aname: "",
 		},
 		&TStat{
-			tag: 0,
-			fid: 0,
+			Tag: 0,
+			Fid: 0,
 		},
 		&TWalk{
-			tag:    0,
-			fid:    0,
-			newFid: 1,
-			wname:  []string{},
+			Tag:    0,
+			Fid:    0,
+			Newfid: 1,
+			Wnames:  []string{},
 		},
 		&TOpen{
-			tag:  0,
-			fid:  1,
-			mode: OREAD,
+			Tag:  0,
+			Fid:  1,
+			Mode: OREAD,
 		},
 		&TRead{
-			tag:    0,
-			fid:    1,
-			offset: 0,
-			count:  1024,
+			Tag:    0,
+			Fid:    1,
+			Offset: 0,
+			Count:  1024,
 		},
 		&TClunk{
-			fid: 1,
+			Fid: 1,
 		},
 		&TWalk{
-			tag:    0,
-			fid:    0,
-			newFid: 1,
-			wname:  []string{"dir", "file"},
+			Tag:    0,
+			Fid:    0,
+			Newfid: 1,
+			Wnames:  []string{"dir", "file"},
 		},
 		&TOpen{
-			tag:  0,
-			fid:  1,
-			mode: ORDWR,
+			Tag:  0,
+			Fid:  1,
+			Mode: ORDWR,
 		},
 		&TRead{
-			tag:    0,
-			fid:    1,
-			offset: 0,
-			count:  1024,
+			Tag:    0,
+			Fid:    1,
+			Offset: 0,
+			Count:  1024,
 		},
 		&TWrite{
-			tag:    0,
-			fid:    1,
-			offset: 2,
-			count:  4,
-			data:   []byte("a"),
+			Tag:    0,
+			Fid:    1,
+			Offset: 2,
+			Count:  4,
+			Data:   []byte("a"),
 		},
 		&TRead{
-			tag:    0,
-			fid:    1,
-			offset: 0,
-			count:  1024,
+			Tag:    0,
+			Fid:    1,
+			Offset: 0,
+			Count:  1024,
 		},
 	}
 	s := NewServer(fsys, 1024, sr, sw)
@@ -167,10 +167,10 @@ func TestServer(t *testing.T) {
 
 		if bufMsg(buf).Type() == Rread {
 			rread := newRRead(buf)
-			data := rread.Data()
-			fid, ok := s.fPool.lookup(m.(*TRead).Fid())
+			data := rread.Data
+			fid, ok := s.fPool.lookup(m.(*TRead).Fid)
 			if !ok {
-				t.Fatalf("lookup fid %d", m.(*TRead).Fid())
+				t.Fatalf("lookup fid %d", m.(*TRead).Fid)
 			}
 			st, err := fid.File.Stat()
 			if err != nil {