Merge pull request #1427 from dolmen/fix-testify-usage

testing: fix usage of the Testify API

Author: thaJeztah

entry_test.go

@@ -241,20 +241,20 @@ func TestEntryWithIncorrectField(t *testing.T) {
 	eWithFunc := e.WithFields(Fields{"func": fn})
 	eWithFuncPtr := e.WithFields(Fields{"funcPtr": &fn})
 
-	assert.Equal(eWithFunc.err, `can not add field "func"`)
-	assert.Equal(eWithFuncPtr.err, `can not add field "funcPtr"`)
+	assert.Equal(`can not add field "func"`, eWithFunc.err)
+	assert.Equal(`can not add field "funcPtr"`, eWithFuncPtr.err)
 
 	eWithFunc = eWithFunc.WithField("not_a_func", "it is a string")
 	eWithFuncPtr = eWithFuncPtr.WithField("not_a_func", "it is a string")
 
-	assert.Equal(eWithFunc.err, `can not add field "func"`)
-	assert.Equal(eWithFuncPtr.err, `can not add field "funcPtr"`)
+	assert.Equal(`can not add field "func"`, eWithFunc.err)
+	assert.Equal(`can not add field "funcPtr"`, eWithFuncPtr.err)
 
 	eWithFunc = eWithFunc.WithTime(time.Now())
 	eWithFuncPtr = eWithFuncPtr.WithTime(time.Now())
 
-	assert.Equal(eWithFunc.err, `can not add field "func"`)
-	assert.Equal(eWithFuncPtr.err, `can not add field "funcPtr"`)
+	assert.Equal(`can not add field "func"`, eWithFunc.err)
+	assert.Equal(`can not add field "funcPtr"`, eWithFuncPtr.err)
 }
 
 func TestEntryLogfLevel(t *testing.T) {

hook_test.go

@@ -41,11 +41,11 @@ func TestHookFires(t *testing.T) {
 
 	LogAndAssertJSON(t, func(log *Logger) {
 		log.Hooks.Add(hook)
-		assert.Equal(t, hook.Fired, false)
+		assert.False(t, hook.Fired)
 
 		log.Print("test")
 	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, true)
+		assert.True(t, hook.Fired)
 	})
 }
 
@@ -76,7 +76,7 @@ func TestHookCanModifyEntry(t *testing.T) {
 		log.Hooks.Add(hook)
 		log.WithField("wow", "elephant").Print("test")
 	}, func(fields Fields) {
-		assert.Equal(t, fields["wow"], "whale")
+		assert.Equal(t, "whale", fields["wow"])
 	})
 }
 
@@ -90,8 +90,8 @@ func TestCanFireMultipleHooks(t *testing.T) {
 
 		log.WithField("wow", "elephant").Print("test")
 	}, func(fields Fields) {
-		assert.Equal(t, fields["wow"], "whale")
-		assert.Equal(t, hook2.Fired, true)
+		assert.Equal(t, "whale", fields["wow"])
+		assert.True(t, hook2.Fired)
 	})
 }
 
@@ -157,7 +157,7 @@ func TestErrorHookShouldntFireOnInfo(t *testing.T) {
 		log.Hooks.Add(hook)
 		log.Info("test")
 	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, false)
+		assert.False(t, hook.Fired)
 	})
 }
 
@@ -168,7 +168,7 @@ func TestErrorHookShouldFireOnError(t *testing.T) {
 		log.Hooks.Add(hook)
 		log.Error("test")
 	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, true)
+		assert.True(t, hook.Fired)
 	})
 }
 

hooks/writer/writer_test.go

@@ -33,6 +33,6 @@ func TestDifferentLevelsGoToDifferentWriters(t *testing.T) {
 	log.Warn("send to a")
 	log.Info("send to b")
 
-	assert.Equal(t, a.String(), "level=warning msg=\"send to a\"\n")
-	assert.Equal(t, b.String(), "level=info msg=\"send to b\"\n")
+	assert.Equal(t, "level=warning msg=\"send to a\"\n", a.String())
+	assert.Equal(t, "level=info msg=\"send to b\"\n", b.String())
 }

logger_test.go

@@ -70,7 +70,7 @@ func TestWarninglnNotEqualToWarning(t *testing.T) {
 
 type testBufferPool struct {
 	buffers []*bytes.Buffer
-	get int
+	get     int
 }
 
 func (p *testBufferPool) Get() *bytes.Buffer {
@@ -92,6 +92,6 @@ func TestLogger_SetBufferPool(t *testing.T) {
 
 	l.Info("test")
 
-	assert.Equal(t, pool.get, 1, "Logger.SetBufferPool(): The BufferPool.Get() must be called")
+	assert.Equal(t, 1, pool.get, "Logger.SetBufferPool(): The BufferPool.Get() must be called")
 	assert.Len(t, pool.buffers, 1, "Logger.SetBufferPool(): The BufferPool.Put() must be called")
 }