Skip to content

Commit

Permalink
single-line assertion messages
Browse files Browse the repository at this point in the history
  • Loading branch information
abhinav committed Aug 15, 2022
1 parent 367c0ff commit d5d409e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
6 changes: 2 additions & 4 deletions zapcore/hook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ func TestHooks(t *testing.T) {
fac, logs := observer.New(tt.coreLevel)

// sanity check
require.Equal(t, tt.coreLevel, LevelOf(fac),
"Original logger has the wrong level")
require.Equal(t, tt.coreLevel, LevelOf(fac), "Original logger has the wrong level")

intField := makeInt64Field("foo", 42)
ent := Entry{Message: "bar", Level: tt.entryLevel}
Expand All @@ -64,8 +63,7 @@ func TestHooks(t *testing.T) {
}

t.Run("LevelOf", func(t *testing.T) {
assert.Equal(t, tt.coreLevel, LevelOf(h),
"Wrapped logger has the wrong log level")
assert.Equal(t, tt.coreLevel, LevelOf(h), "Wrapped logger has the wrong log level")
})

if tt.expectCall {
Expand Down
6 changes: 2 additions & 4 deletions zapcore/increase_level_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ func TestIncreaseLevel(t *testing.T) {
logger, logs := observer.New(tt.coreLevel)

// sanity check
require.Equal(t, tt.coreLevel, LevelOf(logger),
"Original logger has the wrong level")
require.Equal(t, tt.coreLevel, LevelOf(logger), "Original logger has the wrong level")

filteredLogger, err := NewIncreaseLevelCore(logger, tt.increaseLevel)
if tt.wantErr {
Expand All @@ -100,8 +99,7 @@ func TestIncreaseLevel(t *testing.T) {
require.NoError(t, err)

t.Run("LevelOf", func(t *testing.T) {
assert.Equal(t, tt.increaseLevel, LevelOf(filteredLogger),
"Filtered logger has the wrong level")
assert.Equal(t, tt.increaseLevel, LevelOf(filteredLogger), "Filtered logger has the wrong level")
})

for l := DebugLevel; l <= FatalLevel; l++ {
Expand Down
3 changes: 1 addition & 2 deletions zaptest/observer/observer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ func TestObserver(t *testing.T) {
assertEmpty(t, logs)

t.Run("LevelOf", func(t *testing.T) {
assert.Equal(t, zap.InfoLevel, zapcore.LevelOf(observer),
"Observer reported the wrong log level.")
assert.Equal(t, zap.InfoLevel, zapcore.LevelOf(observer), "Observer reported the wrong log level.")
})

assert.NoError(t, observer.Sync(), "Unexpected failure in no-op Sync")
Expand Down

0 comments on commit d5d409e

Please sign in to comment.