lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-08-06 23:20:55 -04:00
Code Issues Releases Wiki Activity

fully migrate to new assertion lib

Browse Source
This commit is contained in:
Darien Raymond
2017-10-24 16:15:35 +02:00
parent 4a0ca30d08
commit 74cf833758
70 changed files with 974 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/shadowsocks/ota_test.go
+7 -7
View File
@@ -5,11 +5,11 @@ import (
"v2ray.com/core/common/buf"
. "v2ray.com/core/proxy/shadowsocks"
"v2ray.com/core/testing/assert"
. "v2ray.com/ext/assert"
)
func TestNormalChunkReading(t *testing.T) {
assert := assert.On(t)
assert := With(t)
buffer := buf.New()
buffer.AppendBytes(
@@ -17,12 +17,12 @@ func TestNormalChunkReading(t *testing.T) {
reader := NewChunkReader(buffer, NewAuthenticator(ChunkKeyGenerator(
[]byte{21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36})))
payload, err := reader.Read()
assert.Error(err).IsNil()
assert.Bytes(payload[0].Bytes()).Equals([]byte{11, 12, 13, 14, 15, 16, 17, 18})
assert(err, IsNil)
assert(payload[0].Bytes(), Equals, []byte{11, 12, 13, 14, 15, 16, 17, 18})
}
func TestNormalChunkWriting(t *testing.T) {
assert := assert.On(t)
assert := With(t)
buffer := buf.NewLocal(512)
writer := NewChunkWriter(buffer, NewAuthenticator(ChunkKeyGenerator(
@@ -31,6 +31,6 @@ func TestNormalChunkWriting(t *testing.T) {
b := buf.NewLocal(256)
b.Append([]byte{11, 12, 13, 14, 15, 16, 17, 18})
err := writer.Write(buf.NewMultiBufferValue(b))
assert.Error(err).IsNil()
assert.Bytes(buffer.Bytes()).Equals([]byte{0, 8, 39, 228, 69, 96, 133, 39, 254, 26, 201, 70, 11, 12, 13, 14, 15, 16, 17, 18})
assert(err, IsNil)
assert(buffer.Bytes(), Equals, []byte{0, 8, 39, 228, 69, 96, 133, 39, 254, 26, 201, 70, 11, 12, 13, 14, 15, 16, 17, 18})
}
proxy/shadowsocks/protocol_test.go
+22 -22
View File
@@ -8,11 +8,11 @@ import (
"v2ray.com/core/common/protocol"
"v2ray.com/core/common/serial"
. "v2ray.com/core/proxy/shadowsocks"
"v2ray.com/core/testing/assert"
. "v2ray.com/ext/assert"
)
func TestUDPEncoding(t *testing.T) {
assert := assert.On(t)
assert := With(t)
request := &protocol.RequestHeader{
Version: Version,
@@ -32,17 +32,17 @@ func TestUDPEncoding(t *testing.T) {
data := buf.NewLocal(256)
data.AppendSupplier(serial.WriteString("test string"))
encodedData, err := EncodeUDPPacket(request, data.Bytes())
assert.Error(err).IsNil()
assert(err, IsNil)
decodedRequest, decodedData, err := DecodeUDPPacket(request.User, encodedData)
assert.Error(err).IsNil()
assert.Bytes(decodedData.Bytes()).Equals(data.Bytes())
assert.Address(decodedRequest.Address).Equals(request.Address)
assert.Port(decodedRequest.Port).Equals(request.Port)
assert(err, IsNil)
assert(decodedData.Bytes(), Equals, data.Bytes())
assert(decodedRequest.Address, Equals, request.Address)
assert(decodedRequest.Port, Equals, request.Port)
}
func TestTCPRequest(t *testing.T) {
assert := assert.On(t)
assert := With(t)
cases := []struct {
request *protocol.RequestHeader
@@ -110,18 +110,18 @@ func TestTCPRequest(t *testing.T) {
defer cache.Release()
writer, err := WriteTCPRequest(request, cache)
assert.Error(err).IsNil()
assert(err, IsNil)
assert.Error(writer.Write(buf.NewMultiBufferValue(data))).IsNil()
assert(writer.Write(buf.NewMultiBufferValue(data)), IsNil)
decodedRequest, reader, err := ReadTCPSession(request.User, cache)
assert.Error(err).IsNil()
assert.Address(decodedRequest.Address).Equals(request.Address)
assert.Port(decodedRequest.Port).Equals(request.Port)
assert(err, IsNil)
assert(decodedRequest.Address, Equals, request.Address)
assert(decodedRequest.Port, Equals, request.Port)
decodedData, err := reader.Read()
assert.Error(err).IsNil()
assert.String(decodedData[0].String()).Equals(string(payload))
assert(err, IsNil)
assert(decodedData[0].String(), Equals, string(payload))
}
for _, test := range cases {
@@ -131,7 +131,7 @@ func TestTCPRequest(t *testing.T) {
}
func TestUDPReaderWriter(t *testing.T) {
assert := assert.On(t)
assert := With(t)
user := &protocol.User{
Account: serial.ToTypedMessage(&Account{
@@ -159,18 +159,18 @@ func TestUDPReaderWriter(t *testing.T) {
b := buf.New()
b.AppendSupplier(serial.WriteString("test payload"))
err := writer.Write(buf.NewMultiBufferValue(b))
assert.Error(err).IsNil()
assert(err, IsNil)
payload, err := reader.Read()
assert.Error(err).IsNil()
assert.String(payload[0].String()).Equals("test payload")
assert(err, IsNil)
assert(payload[0].String(), Equals, "test payload")
b = buf.New()
b.AppendSupplier(serial.WriteString("test payload 2"))
err = writer.Write(buf.NewMultiBufferValue(b))
assert.Error(err).IsNil()
assert(err, IsNil)
payload, err = reader.Read()
assert.Error(err).IsNil()
assert.String(payload[0].String()).Equals("test payload 2")
assert(err, IsNil)
assert(payload[0].String(), Equals, "test payload 2")
}