From 9ad9af367c0772c965382daf5b2ee6a8060d549f Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Thu, 16 Feb 2017 21:08:10 +0100 Subject: [PATCH] rename import for net test --- common/net/address_test.go | 12 ++++++------ common/net/destination_test.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/net/address_test.go b/common/net/address_test.go index 2279e984b..424727314 100644 --- a/common/net/address_test.go +++ b/common/net/address_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - v2net "v2ray.com/core/common/net" + . "v2ray.com/core/common/net" "v2ray.com/core/testing/assert" ) @@ -12,7 +12,7 @@ func TestIPv4Address(t *testing.T) { assert := assert.On(t) ip := []byte{byte(1), byte(2), byte(3), byte(4)} - addr := v2net.IPAddress(ip) + addr := IPAddress(ip) assert.Address(addr).IsIPv4() assert.Address(addr).IsNotIPv6() @@ -30,7 +30,7 @@ func TestIPv6Address(t *testing.T) { byte(1), byte(2), byte(3), byte(4), byte(1), byte(2), byte(3), byte(4), } - addr := v2net.IPAddress(ip) + addr := IPAddress(ip) assert.Address(addr).IsIPv6() assert.Address(addr).IsNotIPv4() @@ -47,7 +47,7 @@ func TestIPv4Asv6(t *testing.T) { byte(0), byte(0), byte(255), byte(255), byte(1), byte(2), byte(3), byte(4), } - addr := v2net.IPAddress(ip) + addr := IPAddress(ip) assert.Address(addr).EqualsString("1.2.3.4") } @@ -55,7 +55,7 @@ func TestDomainAddress(t *testing.T) { assert := assert.On(t) domain := "v2ray.com" - addr := v2net.DomainAddress(domain) + addr := DomainAddress(domain) assert.Address(addr).IsDomain() assert.Address(addr).IsNotIPv6() @@ -68,7 +68,7 @@ func TestNetIPv4Address(t *testing.T) { assert := assert.On(t) ip := net.IPv4(1, 2, 3, 4) - addr := v2net.IPAddress(ip) + addr := IPAddress(ip) assert.Address(addr).IsIPv4() assert.Address(addr).EqualsString("1.2.3.4") } diff --git a/common/net/destination_test.go b/common/net/destination_test.go index 463649fc3..f3b0f1317 100644 --- a/common/net/destination_test.go +++ b/common/net/destination_test.go @@ -3,14 +3,14 @@ package net_test import ( "testing" - "v2ray.com/core/common/net" + . "v2ray.com/core/common/net" "v2ray.com/core/testing/assert" ) func TestTCPDestination(t *testing.T) { assert := assert.On(t) - dest := net.TCPDestination(net.IPAddress([]byte{1, 2, 3, 4}), 80) + dest := TCPDestination(IPAddress([]byte{1, 2, 3, 4}), 80) assert.Destination(dest).IsTCP() assert.Destination(dest).IsNotUDP() assert.Destination(dest).EqualsString("tcp:1.2.3.4:80") @@ -19,7 +19,7 @@ func TestTCPDestination(t *testing.T) { func TestUDPDestination(t *testing.T) { assert := assert.On(t) - dest := net.UDPDestination(net.IPAddress([]byte{0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88}), 53) + dest := UDPDestination(IPAddress([]byte{0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88}), 53) assert.Destination(dest).IsNotTCP() assert.Destination(dest).IsUDP() assert.Destination(dest).EqualsString("udp:[2001:4860:4860::8888]:53")