| @@ -195,7 +195,7 @@ func findBug(tb tb, seed uint64, prop func(*T)) (uint64, int, int, *testError) { · 194 unmodified lines |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | func checkOnce(t *T, prop func(*T)) (err *testError) { |
| 198 | | − if t.log && t.tb != nil { |
| 198 | + if t.tbLog && t.tb != nil { |
| 199 | 199 | t.tb.Helper() |
| 200 | 200 | } |
| 201 | 201 | defer func() { err = panicToError(recover(), 3) }() |
| @@ -301,8 +301,8 @@ type tb interface { · 99 unmodified lines |
| 301 | 301 | |
| 302 | 302 | type T struct { |
| 303 | 303 | tb // unnamed to force re-export of (*T).Helper() |
| 304 | | − log bool |
| 305 | | − rapidLog *log.Logger |
| 304 | + tbLog bool |
| 305 | + rawLog *log.Logger |
| 306 | 306 | s bitStream |
| 307 | 307 | draws int |
| 308 | 308 | refDraws []value |
| @@ -310,10 +310,10 @@ type T struct { · 1 unmodified line |
| 310 | 310 | failed stopTest |
| 311 | 311 | } |
| 312 | 312 | |
| 313 | | −func newT(tb tb, s bitStream, log_ bool, refDraws ...value) *T { |
| 313 | +func newT(tb tb, s bitStream, tbLog bool, refDraws ...value) *T { |
| 314 | 314 | t := &T{ |
| 315 | 315 | tb: tb, |
| 316 | | − log: log_, |
| 316 | + tbLog: tbLog, |
| 317 | 317 | s: s, |
| 318 | 318 | refDraws: refDraws, |
| 319 | 319 | } |
| @@ -324,7 +324,7 @@ func newT(tb tb, s bitStream, log_ bool, refDraws ...value) *T { · 4 unmodified lines |
| 324 | 324 | testName = tb.Name() |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | | − t.rapidLog = log.New(os.Stdout, fmt.Sprintf("[%v] ", testName), 0) |
| 327 | + t.rawLog = log.New(os.Stdout, fmt.Sprintf("[%v] ", testName), 0) |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | return t |
| @@ -340,12 +340,12 @@ func (t *T) draw(g *Generator, label string) value { · 9 unmodified lines |
| 340 | 340 | } |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | | − if t.log || t.rapidLog != nil { |
| 343 | + if t.tbLog || t.rawLog != nil { |
| 344 | 344 | if label == "" { |
| 345 | 345 | label = fmt.Sprintf("#%v", t.draws) |
| 346 | 346 | } |
| 347 | 347 | |
| 348 | | − if t.log && t.tb != nil { |
| 348 | + if t.tbLog && t.tb != nil { |
| 349 | 349 | t.tb.Helper() |
| 350 | 350 | } |
| 351 | 351 | t.Logf("[rapid] draw %v: %#v", label, v) |
| @@ -357,22 +357,22 @@ func (t *T) draw(g *Generator, label string) value { · 5 unmodified lines |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | func (t *T) shouldLog() bool { |
| 360 | | − return t.rapidLog != nil || (t.log && t.tb != nil) |
| 360 | + return t.rawLog != nil || (t.tbLog && t.tb != nil) |
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | func (t *T) Logf(format string, args ...interface{}) { |
| 364 | | − if t.rapidLog != nil { |
| 365 | | − t.rapidLog.Printf(format, args...) |
| 366 | | − } else if t.log && t.tb != nil { |
| 364 | + if t.rawLog != nil { |
| 365 | + t.rawLog.Printf(format, args...) |
| 366 | + } else if t.tbLog && t.tb != nil { |
| 367 | 367 | t.tb.Helper() |
| 368 | 368 | t.tb.Logf(format, args...) |
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | func (t *T) Log(args ...interface{}) { |
| 373 | | − if t.rapidLog != nil { |
| 374 | | − t.rapidLog.Print(args...) |
| 375 | | − } else if t.log && t.tb != nil { |
| 373 | + if t.rawLog != nil { |
| 374 | + t.rawLog.Print(args...) |
| 375 | + } else if t.tbLog && t.tb != nil { |
| 376 | 376 | t.tb.Helper() |
| 377 | 377 | t.tb.Log(args...) |
| 378 | 378 | } |
| @@ -380,7 +380,7 @@ func (t *T) Log(args ...interface{}) { · 1 unmodified line |
| 380 | 380 | |
| 381 | 381 | // Skipf is equivalent to Logf followed by SkipNow. |
| 382 | 382 | func (t *T) Skipf(format string, args ...interface{}) { |
| 383 | | − if t.log && t.tb != nil { |
| 383 | + if t.tbLog && t.tb != nil { |
| 384 | 384 | t.tb.Helper() |
| 385 | 385 | } |
| 386 | 386 | t.Logf(format, args...) |
| @@ -389,7 +389,7 @@ func (t *T) Skipf(format string, args ...interface{}) { · 2 unmodified lines |
| 389 | 389 | |
| 390 | 390 | // Skip is equivalent to Log followed by SkipNow. |
| 391 | 391 | func (t *T) Skip(args ...interface{}) { |
| 392 | | − if t.log && t.tb != nil { |
| 392 | + if t.tbLog && t.tb != nil { |
| 393 | 393 | t.tb.Helper() |
| 394 | 394 | } |
| 395 | 395 | t.Log(args...) |
| @@ -409,7 +409,7 @@ func (t *T) SkipNow() { · 13 unmodified lines |
| 409 | 409 | |
| 410 | 410 | // Errorf is equivalent to Logf followed by Fail. |
| 411 | 411 | func (t *T) Errorf(format string, args ...interface{}) { |
| 412 | | − if t.log && t.tb != nil { |
| 412 | + if t.tbLog && t.tb != nil { |
| 413 | 413 | t.tb.Helper() |
| 414 | 414 | } |
| 415 | 415 | t.Logf(format, args...) |
| @@ -418,7 +418,7 @@ func (t *T) Errorf(format string, args ...interface{}) { · 2 unmodified lines |
| 418 | 418 | |
| 419 | 419 | // Error is equivalent to Log followed by Fail. |
| 420 | 420 | func (t *T) Error(args ...interface{}) { |
| 421 | | − if t.log && t.tb != nil { |
| 421 | + if t.tbLog && t.tb != nil { |
| 422 | 422 | t.tb.Helper() |
| 423 | 423 | } |
| 424 | 424 | t.Log(args...) |
| @@ -427,7 +427,7 @@ func (t *T) Error(args ...interface{}) { · 2 unmodified lines |
| 427 | 427 | |
| 428 | 428 | // Fatalf is equivalent to Logf followed by FailNow. |
| 429 | 429 | func (t *T) Fatalf(format string, args ...interface{}) { |
| 430 | | − if t.log && t.tb != nil { |
| 430 | + if t.tbLog && t.tb != nil { |
| 431 | 431 | t.tb.Helper() |
| 432 | 432 | } |
| 433 | 433 | t.Logf(format, args...) |
| @@ -436,7 +436,7 @@ func (t *T) Fatalf(format string, args ...interface{}) { · 2 unmodified lines |
| 436 | 436 | |
| 437 | 437 | // Fatal is equivalent to Log followed by FailNow. |
| 438 | 438 | func (t *T) Fatal(args ...interface{}) { |
| 439 | | − if t.log && t.tb != nil { |
| 439 | + if t.tbLog && t.tb != nil { |
| 440 | 440 | t.tb.Helper() |
| 441 | 441 | } |
| 442 | 442 | t.Log(args...) |