remove dep on assert lib

proxy/mtproto/auth_test.go

@@ -9,7 +9,6 @@ import (
 
 	"v2ray.com/core/common"
 	. "v2ray.com/core/proxy/mtproto"
-	. "v2ray.com/ext/assert"
 )
 
 func TestInverse(t *testing.T) {
@@ -31,15 +30,24 @@ func TestInverse(t *testing.T) {
 }
 
 func TestAuthenticationReadWrite(t *testing.T) {
-	assert := With(t)
-
 	a := NewAuthentication(DefaultSessionContext())
 	b := bytes.NewReader(a.Header[:])
 	a2, err := ReadAuthentication(b)
-	assert(err, IsNil)
+	common.Must(err)
 
-	assert(a.EncodingKey[:], Equals, a2.DecodingKey[:])
-	assert(a.EncodingNonce[:], Equals, a2.DecodingNonce[:])
-	assert(a.DecodingKey[:], Equals, a2.EncodingKey[:])
-	assert(a.DecodingNonce[:], Equals, a2.EncodingNonce[:])
+	if r := cmp.Diff(a.EncodingKey[:], a2.DecodingKey[:]); r != "" {
+		t.Error("decoding key: ", r)
+	}
+
+	if r := cmp.Diff(a.EncodingNonce[:], a2.DecodingNonce[:]); r != "" {
+		t.Error("decoding nonce: ", r)
+	}
+
+	if r := cmp.Diff(a.DecodingKey[:], a2.EncodingKey[:]); r != "" {
+		t.Error("encoding key: ", r)
+	}
+
+	if r := cmp.Diff(a.DecodingNonce[:], a2.EncodingNonce[:]); r != "" {
+		t.Error("encoding nonce: ", r)
+	}
 }

proxy/shadowsocks/protocol_test.go

@@ -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())
+		}
 	}
 }

proxy/vmess/encoding/encoding_test.go

@@ -58,7 +58,7 @@ func TestRequestSerialization(t *testing.T) {
 
 	server := NewServerSession(userValidator, sessionHistory)
 	actualRequest, err := server.DecodeRequestHeader(buffer)
-	assert(err, IsNil)
+	common.Must(err)
 
 	assert(expectedRequest.Version, Equals, actualRequest.Version)
 	assert(byte(expectedRequest.Command), Equals, byte(actualRequest.Command))
@@ -151,7 +151,7 @@ func TestMuxRequest(t *testing.T) {
 
 	server := NewServerSession(userValidator, sessionHistory)
 	actualRequest, err := server.DecodeRequestHeader(buffer)
-	assert(err, IsNil)
+	common.Must(err)
 
 	assert(expectedRequest.Version, Equals, actualRequest.Version)
 	assert(byte(expectedRequest.Command), Equals, byte(actualRequest.Command))

proxy/vmess/validator_test.go

@@ -9,12 +9,9 @@ import (
 	"v2ray.com/core/common/serial"
 	"v2ray.com/core/common/uuid"
 	. "v2ray.com/core/proxy/vmess"
-	. "v2ray.com/ext/assert"
 )
 
 func TestUserValidator(t *testing.T) {
-	assert := With(t)
-
 	hasher := protocol.DefaultIDHash
 	v := NewTimedUserValidator(hasher)
 	defer common.Close(v)
@@ -43,9 +40,15 @@ func TestUserValidator(t *testing.T) {
 			userHash := idHash.Sum(nil)
 
 			euser, ets, found := v.Get(userHash)
-			assert(found, IsTrue)
-			assert(euser.Email, Equals, user.Email)
-			assert(int64(ets), Equals, int64(ts))
+			if !found {
+				t.Fatal("user not found")
+			}
+			if euser.Email != user.Email {
+				t.Error("unexpected user email: ", euser.Email, " want ", user.Email)
+			}
+			if ets != ts {
+				t.Error("unexpected timestamp: ", ets, " want ", ts)
+			}
 		}
 
 		testSmallLag(0)
@@ -65,8 +68,9 @@ func TestUserValidator(t *testing.T) {
 			userHash := idHash.Sum(nil)
 
 			euser, _, found := v.Get(userHash)
-			assert(found, IsFalse)
-			assert(euser, IsNil)
+			if found || euser != nil {
+				t.Error("unexpected user")
+			}
 		}
 
 		testBigLag(121)
@@ -77,6 +81,10 @@ func TestUserValidator(t *testing.T) {
 		testBigLag(-500)
 	}
 
-	assert(v.Remove(user.Email), IsTrue)
-	assert(v.Remove(user.Email), IsFalse)
+	if v := v.Remove(user.Email); !v {
+		t.Error("unable to remove user")
+	}
+	if v := v.Remove(user.Email); v {
+		t.Error("remove user twice")
+	}
 }