From 8ed55e128895bccd5e60555ed77a3e090d9f6f8f Mon Sep 17 00:00:00 2001 From: fatedier Date: Tue, 15 Mar 2016 18:45:57 +0800 Subject: [PATCH] test: improve test case --- Makefile | 2 +- src/frp/utils/broadcast/broadcast_test.go | 4 ++-- src/frp/utils/pcrypto/pcrypto_test.go | 6 +++--- src/frp/utils/version/version_test.go | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 1488621..4dbf0d9 100644 --- a/Makefile +++ b/Makefile @@ -18,4 +18,4 @@ frpc: GOPATH=$(NEW_GOPATH) godep go build -o bin/frpc ./src/frp/cmd/frpc test: - @GOPATH=$(NEW_GOPATH) godep go test ./... + @GOPATH=$(NEW_GOPATH) godep go test -v ./... diff --git a/src/frp/utils/broadcast/broadcast_test.go b/src/frp/utils/broadcast/broadcast_test.go index b1314fe..57aa5a8 100644 --- a/src/frp/utils/broadcast/broadcast_test.go +++ b/src/frp/utils/broadcast/broadcast_test.go @@ -29,7 +29,7 @@ var ( func TestBroadcast(t *testing.T) { b := NewBroadcast() if b == nil { - t.Errorf("New Broadcast error, nil return") + t.Fatalf("New Broadcast error, nil return") } defer b.Close() @@ -45,7 +45,7 @@ func TestBroadcast(t *testing.T) { wait.Wait() if succNum != totalNum { - t.Errorf("TotalNum %d, FailNum(timeout) %d", totalNum, totalNum-succNum) + t.Fatalf("TotalNum %d, FailNum(timeout) %d", totalNum, totalNum-succNum) } } diff --git a/src/frp/utils/pcrypto/pcrypto_test.go b/src/frp/utils/pcrypto/pcrypto_test.go index ea88c63..db552d5 100644 --- a/src/frp/utils/pcrypto/pcrypto_test.go +++ b/src/frp/utils/pcrypto/pcrypto_test.go @@ -25,7 +25,7 @@ func TestEncrypto(t *testing.T) { pp.Init([]byte("Hana")) res, err := pp.Encrypto([]byte("Just One Test!")) if err != nil { - t.Error(err) + t.Fatalf(err) } fmt.Printf("[%x]\n", res) @@ -36,12 +36,12 @@ func TestDecrypto(t *testing.T) { pp.Init([]byte("Hana")) res, err := pp.Encrypto([]byte("Just One Test!")) if err != nil { - t.Error(err) + t.Fatalf(err) } res, err = pp.Decrypto(res) if err != nil { - t.Error(err) + t.Fatalf(err) } fmt.Printf("[%s]\n", string(res)) diff --git a/src/frp/utils/version/version_test.go b/src/frp/utils/version/version_test.go index 0906d8a..ed66186 100644 --- a/src/frp/utils/version/version_test.go +++ b/src/frp/utils/version/version_test.go @@ -25,22 +25,22 @@ func TestFull(t *testing.T) { version := Full() arr := strings.Split(version, ".") if len(arr) != 3 { - t.Errorf("Version string error: %s", version) + t.Fatalf("Version string error: %s", version) } proto, err := strconv.ParseInt(arr[0], 10, 64) if err != nil || proto < 0 { - t.Errorf("Version proto error") + t.Fatalf("Version proto error") } major, err := strconv.ParseInt(arr[1], 10, 64) if err != nil || major < 0 { - t.Errorf("Version major error") + t.Fatalf("Version major error") } minor, err := strconv.ParseInt(arr[2], 10, 64) if err != nil || minor < 0 { - t.Errorf("Version minor error") + t.Fatalf("Version minor error") } } @@ -51,6 +51,6 @@ func TestVersion(t *testing.T) { parseVerion := fmt.Sprintf("%d.%d.%d", proto, major, minor) version := Full() if parseVerion != version { - t.Errorf("Get version incorrect, version [%s], parseVerion [%s]", version, parseVerion) + t.Fatalf("Get version incorrect, version [%s], parseVerion [%s]", version, parseVerion) } }