From b2ab992bb22a5cc4168c68034d582fae053bb478 Mon Sep 17 00:00:00 2001
From: q191201771 <191201771@qq.com>
Date: Sat, 14 Sep 2019 11:46:10 +0800
Subject: [PATCH] NewMockWriter return *MockWriter -> MockWriter

---
 pkg/bele/bele.go                  |  2 +-
 pkg/bele/bele_test.go             |  1 -
 pkg/log/log.go                    |  8 +++----
 pkg/log/log_test.go               |  2 +-
 pkg/mockwriter/mockwriter.go      | 11 ++++-----
 pkg/mockwriter/mockwriter_test.go | 38 +++++++++++++++++++++++++------
 pkg/unique/unique_test.go         |  2 +-
 7 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/pkg/bele/bele.go b/pkg/bele/bele.go
index a6b864d..389a88f 100644
--- a/pkg/bele/bele.go
+++ b/pkg/bele/bele.go
@@ -18,7 +18,7 @@ func BEUint16(p []byte) uint16 {
 }
 
 func BEUint24(p []byte) uint32 {
-	return uint32(p[2]) | uint32(p[1]) << 8 | uint32(p[0]) << 16
+	return uint32(p[2]) | uint32(p[1])<<8 | uint32(p[0])<<16
 }
 
 func BEUint32(p []byte) (ret uint32) {
diff --git a/pkg/bele/bele_test.go b/pkg/bele/bele_test.go
index 7231ec9..5ca7822 100644
--- a/pkg/bele/bele_test.go
+++ b/pkg/bele/bele_test.go
@@ -229,4 +229,3 @@ func BenchmarkWriteBE(b *testing.B) {
 		_ = WriteBE(out, in)
 	}
 }
-
diff --git a/pkg/log/log.go b/pkg/log/log.go
index c7cf1cd..bd48711 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -176,7 +176,7 @@ func (l *logger) Outputf(level Level, calldepth int, format string, v ...interfa
 
 	msg := fmt.Sprintf(format, v...) + shortFileSuffix(calldepth)
 	if l.stdoutLogger != nil {
-		_ = l.stdoutLogger.Output(calldepth, levelToColorString[level] + msg)
+		_ = l.stdoutLogger.Output(calldepth, levelToColorString[level]+msg)
 	}
 	if l.fileLogger != nil {
 		if l.c.RotateMByte > 0 {
@@ -195,7 +195,7 @@ func (l *logger) Outputf(level Level, calldepth int, format string, v ...interfa
 				}
 			}
 		}
-		_ = l.fileLogger.Output(calldepth, levelToString[level] + msg)
+		_ = l.fileLogger.Output(calldepth, levelToString[level]+msg)
 	}
 }
 
@@ -206,7 +206,7 @@ func (l *logger) Output(level Level, calldepth int, v ...interface{}) {
 
 	msg := fmt.Sprint(v...) + shortFileSuffix(calldepth)
 	if l.stdoutLogger != nil {
-		_ = l.stdoutLogger.Output(calldepth, levelToColorString[level] + msg)
+		_ = l.stdoutLogger.Output(calldepth, levelToColorString[level]+msg)
 	}
 	if l.fileLogger != nil {
 		if l.c.RotateMByte > 0 {
@@ -225,7 +225,7 @@ func (l *logger) Output(level Level, calldepth int, v ...interface{}) {
 				}
 			}
 		}
-		_ = l.fileLogger.Output(calldepth, levelToString[level] + msg)
+		_ = l.fileLogger.Output(calldepth, levelToString[level]+msg)
 	}
 }
 
diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go
index dd6f77f..cd9ff51 100644
--- a/pkg/log/log_test.go
+++ b/pkg/log/log_test.go
@@ -2,9 +2,9 @@ package log
 
 import (
 	"github.com/q191201771/nezha/pkg/assert"
+	originLog "log"
 	"os"
 	"testing"
-	originLog "log"
 )
 
 func TestLogger(t *testing.T) {
diff --git a/pkg/mockwriter/mockwriter.go b/pkg/mockwriter/mockwriter.go
index 65c6cf9..3d1cb3e 100644
--- a/pkg/mockwriter/mockwriter.go
+++ b/pkg/mockwriter/mockwriter.go
@@ -23,11 +23,11 @@ type MockWriter struct {
 	t     WriterType
 	ts    map[uint32]WriterType
 	count uint32
-	b bytes.Buffer
+	b     bytes.Buffer
 }
 
-func NewMockWriter(t WriterType) *MockWriter {
-	return &MockWriter{
+func NewMockWriter(t WriterType) MockWriter {
+	return MockWriter{
 		t: t,
 	}
 }
@@ -48,11 +48,10 @@ func (w *MockWriter) Write(b []byte) (int, error) {
 		return len(b), nil
 	case WriterTypeReturnError:
 		return 0, mockWriterErr
-	//case WriterTypeIntoBuffer:
-	//	return w.b.Write(b)
+		//case WriterTypeIntoBuffer:
+		//	return w.b.Write(b)
 	}
 
 	return w.b.Write(b)
-
 	//panic("never reach here.")
 }
diff --git a/pkg/mockwriter/mockwriter_test.go b/pkg/mockwriter/mockwriter_test.go
index 6abb571..14b88e5 100644
--- a/pkg/mockwriter/mockwriter_test.go
+++ b/pkg/mockwriter/mockwriter_test.go
@@ -11,10 +11,10 @@ func TestNewMockWriter(t *testing.T) {
 
 func TestMockWriter_Write(t *testing.T) {
 	var (
-		w *MockWriter
-		n int
+		w   MockWriter
+		n   int
 		err error
-		b = []byte("hello")
+		b   = []byte("hello")
 	)
 
 	w = NewMockWriter(WriterTypeDoNothing)
@@ -35,10 +35,10 @@ func TestMockWriter_Write(t *testing.T) {
 
 func TestMockWriter_SetSpecificType(t *testing.T) {
 	var (
-		w *MockWriter
-		n int
+		w   MockWriter
+		n   int
 		err error
-		b = []byte("hello")
+		b   = []byte("hello")
 	)
 	w = NewMockWriter(WriterTypeDoNothing)
 	w.SetSpecificType(map[uint32]WriterType{
@@ -69,4 +69,28 @@ func TestMockWriter_SetSpecificType(t *testing.T) {
 		assert.Equal(t, expectedLen[i], n)
 		assert.Equal(t, expectedErr[i], err)
 	}
-}
\ No newline at end of file
+}
+
+func BenchmarkNewMockWriter(b *testing.B) {
+	b.ReportAllocs()
+	var tmp uint32
+	for i := 0; i < b.N; i++ {
+		mw := NewMockWriter(WriterTypeDoNothing)
+		tmp = tmp + mw.count
+	}
+}
+
+func newMockWriter2(t WriterType) *MockWriter {
+	return &MockWriter{
+		t: t,
+	}
+}
+
+func BenchmarkNewMockWriter2(b *testing.B) {
+	b.ReportAllocs()
+	var tmp uint32
+	for i := 0; i < b.N; i++ {
+		mw := newMockWriter2(WriterTypeDoNothing)
+		tmp = tmp + mw.count
+	}
+}
diff --git a/pkg/unique/unique_test.go b/pkg/unique/unique_test.go
index 30c9f84..7bb236e 100644
--- a/pkg/unique/unique_test.go
+++ b/pkg/unique/unique_test.go
@@ -14,7 +14,7 @@ func TestGenUniqueKey(t *testing.T) {
 	for i := 0; i < 1000; i++ {
 		go func(j int) {
 			var uk string
-			if j % 2 == 0 {
+			if j%2 == 0 {
 				uk = GenUniqueKey("hello")
 			} else {
 				uk = GenUniqueKey("world")