lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-06-22 02:39: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

6
common/protocol/id_test.go
View File

@@ -6,12 +6,12 @@ import (
"v2ray.com/core/common/predicate"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/common/uuid"
"v2ray.com/core/testing/assert"
. "v2ray.com/ext/assert"
)
func TestCmdKey(t *testing.T) {
assert := assert.On(t)
assert := With(t)
id := NewID(uuid.New())
assert.Bool(predicate.BytesAll(id.CmdKey(), 0)).IsFalse()
assert(predicate.BytesAll(id.CmdKey(), 0), IsFalse)
}

28
common/protocol/server_picker_test.go
View File

@@ -6,30 +6,30 @@ import (
"v2ray.com/core/common/net"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/testing/assert"
. "v2ray.com/ext/assert"
)
func TestServerList(t *testing.T) {
assert := assert.On(t)
assert := With(t)
list := NewServerList()
list.AddServer(NewServerSpec(net.TCPDestination(net.LocalHostIP, net.Port(1)), AlwaysValid()))
assert.Uint32(list.Size()).Equals(1)
assert(list.Size(), Equals, uint32(1))
list.AddServer(NewServerSpec(net.TCPDestination(net.LocalHostIP, net.Port(2)), BeforeTime(time.Now().Add(time.Second))))
assert.Uint32(list.Size()).Equals(2)
assert(list.Size(), Equals, uint32(2))
server := list.GetServer(1)
assert.Port(server.Destination().Port).Equals(2)
assert(server.Destination().Port, Equals, net.Port(2))
time.Sleep(2 * time.Second)
server = list.GetServer(1)
assert.Pointer(server).IsNil()
assert(server, IsNil)
server = list.GetServer(0)
assert.Port(server.Destination().Port).Equals(1)
assert(server.Destination().Port, Equals, net.Port(1))
}
func TestServerPicker(t *testing.T) {
assert := assert.On(t)
assert := With(t)
list := NewServerList()
list.AddServer(NewServerSpec(net.TCPDestination(net.LocalHostIP, net.Port(1)), AlwaysValid()))
@@ -38,17 +38,17 @@ func TestServerPicker(t *testing.T) {
picker := NewRoundRobinServerPicker(list)
server := picker.PickServer()
assert.Port(server.Destination().Port).Equals(1)
assert(server.Destination().Port, Equals, net.Port(1))
server = picker.PickServer()
assert.Port(server.Destination().Port).Equals(2)
assert(server.Destination().Port, Equals, net.Port(2))
server = picker.PickServer()
assert.Port(server.Destination().Port).Equals(3)
assert(server.Destination().Port, Equals, net.Port(3))
server = picker.PickServer()
assert.Port(server.Destination().Port).Equals(1)
assert(server.Destination().Port, Equals, net.Port(1))
time.Sleep(2 * time.Second)
server = picker.PickServer()
assert.Port(server.Destination().Port).Equals(1)
assert(server.Destination().Port, Equals, net.Port(1))
server = picker.PickServer()
assert.Port(server.Destination().Port).Equals(1)
assert(server.Destination().Port, Equals, net.Port(1))
}

16
common/protocol/server_spec_test.go
View File

@@ -5,27 +5,27 @@ import (
"time"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/testing/assert"
. "v2ray.com/ext/assert"
)
func TestAlwaysValidStrategy(t *testing.T) {
assert := assert.On(t)
assert := With(t)
strategy := AlwaysValid()
assert.Bool(strategy.IsValid()).IsTrue()
assert(strategy.IsValid(), IsTrue)
strategy.Invalidate()
assert.Bool(strategy.IsValid()).IsTrue()
assert(strategy.IsValid(), IsTrue)
}
func TestTimeoutValidStrategy(t *testing.T) {
assert := assert.On(t)
assert := With(t)
strategy := BeforeTime(time.Now().Add(2 * time.Second))
assert.Bool(strategy.IsValid()).IsTrue()
assert(strategy.IsValid(), IsTrue)
time.Sleep(3 * time.Second)
assert.Bool(strategy.IsValid()).IsFalse()
assert(strategy.IsValid(), IsFalse)
strategy = BeforeTime(time.Now().Add(2 * time.Second))
strategy.Invalidate()
assert.Bool(strategy.IsValid()).IsFalse()
assert(strategy.IsValid(), IsFalse)
}

8
common/protocol/time_test.go
View File

@@ -5,11 +5,11 @@ import (
"time"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/testing/assert"
. "v2ray.com/ext/assert"
)
func TestGenerateRandomInt64InRange(t *testing.T) {
assert := assert.On(t)
assert := With(t)
base := time.Now().Unix()
delta := 100
@@ -17,7 +17,7 @@ func TestGenerateRandomInt64InRange(t *testing.T) {
for i := 0; i < 100; i++ {
val := int64(generator())
assert.Int64(val).AtMost(base + int64(delta))
assert.Int64(val).AtLeast(base - int64(delta))
assert(val, AtMost, base + int64(delta))
assert(val, AtLeast, base - int64(delta))
}
}