mirror of
https://github.com/rs/zerolog
synced 2026-06-08 17:13:30 +00:00
Marc Brooks
f6fbd330be
* Test coverage improvements Implements #397 and #591, might help with #473 Test coverage for core is 97.6% with only real fringe cases remaining. Improve `Fields` `isNilValue()` portability. Added a new global handler `FatalExitFunc` to allow intercepting `Fatal()` messages. Fixed CBOR float constants (removed the CBOR prefix) Added tests for: - global `FatalExitFunc` to allow intercepting Fatal messages (both for testing and public use). - `Logger` - `DisableSampling` - `.With()` copying existing context if present. - `.With().Fields()` all forms of `ErrorStackMarshaler` returns. - `.WithLevel()` for `FatalLevel`, `PanicLevel`, and `DisabledLevel`. - `.Err()` with `nil` and non-`nil` `error` and test the resulting log level. - `.should()` covering `nil` writer. - `.Output()` gets context values. - `.UpdateContext()` on a disabled logger doesn't panic and is a nop. - `.With()` all forms of `ErrorStackMarshaler` returns. - with a `nil`writer. - `.Hook()` passing no hooks. - `Array` - `.MarshalZerologArray` is a nop that won't panic. - `Context` - ` .Err()` and `.AnErr()` for `nil` errors and all forms of `ErrorStackMarshaler` returns. - `Event` - `.Caller()` to ensure we don't panic or add invalid information if `runtime.Caller()` fails -` .Err()` and `.AnErr()` for `nil` errors and all forms of `ErrorStackMarshaler` returns. - `Fields` - ` .appendFields()` all forms of `ErrorStackMarshaler` returns. - `HookLevel` - `.Run()` methods. - `LevelSampler` - `.Sample() methods. - `Syslog` - `.Write()`, `.WriteLevel()`, and `.Close()` methods. - `.WriteLevel()` with an `InvalidLevel`. - `Writer` - `.Write()` short write and error cases. - `MultiLevelWriter` `.WriteLevel()` and for `.Write()` error and `.Close()` cases. - test of unmarshalling a level byte returns correct error. - CBOR decodeStream - `.decodeFloat()`, `.binaryFmt()`, `.DecodeIfBinaryToString()`, `.DecodeObjectToStr()`, `.DecodeIfBinaryToBytes()`, `.decodeTagData()`, and `.decodeSimpleFloat()` - handling of invalid UTF-8 sequences - handling of UTC times. - handling of timestamps - handling of various map lengths Restructure `Event` `.caller()` so we test for ok and eliminate untestable coverage hole. Restructure `Context` `.Err()` when the `ErrorStackMarshaler` returns a `nil` so there's code to cover. Inverted logic for`Event` `.Caller()`'s call to `runtime.Caller()` for simpler testing. Inverted logic for `Array` `.putArray()` and `Event` `.putEvent()` so there isn't uncoverable code. Restructure `Field` `.appendFieldList()` to early return when `ErrorStackMarshaler` returns a `nil` Added comments for things we can't get coverage on. Did a go fmt ./... Coverage of core is now 100% on `Array`, `Context`, `Ctx`, `Event`, `Field`, `Hook`, and `Syslog`. Coverage of `Globals`, `Log`, `Sampler`, and `Writer` is almost all except some real edge-cases. JSON encoder coverage is 100% CBOR encoder coverage is 96.3% with base, cbor, string, time and types at 100% and decode_stream (which is lacks coverage on some panic states, and two incorrect coverage-tool lapses) * Fix CBOR tests for StackMarshaler Forgot to use the `decodeIfBinaryToString()`
67 lines
1.6 KiB
Go
67 lines
1.6 KiB
Go
package zerolog
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestArray(t *testing.T) {
|
|
a := Arr().
|
|
Bool(true).
|
|
Int(1).
|
|
Int8(2).
|
|
Int16(3).
|
|
Int32(4).
|
|
Int64(5).
|
|
Uint(6).
|
|
Uint8(7).
|
|
Uint16(8).
|
|
Uint32(9).
|
|
Uint64(10).
|
|
Float32(11.98122).
|
|
Float64(12.987654321).
|
|
Str("a").
|
|
Bytes([]byte("b")).
|
|
Hex([]byte{0x1f}).
|
|
RawJSON([]byte(`{"some":"json"}`)).
|
|
RawJSON([]byte(`{"longer":[1111,2222,3333,4444,5555]}`)).
|
|
Time(time.Time{}).
|
|
IPAddr(net.IP{192, 168, 0, 10}).
|
|
IPPrefix(net.IPNet{IP: net.IP{127, 0, 0, 0}, Mask: net.CIDRMask(24, 32)}).
|
|
MACAddr(net.HardwareAddr{0x01, 0x23, 0x45, 0x67, 0x89, 0xab}).
|
|
Interface(struct {
|
|
Pub string
|
|
Tag string `json:"tag"`
|
|
priv int
|
|
}{"A", "j", -5}).
|
|
Interface(logObjectMarshalerImpl{
|
|
name: "ZOT",
|
|
age: 35,
|
|
}).
|
|
Dur(0).
|
|
Dict(Dict().
|
|
Str("bar", "baz").
|
|
Int("n", 1),
|
|
).
|
|
Err(nil).
|
|
Err(fmt.Errorf("failure")).
|
|
Err(loggableError{fmt.Errorf("oops")}).
|
|
Object(logObjectMarshalerImpl{
|
|
name: "ZIT",
|
|
age: 22,
|
|
}).
|
|
Type(3.14)
|
|
|
|
want := `[true,1,2,3,4,5,6,7,8,9,10,11.98122,12.987654321,"a","b","1f",{"some":"json"},{"longer":[1111,2222,3333,4444,5555]},"0001-01-01T00:00:00Z","192.168.0.10","127.0.0.0/24","01:23:45:67:89:ab",{"Pub":"A","tag":"j"},{"name":"zot","age":-35},0,{"bar":"baz","n":1},null,"failure",{"l":"OOPS"},{"name":"zit","age":-22},"float64"]`
|
|
if got := decodeObjectToStr(a.write([]byte{})); got != want {
|
|
t.Errorf("Array.write()\ngot: %s\nwant: %s", got, want)
|
|
}
|
|
}
|
|
|
|
func TestArray_MarshalZerologArray(t *testing.T) {
|
|
a := Arr()
|
|
a.MarshalZerologArray(nil) // no-op method, should not panic
|
|
}
|