1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-10 07:45:54 -04:00

remove dep on assert lib

This commit is contained in:
Darien Raymond
2019-02-02 22:19:30 +01:00
parent 2a0f3591f4
commit bdd71a44b4
35 changed files with 365 additions and 324 deletions

View File

@@ -3,12 +3,13 @@ package shadowsocks_test
import (
"testing"
"github.com/google/go-cmp/cmp"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol"
. "v2ray.com/core/proxy/shadowsocks"
. "v2ray.com/ext/assert"
)
func toAccount(a *Account) protocol.Account {
@@ -18,8 +19,6 @@ func toAccount(a *Account) protocol.Account {
}
func TestUDPEncoding(t *testing.T) {
assert := With(t)
request := &protocol.RequestHeader{
Version: Version,
Command: protocol.RequestCommandUDP,
@@ -38,19 +37,21 @@ func TestUDPEncoding(t *testing.T) {
data := buf.New()
common.Must2(data.WriteString("test string"))
encodedData, err := EncodeUDPPacket(request, data.Bytes())
assert(err, IsNil)
common.Must(err)
decodedRequest, decodedData, err := DecodeUDPPacket(request.User, encodedData)
assert(err, IsNil)
assert(decodedData.Bytes(), Equals, data.Bytes())
assert(decodedRequest.Address, Equals, request.Address)
assert(decodedRequest.Port, Equals, request.Port)
assert(decodedRequest.Command, Equals, request.Command)
common.Must(err)
if r := cmp.Diff(decodedData.Bytes(), data.Bytes()); r != "" {
t.Error("data: ", r)
}
if r := cmp.Diff(decodedRequest, request); r != "" {
t.Error("request: ", r)
}
}
func TestTCPRequest(t *testing.T) {
assert := With(t)
cases := []struct {
request *protocol.RequestHeader
payload []byte
@@ -116,19 +117,21 @@ func TestTCPRequest(t *testing.T) {
defer cache.Release()
writer, err := WriteTCPRequest(request, cache)
assert(err, IsNil)
common.Must(err)
assert(writer.WriteMultiBuffer(buf.MultiBuffer{data}), IsNil)
common.Must(writer.WriteMultiBuffer(buf.MultiBuffer{data}))
decodedRequest, reader, err := ReadTCPSession(request.User, cache)
assert(err, IsNil)
assert(decodedRequest.Address, Equals, request.Address)
assert(decodedRequest.Port, Equals, request.Port)
assert(decodedRequest.Command, Equals, request.Command)
common.Must(err)
if r := cmp.Diff(decodedRequest, request); r != "" {
t.Error("request: ", r)
}
decodedData, err := reader.ReadMultiBuffer()
assert(err, IsNil)
assert(decodedData[0].String(), Equals, string(payload))
common.Must(err)
if r := cmp.Diff(decodedData[0].Bytes(), payload); r != "" {
t.Error("data: ", r)
}
}
for _, test := range cases {
@@ -138,8 +141,6 @@ func TestTCPRequest(t *testing.T) {
}
func TestUDPReaderWriter(t *testing.T) {
assert := With(t)
user := &protocol.MemoryUser{
Account: toAccount(&Account{
Password: "test-password",
@@ -168,22 +169,24 @@ func TestUDPReaderWriter(t *testing.T) {
{
b := buf.New()
common.Must2(b.WriteString("test payload"))
err := writer.WriteMultiBuffer(buf.MultiBuffer{b})
assert(err, IsNil)
common.Must(writer.WriteMultiBuffer(buf.MultiBuffer{b}))
payload, err := reader.ReadMultiBuffer()
assert(err, IsNil)
assert(payload[0].String(), Equals, "test payload")
common.Must(err)
if payload[0].String() != "test payload" {
t.Error("unexpected output: ", payload[0].String())
}
}
{
b := buf.New()
common.Must2(b.WriteString("test payload 2"))
err := writer.WriteMultiBuffer(buf.MultiBuffer{b})
assert(err, IsNil)
common.Must(writer.WriteMultiBuffer(buf.MultiBuffer{b}))
payload, err := reader.ReadMultiBuffer()
assert(err, IsNil)
assert(payload[0].String(), Equals, "test payload 2")
common.Must(err)
if payload[0].String() != "test payload 2" {
t.Error("unexpected output: ", payload[0].String())
}
}
}