github/v2ray-core
4
0 Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-11-14 14:47:12 +00:00
Code Issues Releases Wiki Activity

fix test break

Browse Source
This commit is contained in:
V2Ray committed 2015-09-14 19:03:31 +02:00
1 parent 097915bf7e
commit 5af327f00b
7 files changed
+53 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

io/vmess/vmess.go
+3 -3
View File
@@ -49,10 +49,10 @@ type VMessRequest struct {
}
type VMessRequestReader struct {
vUserSet *core.UserSet
vUserSet core.UserSet
}
func NewVMessRequestReader(vUserSet *core.UserSet) *VMessRequestReader {
func NewVMessRequestReader(vUserSet core.UserSet) *VMessRequestReader {
reader := new(VMessRequestReader)
reader.vUserSet = vUserSet
return reader
@@ -74,7 +74,7 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
return nil, err
}
userId, valid := r.vUserSet.IsValidUserId(buffer[:nBytes])
userId, valid := r.vUserSet.GetUser(buffer[:nBytes])
if !valid {
return nil, ErrorInvalidUser
}
io/vmess/vmess_test.go
+7 -4
View File
@@ -7,18 +7,19 @@ import (
"github.com/v2ray/v2ray-core"
v2net "github.com/v2ray/v2ray-core/net"
"github.com/v2ray/v2ray-core/testing/mocks"
"github.com/v2ray/v2ray-core/testing/unit"
)
func TestVMessSerialization(t *testing.T) {
assert := unit.Assert(t)
userId, err := core.UUIDToID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")
userId, err := core.NewID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")
if err != nil {
t.Fatal(err)
}
userSet := core.NewUserSet()
userSet := mocks.MockUserSet{[]core.ID{}, make(map[string]int)}
userSet.AddUser(core.User{userId})
request := new(VMessRequest)
@@ -50,14 +51,16 @@ func TestVMessSerialization(t *testing.T) {
t.Fatal(err)
}
requestReader := NewVMessRequestReader(userSet)
userSet.UserHashes[string(buffer.Bytes()[1:17])] = 0
requestReader := NewVMessRequestReader(&userSet)
actualRequest, err := requestReader.Read(buffer)
if err != nil {
t.Fatal(err)
}
assert.Byte(actualRequest.Version).Named("Version").Equals(byte(0x01))
assert.Bytes(actualRequest.UserId[:]).Named("UserId").Equals(request.UserId[:])
assert.String(actualRequest.UserId.String).Named("UserId").Equals(request.UserId.String)
assert.Bytes(actualRequest.RequestIV[:]).Named("RequestIV").Equals(request.RequestIV[:])
assert.Bytes(actualRequest.RequestKey[:]).Named("RequestKey").Equals(request.RequestKey[:])
assert.Bytes(actualRequest.ResponseHeader[:]).Named("ResponseHeader").Equals(request.ResponseHeader[:])