Skip to content

Commit e2a9f1d

Browse files
authored
Merge pull request #8 from blendle/version-2.2
Add "TestNewWarn" convenience function
2 parents a177ab8 + 3a60920 commit e2a9f1d

2 files changed

Lines changed: 25 additions & 2 deletions

File tree

testing.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ func TestNew(tb testing.TB, options ...zap.Option) (*zap.Logger, *observer.Obser
1616
return TestNewWithLevel(tb, zapcore.DebugLevel, options...)
1717
}
1818

19+
// TestNewWarn is equal to TestNew, except that it sets the minimum log level
20+
// required to record an entry in the recorder to "Warn". This convenience
21+
// function can be used to validate that no warnings, or errors are logged when
22+
// testing a unit of code.
23+
func TestNewWarn(tb testing.TB, options ...zap.Option) (*zap.Logger, *observer.ObservedLogs) {
24+
tb.Helper()
25+
26+
return TestNewWithLevel(tb, zapcore.WarnLevel, options...)
27+
}
28+
1929
// TestNewWithLevel is equal to TestNew, except that it takes an extra argument,
2030
// dictating the minimum log level required to record an entry in the recorder.
2131
func TestNewWithLevel(tb testing.TB, level zapcore.LevelEnabler, options ...zap.Option) (*zap.Logger, *observer.ObservedLogs) {

testing_test.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,27 @@ func TestTestNew(t *testing.T) {
2121
assert.Len(t, logs.All(), 1)
2222
}
2323

24+
func TestTestNewWarn(t *testing.T) {
25+
t.Parallel()
26+
27+
logger, logs := logger.TestNewWarn(t)
28+
logger.Debug("")
29+
logger.Warn("")
30+
logger.Error("")
31+
32+
require.Len(t, logs.All(), 2)
33+
assert.Equal(t, zapcore.WarnLevel, logs.All()[0].Level)
34+
assert.Equal(t, zapcore.ErrorLevel, logs.All()[1].Level)
35+
}
36+
2437
func TestTestNewWithLevel(t *testing.T) {
2538
t.Parallel()
2639

2740
logger, logs := logger.TestNewWithLevel(t, zapcore.ErrorLevel)
2841
logger.Debug("")
2942
logger.Warn("")
30-
logger.Error("error")
31-
logger.DPanic("dpanic")
43+
logger.Error("")
44+
logger.DPanic("")
3245

3346
require.Len(t, logs.All(), 2)
3447
assert.Equal(t, zapcore.ErrorLevel, logs.All()[0].Level)

0 commit comments

Comments
 (0)