Skip to content

Commit 20cce02

Browse files
committed
Use the new assertions.
1 parent f6dffd2 commit 20cce02

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

log/test/test_loglevel.lua

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ local suite = require 'suite'
33
local filepath = require 'filepath'
44
local ioutil = require 'ioutil'
55
local assert = require 'assert'
6+
local strings = require 'strings'
67

78
local LogLevelSuite = suite.Suite:new {
89
stderr = io.stderr,
@@ -25,50 +26,54 @@ function LogLevelSuite:getOutput()
2526
end
2627

2728
function TestLogLevelSuite(t)
28-
assert(suite.Run(t, LogLevelSuite) > 0, 'no tests in suite')
29+
assert:Greater(t, suite.Run(t, LogLevelSuite), 0, 'no tests in suite')
2930
end
3031

3132
function LogLevelSuite:TestLogObjectsExist()
32-
assert(log.DEBUG)
33-
assert(log.INFO)
34-
assert(log.WARN)
35-
assert(log.ERROR)
33+
assert:NotNil(self:T(), log.DEBUG)
34+
assert:NotNil(self:T(), log.INFO)
35+
assert:NotNil(self:T(), log.WARN)
36+
assert:NotNil(self:T(), log.ERROR)
3637
end
3738

3839
function LogLevelSuite:TestDebugNoContent()
3940
log.DEBUG:print('foobar')
4041
local got, err = self:getOutput()
41-
assert(not err, err)
42-
assert(got == "", string.format([[expected empty got "%s"]], got))
42+
assert:NoError(self:T(), err)
43+
assert:NotNil(self:T(), got)
44+
assert:Equal(self:T(), "", strings.trim_space(got))
4345
end
4446

4547
function LogLevelSuite:TestDebugWithDebugSetHasContent()
4648
log.set_level('DEBUG')
4749
log.DEBUG:print('foobar')
4850
local got, err = self:getOutput()
49-
assert(not err, err)
50-
assert(got ~= "", got)
51+
assert:NoError(self:T(), err)
52+
assert:NotNil(self:T(), got)
53+
assert:NotEqual(self:T(), "", strings.trim_space(got))
5154
end
5255

5356
function LogLevelSuite:TestInfoHasContent()
5457
log.set_level('INFO')
5558
log.INFO:print('foobar')
5659
local got, err = self:getOutput()
57-
assert(not err, err)
58-
assert(got ~= "", got)
60+
assert:NoError(self:T(), err)
61+
assert:NotNil(self:T(), got)
62+
assert:NotEqual(self:T(), "", strings.trim_space(got))
5963
end
6064

6165
function LogLevelSuite:TestErrorHasContent()
6266
log.ERROR:print('foobar')
6367
local got, err = self:getOutput()
64-
assert(not err, err)
65-
assert(got ~= "", got)
68+
assert:NoError(self:T(), err)
69+
assert:NotNil(self:T(), got)
70+
assert:NotEqual(self:T(), "", strings.trim_space(got))
6671
end
6772

6873
function LogLevelSuite:TestBogusLogLevelHasError()
6974
local ok, err = pcall(log.set_level, 'DJFDJFDJFJF')
70-
assert(not ok)
71-
assert(err)
75+
assert:False(self:T(), ok)
76+
assert:Error(self:T(), err)
7277
end
7378

7479
function LogLevelSuite:TestLogNew()

0 commit comments

Comments
 (0)