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

simplify testing

Browse Source
This commit is contained in:
v2ray
2016-05-24 21:55:46 +02:00
parent 3582b9d869
commit fc63f0432c
99 changed files with 726 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/socks/protocol/socks4_test.go
+6 -7
View File
@@ -6,12 +6,11 @@ import (
"github.com/v2ray/v2ray-core/common/alloc"
v2net "github.com/v2ray/v2ray-core/common/net"
v2testing "github.com/v2ray/v2ray-core/testing"
"github.com/v2ray/v2ray-core/testing/assert"
)
func TestSocks4AuthenticationRequestRead(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
rawRequest := []byte{
0x04, // version
@@ -21,14 +20,14 @@ func TestSocks4AuthenticationRequestRead(t *testing.T) {
}
_, request4, err := ReadAuthentication(bytes.NewReader(rawRequest))
assert.Error(err).Equals(Socks4Downgrade)
assert.Byte(request4.Version).Named("Version").Equals(0x04)
assert.Byte(request4.Command).Named("Command").Equals(0x01)
assert.Port(request4.Port).Named("Port").Equals(v2net.Port(53))
assert.Bytes(request4.IP[:]).Named("IP").Equals([]byte{0x72, 0x72, 0x72, 0x72})
assert.Byte(request4.Version).Equals(0x04)
assert.Byte(request4.Command).Equals(0x01)
assert.Port(request4.Port).Equals(v2net.Port(53))
assert.Bytes(request4.IP[:]).Equals([]byte{0x72, 0x72, 0x72, 0x72})
}
func TestSocks4AuthenticationResponseToBytes(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
response := NewSocks4AuthenticationResponse(byte(0x10), 443, []byte{1, 2, 3, 4})
proxy/socks/protocol/socks_test.go
+22 -23
View File
@@ -8,13 +8,12 @@ import (
"github.com/v2ray/v2ray-core/common/alloc"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy"
v2testing "github.com/v2ray/v2ray-core/testing"
"github.com/v2ray/v2ray-core/testing/assert"
"github.com/v2ray/v2ray-core/transport"
)
func TestHasAuthenticationMethod(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
request := Socks5AuthenticationRequest{
version: socksVersion,
@@ -29,7 +28,7 @@ func TestHasAuthenticationMethod(t *testing.T) {
}
func TestAuthenticationRequestRead(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
buffer := alloc.NewBuffer().Clear().AppendBytes(
0x05, // version
@@ -38,13 +37,13 @@ func TestAuthenticationRequestRead(t *testing.T) {
)
request, _, err := ReadAuthentication(buffer)
assert.Error(err).IsNil()
assert.Byte(request.version).Named("Version").Equals(0x05)
assert.Byte(request.nMethods).Named("#Methods").Equals(0x01)
assert.Byte(request.authMethods[0]).Named("Auth Method").Equals(0x02)
assert.Byte(request.version).Equals(0x05)
assert.Byte(request.nMethods).Equals(0x01)
assert.Byte(request.authMethods[0]).Equals(0x02)
}
func TestAuthenticationResponseWrite(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
response := NewAuthenticationResponse(byte(0x05))
@@ -54,7 +53,7 @@ func TestAuthenticationResponseWrite(t *testing.T) {
}
func TestRequestRead(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
rawRequest := []byte{
0x05, // version
@@ -66,15 +65,15 @@ func TestRequestRead(t *testing.T) {
}
request, err := ReadRequest(bytes.NewReader(rawRequest))
assert.Error(err).IsNil()
assert.Byte(request.Version).Named("Version").Equals(0x05)
assert.Byte(request.Command).Named("Command").Equals(0x01)
assert.Byte(request.AddrType).Named("Address Type").Equals(0x01)
assert.Bytes(request.IPv4[:]).Named("IPv4").Equals([]byte{0x72, 0x72, 0x72, 0x72})
assert.Port(request.Port).Named("Port").Equals(v2net.Port(53))
assert.Byte(request.Version).Equals(0x05)
assert.Byte(request.Command).Equals(0x01)
assert.Byte(request.AddrType).Equals(0x01)
assert.Bytes(request.IPv4[:]).Equals([]byte{0x72, 0x72, 0x72, 0x72})
assert.Port(request.Port).Equals(v2net.Port(53))
}
func TestResponseWrite(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
response := Socks5Response{
socksVersion,
@@ -97,11 +96,11 @@ func TestResponseWrite(t *testing.T) {
0x72, 0x72, 0x72, 0x72,
byte(0x00), byte(0x035),
}
assert.Bytes(buffer.Value).Named("raw response").Equals(expectedBytes)
assert.Bytes(buffer.Value).Equals(expectedBytes)
}
func TestSetIPv6(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
response := NewSocks5Response()
response.SetIPv6([]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15})
@@ -114,7 +113,7 @@ func TestSetIPv6(t *testing.T) {
}
func TestSetDomain(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
response := NewSocks5Response()
response.SetDomain("v2ray.com")
@@ -127,28 +126,28 @@ func TestSetDomain(t *testing.T) {
}
func TestEmptyAuthRequest(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
_, _, err := ReadAuthentication(alloc.NewBuffer().Clear())
assert.Error(err).Equals(io.EOF)
}
func TestSingleByteAuthRequest(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
_, _, err := ReadAuthentication(bytes.NewReader(make([]byte, 1)))
assert.Error(err).Equals(transport.ErrorCorruptedPacket)
}
func TestZeroAuthenticationMethod(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
buffer := alloc.NewBuffer().Clear().AppendBytes(5, 0)
_, _, err := ReadAuthentication(buffer)
assert.Error(err).Equals(proxy.ErrorInvalidAuthentication)
}
func TestWrongProtocolVersion(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
buffer := alloc.NewBuffer().Clear().AppendBytes(6, 1, 0)
_, _, err := ReadAuthentication(buffer)
@@ -156,14 +155,14 @@ func TestWrongProtocolVersion(t *testing.T) {
}
func TestEmptyRequest(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
_, err := ReadRequest(alloc.NewBuffer().Clear())
assert.Error(err).Equals(io.EOF)
}
func TestIPv6Request(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
request, err := ReadRequest(alloc.NewBuffer().Clear().AppendBytes(5, 1, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 0, 8))
assert.Error(err).IsNil()
proxy/socks/protocol/udp_test.go
+3 -4
View File
@@ -4,13 +4,12 @@ import (
"testing"
v2net "github.com/v2ray/v2ray-core/common/net"
v2testing "github.com/v2ray/v2ray-core/testing"
"github.com/v2ray/v2ray-core/testing/assert"
"github.com/v2ray/v2ray-core/transport"
)
func TestSingleByteUDPRequest(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
request, err := ReadUDPRequest(make([]byte, 1))
if request != nil {
@@ -20,7 +19,7 @@ func TestSingleByteUDPRequest(t *testing.T) {
}
func TestDomainAddressRequest(t *testing.T) {
v2testing.Current(t)
assert := assert.On(t)
payload := make([]byte, 0, 1024)
payload = append(payload, 0, 0, 1, AddrTypeDomain, byte(len("v2ray.com")))
@@ -32,7 +31,7 @@ func TestDomainAddressRequest(t *testing.T) {
assert.Error(err).IsNil()
assert.Byte(request.Fragment).Equals(1)
assert.String(request.Address).Equals("v2ray.com")
assert.Address(request.Address).EqualsString("v2ray.com")
assert.Port(request.Port).Equals(v2net.Port(80))
assert.Bytes(request.Data.Value).Equals([]byte("Actual payload"))
}