remove dep on assert lib

app/stats/command/command_test.go

@@ -6,17 +6,18 @@ import (
 
 	"v2ray.com/core/app/stats"
 	. "v2ray.com/core/app/stats/command"
+	"v2ray.com/core/common"
 	. "v2ray.com/ext/assert"
 )
 
 func TestGetStats(t *testing.T) {
 	assert := With(t)
 
 	m, err := stats.NewManager(context.Background(), &stats.Config{})
-	assert(err, IsNil)
+	common.Must(err)
 
 	sc, err := m.RegisterCounter("test_counter")
-	assert(err, IsNil)
+	common.Must(err)
 
 	sc.Set(1)
 
@@ -50,7 +51,7 @@ func TestGetStats(t *testing.T) {
 		if tc.err {
 			assert(err, IsNotNil)
 		} else {
-			assert(err, IsNil)
+			common.Must(err)
 			assert(resp.Stat.Name, Equals, tc.name)
 			assert(resp.Stat.Value, Equals, tc.value)
 		}
@@ -61,25 +62,25 @@ func TestQueryStats(t *testing.T) {
 	assert := With(t)
 
 	m, err := stats.NewManager(context.Background(), &stats.Config{})
-	assert(err, IsNil)
+	common.Must(err)
 
 	sc1, err := m.RegisterCounter("test_counter")
-	assert(err, IsNil)
+	common.Must(err)
 	sc1.Set(1)
 
 	sc2, err := m.RegisterCounter("test_counter_2")
-	assert(err, IsNil)
+	common.Must(err)
 	sc2.Set(2)
 
 	sc3, err := m.RegisterCounter("test_counter_3")
-	assert(err, IsNil)
+	common.Must(err)
 	sc3.Set(3)
 
 	s := NewStatsServer(m)
 	resp, err := s.QueryStats(context.Background(), &QueryStatsRequest{
 		Pattern: "counter_",
 	})
-	assert(err, IsNil)
+	common.Must(err)
 	assert(len(resp.Stat), Equals, 2)
 
 	v2 := false

common/buf/reader_test.go

@@ -28,11 +28,11 @@ func TestBytesReaderWriteTo(t *testing.T) {
 	writer.SetBuffered(false)
 
 	nBytes, err := io.Copy(writer, reader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(nBytes, Equals, int64(6))
 
 	mb, err := pReader2.ReadMultiBuffer()
-	assert(err, IsNil)
+	common.Must(err)
 	assert(len(mb), Equals, 2)
 	assert(mb[0].String(), Equals, "abc")
 	assert(mb[1].String(), Equals, "efg")
@@ -52,7 +52,7 @@ func TestBytesReaderMultiBuffer(t *testing.T) {
 
 	mbReader := NewReader(reader)
 	mb, err := mbReader.ReadMultiBuffer()
-	assert(err, IsNil)
+	common.Must(err)
 	assert(len(mb), Equals, 2)
 	assert(mb[0].String(), Equals, "abc")
 	assert(mb[1].String(), Equals, "efg")

common/buf/writer_test.go

@@ -26,7 +26,7 @@ func TestWriter(t *testing.T) {
 	writer := NewBufferedWriter(NewWriter(writeBuffer))
 	writer.SetBuffered(false)
 	err := writer.WriteMultiBuffer(MultiBuffer{lb})
-	assert(err, IsNil)
+	common.Must(err)
 	assert(writer.Flush(), IsNil)
 	assert(expectedBytes, Equals, writeBuffer.Bytes())
 }
@@ -46,7 +46,7 @@ func TestBytesWriterReadFrom(t *testing.T) {
 	}
 
 	mb, err := pReader.ReadMultiBuffer()
-	assert(err, IsNil)
+	common.Must(err)
 	assert(mb.Len(), Equals, int32(size))
 }
 
@@ -58,7 +58,7 @@ func TestDiscardBytes(t *testing.T) {
 
 	nBytes, err := io.Copy(DiscardBytes, b)
 	assert(nBytes, Equals, int64(Size))
-	assert(err, IsNil)
+	common.Must(err)
 }
 
 func TestDiscardBytesMultiBuffer(t *testing.T) {
@@ -71,7 +71,7 @@ func TestDiscardBytesMultiBuffer(t *testing.T) {
 	r := NewReader(buffer)
 	nBytes, err := io.Copy(DiscardBytes, &BufferedReader{Reader: r})
 	assert(nBytes, Equals, int64(size))
-	assert(err, IsNil)
+	common.Must(err)
 }
 
 func TestWriterInterface(t *testing.T) {

common/crypto/auth_test.go

@@ -21,10 +21,10 @@ func TestAuthenticationReaderWriter(t *testing.T) {
 	key := make([]byte, 16)
 	rand.Read(key)
 	block, err := aes.NewCipher(key)
-	assert(err, IsNil)
+	common.Must(err)
 
 	aead, err := cipher.NewGCM(block)
-	assert(err, IsNil)
+	common.Must(err)
 
 	const payloadSize = 1024 * 80
 	rawPayload := make([]byte, payloadSize)
@@ -57,7 +57,7 @@ func TestAuthenticationReaderWriter(t *testing.T) {
 
 	for mb.Len() < payloadSize {
 		mb2, err := reader.ReadMultiBuffer()
-		assert(err, IsNil)
+		common.Must(err)
 
 		mb, _ = buf.MergeMulti(mb, mb2)
 	}
@@ -78,10 +78,10 @@ func TestAuthenticationReaderWriterPacket(t *testing.T) {
 	key := make([]byte, 16)
 	common.Must2(rand.Read(key))
 	block, err := aes.NewCipher(key)
-	assert(err, IsNil)
+	common.Must(err)
 
 	aead, err := cipher.NewGCM(block)
-	assert(err, IsNil)
+	common.Must(err)
 
 	cache := buf.New()
 	iv := make([]byte, 12)
@@ -105,7 +105,7 @@ func TestAuthenticationReaderWriterPacket(t *testing.T) {
 	assert(writer.WriteMultiBuffer(payload), IsNil)
 	assert(cache.Len(), GreaterThan, int32(0))
 	assert(writer.WriteMultiBuffer(buf.MultiBuffer{}), IsNil)
-	assert(err, IsNil)
+	common.Must(err)
 
 	reader := NewAuthenticationReader(&AEADAuthenticator{
 		AEAD:                    aead,
@@ -114,7 +114,7 @@ func TestAuthenticationReaderWriterPacket(t *testing.T) {
 	}, PlainChunkSizeParser{}, cache, protocol.TransferTypePacket, nil)
 
 	mb, err := reader.ReadMultiBuffer()
-	assert(err, IsNil)
+	common.Must(err)
 
 	mb, b1 := buf.SplitFirst(mb)
 	assert(b1.String(), Equals, "abcd")

common/crypto/chunk_test.go

@@ -40,7 +40,7 @@ func TestChunkStreamIO(t *testing.T) {
 	assert(mb[0].Bytes(), Equals, []byte("abcd"))
 
 	mb, err = reader.ReadMultiBuffer()
-	assert(err, IsNil)
+	common.Must(err)
 	assert(mb.Len(), Equals, int32(3))
 	assert(mb[0].Bytes(), Equals, []byte("efg"))
 

common/mux/mux_test.go

@@ -4,6 +4,7 @@ import (
 	"io"
 	"testing"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 	. "v2ray.com/core/common/mux"
 	"v2ray.com/core/common/net"
@@ -63,72 +64,72 @@ func TestReaderWriter(t *testing.T) {
 
 	var meta FrameMetadata
 	err := meta.Unmarshal(bytesReader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(meta.SessionID, Equals, uint16(1))
 	assert(byte(meta.SessionStatus), Equals, byte(SessionStatusNew))
 	assert(meta.Target, Equals, dest)
 	assert(byte(meta.Option), Equals, byte(OptionData))
 
 	data, err := readAll(NewStreamReader(bytesReader))
-	assert(err, IsNil)
+	common.Must(err)
 	assert(len(data), Equals, 1)
 	assert(data[0].String(), Equals, "abcd")
 
 	err = meta.Unmarshal(bytesReader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(byte(meta.SessionStatus), Equals, byte(SessionStatusNew))
 	assert(meta.SessionID, Equals, uint16(2))
 	assert(byte(meta.Option), Equals, byte(0))
 	assert(meta.Target, Equals, dest2)
 
 	err = meta.Unmarshal(bytesReader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(byte(meta.SessionStatus), Equals, byte(SessionStatusKeep))
 	assert(meta.SessionID, Equals, uint16(1))
 	assert(byte(meta.Option), Equals, byte(1))
 
 	data, err = readAll(NewStreamReader(bytesReader))
-	assert(err, IsNil)
+	common.Must(err)
 	assert(len(data), Equals, 1)
 	assert(data[0].String(), Equals, "efgh")
 
 	err = meta.Unmarshal(bytesReader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(byte(meta.SessionStatus), Equals, byte(SessionStatusNew))
 	assert(meta.SessionID, Equals, uint16(3))
 	assert(byte(meta.Option), Equals, byte(1))
 	assert(meta.Target, Equals, dest3)
 
 	data, err = readAll(NewStreamReader(bytesReader))
-	assert(err, IsNil)
+	common.Must(err)
 	assert(len(data), Equals, 1)
 	assert(data[0].String(), Equals, "x")
 
 	err = meta.Unmarshal(bytesReader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(byte(meta.SessionStatus), Equals, byte(SessionStatusEnd))
 	assert(meta.SessionID, Equals, uint16(1))
 	assert(byte(meta.Option), Equals, byte(0))
 
 	err = meta.Unmarshal(bytesReader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(byte(meta.SessionStatus), Equals, byte(SessionStatusEnd))
 	assert(meta.SessionID, Equals, uint16(3))
 	assert(byte(meta.Option), Equals, byte(0))
 
 	err = meta.Unmarshal(bytesReader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(byte(meta.SessionStatus), Equals, byte(SessionStatusKeep))
 	assert(meta.SessionID, Equals, uint16(2))
 	assert(byte(meta.Option), Equals, byte(1))
 
 	data, err = readAll(NewStreamReader(bytesReader))
-	assert(err, IsNil)
+	common.Must(err)
 	assert(len(data), Equals, 1)
 	assert(data[0].String(), Equals, "y")
 
 	err = meta.Unmarshal(bytesReader)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(byte(meta.SessionStatus), Equals, byte(SessionStatusEnd))
 	assert(meta.SessionID, Equals, uint16(2))
 	assert(byte(meta.Option), Equals, byte(0))

common/platform/platform_test.go

@@ -6,6 +6,7 @@ import (
 	"runtime"
 	"testing"
 
+	"v2ray.com/core/common"
 	. "v2ray.com/core/common/platform"
 	. "v2ray.com/ext/assert"
 )
@@ -47,7 +48,7 @@ func TestGetAssetLocation(t *testing.T) {
 	assert := With(t)
 
 	exec, err := os.Executable()
-	assert(err, IsNil)
+	common.Must(err)
 
 	loc := GetAssetLocation("t")
 	assert(filepath.Dir(loc), Equals, filepath.Dir(exec))
@@ -64,7 +65,7 @@ func TestGetPluginLocation(t *testing.T) {
 	assert := With(t)
 
 	exec, err := os.Executable()
-	assert(err, IsNil)
+	common.Must(err)
 
 	loc := GetPluginDirectory()
 	assert(loc, Equals, filepath.Join(filepath.Dir(exec), "plugins"))

common/protocol/http/headers_test.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/net"
-
 	. "v2ray.com/core/common/protocol/http"
 	. "v2ray.com/ext/assert"
 )
@@ -41,7 +41,7 @@ Accept-Language: de,en;q=0.7,en-us;q=0.3
 `
 	b := bufio.NewReader(strings.NewReader(rawRequest))
 	req, err := http.ReadRequest(b)
-	assert(err, IsNil)
+	common.Must(err)
 	assert(req.Header.Get("Foo"), Equals, "foo")
 	assert(req.Header.Get("Bar"), Equals, "bar")
 	assert(req.Header.Get("Connection"), Equals, "keep-alive,Foo, Bar")

common/retry/retry_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/errors"
 	. "v2ray.com/core/common/retry"
 	. "v2ray.com/ext/assert"
@@ -22,7 +23,7 @@ func TestNoRetry(t *testing.T) {
 	})
 	endTime := time.Now().Unix()
 
-	assert(err, IsNil)
+	common.Must(err)
 	assert(endTime-startTime, AtLeast, int64(0))
 }
 
@@ -40,7 +41,7 @@ func TestRetryOnce(t *testing.T) {
 	})
 	duration := time.Since(startTime)
 
-	assert(err, IsNil)
+	common.Must(err)
 	assert(int64(duration/time.Millisecond), AtLeast, int64(900))
 }
 
@@ -58,7 +59,7 @@ func TestRetryMultiple(t *testing.T) {
 	})
 	duration := time.Since(startTime)
 
-	assert(err, IsNil)
+	common.Must(err)
 	assert(int64(duration/time.Millisecond), AtLeast, int64(4900))
 }