1- // Copyright (c) 2016 Jeevanandam M (https://github.com/jeevatkm)
1+ // Copyright (c) Jeevanandam M (https://github.com/jeevatkm)
22// go-aah/log source code and usage is governed by a MIT style
33// license that can be found in the LICENSE file.
44
@@ -10,6 +10,8 @@ import (
1010 "path/filepath"
1111 "strings"
1212 "testing"
13+
14+ "github.com/go-aah/test/assert"
1315)
1416
1517func TestDefaultStandardLogger (t * testing.T ) {
@@ -35,9 +37,7 @@ func TestDefaultStandardLogger(t *testing.T) {
3537 t .Logf ("Second round: %#v\n \n " , Stats ())
3638
3739 err := SetPattern ("%level:-5 %shortfile %line %unknown" )
38- if err == nil {
39- t .Error ("Expected error got nil" )
40- }
40+ assert .NotNil (t , err )
4141}
4242
4343func TestNewCustomUTCConsoleReceiver (t * testing.T ) {
@@ -53,10 +53,7 @@ level = "debug"
5353pattern = "%utctime:2006-01-02 15:04:05.000 %level:-5 %line %shortfile:-25 %custom:- %message"
5454 `
5555 logger , err := New (config )
56- if err != nil {
57- t .Errorf ("Unexpected error: %v" , err )
58- t .FailNow ()
59- }
56+ assert .FailNowOnError (t , err , "unexpected error" )
6057
6158 logger .Trace ("I shoudn't see this msg, because standard logger level is DEBUG" )
6259 logger .Debug ("I would like to see this message, debug is useful for dev" )
@@ -66,9 +63,7 @@ pattern = "%utctime:2006-01-02 15:04:05.000 %level:-5 %line %shortfile:-25 %cust
6663
6764 stats := logger .Stats ()
6865 t .Logf ("First round: %#v\n " , stats )
69- if stats .bytes != 433 {
70- t .Errorf ("Expected: 433, got: %v\n " , stats .bytes )
71- }
66+ assert .Equal (t , int64 (433 ), stats .bytes )
7267
7368 logger .Tracef ("I shoudn't see this msg, because standard logger level is DEBUG: %v" , 4 )
7469 logger .Debugf ("I would like to see this message, debug is useful for dev: %v" , 3 )
@@ -78,18 +73,14 @@ pattern = "%utctime:2006-01-02 15:04:05.000 %level:-5 %line %shortfile:-25 %cust
7873
7974 stats = logger .Stats ()
8075 t .Logf ("Second round: %#v\n " , stats )
81- if stats .bytes != 878 {
82- t .Errorf ("Expected: 878, got: %v\n " , stats .bytes )
83- }
76+ assert .Equal (t , int64 (878 ), stats .bytes )
8477
8578 Tracef ("I shoudn't see this msg: %v" , 46583 )
8679 Debugf ("I would like to see this message, debug is useful for dev: %v" , 334545 )
8780
8881 stats = logger .Stats ()
8982 t .Logf ("Third round: %#v\n " , stats )
90- if stats .bytes != 878 {
91- t .Errorf ("Expected: 878, got: %v\n " , stats .bytes )
92- }
83+ assert .Equal (t , int64 (878 ), stats .bytes )
9384}
9485
9586func TestNewCustomConsoleReceiver (t * testing.T ) {
@@ -99,10 +90,7 @@ func TestNewCustomConsoleReceiver(t *testing.T) {
9990receiver = "CONSOLE"
10091 `
10192 logger , err := New (config )
102- if err != nil {
103- t .Errorf ("Unexpected error: %v" , err )
104- t .FailNow ()
105- }
93+ assert .FailNowOnError (t , err , "unexpected error" )
10694
10795 logger .Trace ("I shoudn't see this msg, because standard logger level is DEBUG" )
10896 logger .Debug ("I would like to see this message, debug is useful for dev" )
@@ -112,9 +100,7 @@ receiver = "CONSOLE"
112100
113101 stats := logger .Stats ()
114102 t .Logf ("First round: %#v\n " , stats )
115- if stats .bytes != 313 {
116- t .Errorf ("Expected: 313, got: %v" , stats .bytes )
117- }
103+ assert .Equal (t , int64 (313 ), stats .bytes )
118104
119105 logger .Tracef ("I shoudn't see this msg, because standard logger level is DEBUG: %v" , 4 )
120106 logger .Debugf ("I would like to see this message, debug is useful for dev: %v" , 3 )
@@ -124,18 +110,14 @@ receiver = "CONSOLE"
124110
125111 stats = logger .Stats ()
126112 t .Logf ("Second round: %#v\n " , stats )
127- if stats .bytes != 638 {
128- t .Errorf ("Expected: 638, got: %v" , stats .bytes )
129- }
113+ assert .Equal (t , int64 (638 ), stats .bytes )
130114
131115 Tracef ("I shoudn't see this msg: %v" , 46583 )
132116 Debugf ("I would like to see this message, debug is useful for dev: %v" , 334545 )
133117
134118 stats = logger .Stats ()
135119 t .Logf ("Third round: %#v\n " , stats )
136- if stats .bytes != 638 {
137- t .Errorf ("Expected: 638, got: %v" , stats .bytes )
138- }
120+ assert .Equal (t , int64 (638 ), stats .bytes )
139121}
140122
141123func TestNewCustomFileReceiverDailyRotation (t * testing.T ) {
@@ -160,10 +142,7 @@ rotate {
160142 `
161143
162144 logger , err := New (fileLoggerConfig )
163- if err != nil {
164- t .Errorf ("Unexpected error: %v" , err )
165- t .FailNow ()
166- }
145+ assert .FailNowOnError (t , err , "unexpected error" )
167146
168147 for i := 0 ; i < 25 ; i ++ {
169148 logger .Trace ("I shoudn't see this msg, because standard logger level is DEBUG" )
@@ -184,9 +163,7 @@ rotate {
184163
185164 // Close scenario
186165 logger .Close ()
187- if ! logger .Closed () {
188- t .Errorf ("Expected 'true', got %v" , logger .Closed ())
189- }
166+ assert .Equal (t , true , logger .Closed ())
190167
191168 logger .Info ("This won't be written to file" )
192169
@@ -222,10 +199,7 @@ rotate {
222199 `
223200
224201 logger , err := New (fileLoggerConfig )
225- if err != nil {
226- t .Errorf ("Unexpected error: %v" , err )
227- t .FailNow ()
228- }
202+ assert .FailNowOnError (t , err , "unexpected error" )
229203
230204 for i := 0 ; i < 25 ; i ++ {
231205 logger .Trace ("I shoudn't see this msg, because standard logger level is DEBUG" )
@@ -261,10 +235,7 @@ rotate {
261235 `
262236
263237 logger , err := New (fileLoggerConfig )
264- if err != nil {
265- t .Errorf ("Unexpected error: %v" , err )
266- t .FailNow ()
267- }
238+ assert .FailNowOnError (t , err , "unexpected error" )
268239
269240 // Size based rotation, dump more value into receiver
270241 for i := 0 ; i < 5000 ; i ++ {
@@ -284,10 +255,7 @@ rotate {
284255
285256func TestUnknownFormatFlag (t * testing.T ) {
286257 _ , err := parseFlag ("" )
287- if err != ErrFormatStringEmpty {
288- t .Errorf ("Unexpected error: %v" , err )
289- t .FailNow ()
290- }
258+ assert .Equal (t , ErrFormatStringEmpty , err )
291259
292260 _ , err = parseFlag ("%time:2006-01-02 15:04:05.000 %level:-5 %longfile %unknown %custom:- %message" )
293261 if ! strings .Contains (err .Error (), "unrecognized log format flag" ) {
@@ -298,27 +266,21 @@ func TestUnknownFormatFlag(t *testing.T) {
298266
299267func TestNewMisc (t * testing.T ) {
300268 _ , err := New ("" )
301- if err .Error () != "logger config is empty" {
302- t .Errorf ("Unexpected error: %v" , err )
303- t .FailNow ()
304- }
269+ assert .Equal (t , "logger config is empty" , err .Error ())
305270
306271 _ , err = New (`receiver = "file" level="info"` )
307272 if ! strings .HasPrefix (err .Error (), "syntax error" ) {
308273 t .Errorf ("Unexpected error: %v" , err )
309- t .FailNow ()
310274 }
311275
312276 _ , err = New (`level="info";` )
313277 if ! strings .HasPrefix (err .Error (), "receiver configuration" ) {
314278 t .Errorf ("Unexpected error: %v" , err )
315- t .FailNow ()
316279 }
317280
318281 _ , err = New (`receiver = "file"; level="unknown";` )
319282 if ! strings .HasPrefix (err .Error (), "unrecognized log level" ) {
320283 t .Errorf ("Unexpected error: %v" , err )
321- t .FailNow ()
322284 }
323285
324286 _ , err = New (`receiver = "remote"; level="debug";` )
@@ -330,26 +292,20 @@ func TestNewMisc(t *testing.T) {
330292 _ , err = New (`receiver = "file"; level="debug"; rotate { mode="size"; size=2500; }` )
331293 if ! strings .HasPrefix (err .Error (), "maximum 2GB file size" ) {
332294 t .Errorf ("Unexpected error: %v" , err )
333- t .FailNow ()
334295 }
335296
336297 _ , err = New (`receiver = "console"; level="debug"; pattern="%time:2006-01-02 15:04:05.000 %level:-5 %unknown %message";` )
337298 if ! strings .HasPrefix (err .Error (), "unrecognized log format flag" ) {
338299 t .Errorf ("Unexpected error: %v" , err )
339- t .FailNow ()
340300 }
341301}
342302
343303func TestLevelUnknown (t * testing.T ) {
344304 var level Level
345- if level .String () != "ERROR" {
346- t .Errorf ("Expected level 'ERROR', got '%v'" , level )
347- }
305+ assert .Equal (t , "ERROR" , level .String ())
348306
349307 level = 9 // Unknown log level
350- if level .String () != "Unknown" {
351- t .Errorf ("Expected level 'Unknown', got '%v'" , level )
352- }
308+ assert .Equal (t , "Unknown" , level .String ())
353309}
354310
355311func TestStats (t * testing.T ) {
@@ -358,13 +314,8 @@ func TestStats(t *testing.T) {
358314 bytes : 764736 ,
359315 }
360316
361- if stats .Bytes () != 764736 {
362- t .Errorf ("Expected '764736' bytes, got '%v' bytes" , stats .Bytes ())
363- }
364-
365- if stats .Lines () != 200 {
366- t .Errorf ("Expected '200' lines, got '%v' lines" , stats .Lines ())
367- }
317+ assert .Equal (t , int64 (764736 ), stats .Bytes ())
318+ assert .Equal (t , int64 (200 ), stats .Lines ())
368319}
369320
370321func cleaupFiles (match string ) {
0 commit comments