100% coverage

Author: phsym

buffer_test.go

@@ -2,54 +2,12 @@ package console
 
 import (
 	"bytes"
-	"cmp"
+	"errors"
+	"io"
 	"testing"
 	"time"
 )
 
-func AssertZero[E comparable](t *testing.T, v E) {
-	t.Helper()
-	var zero E
-	if v != zero {
-		t.Errorf("expected zero value, got %v", v)
-	}
-}
-
-func AssertEqual[E comparable](t *testing.T, expected, value E) {
-	t.Helper()
-	if expected != value {
-		t.Errorf("expected %v, got %v", expected, value)
-	}
-}
-
-func AssertNotEqual[E comparable](t *testing.T, expected, value E) {
-	t.Helper()
-	if expected == value {
-		t.Errorf("expected to be different, got %v", value)
-	}
-}
-
-func AssertGreaterOrEqual[E cmp.Ordered](t *testing.T, expected, value E) {
-	t.Helper()
-	if expected > value {
-		t.Errorf("expected to be %v to be greater than %v", value, expected)
-	}
-}
-
-func AssertNoError(t *testing.T, err error) {
-	t.Helper()
-	if err != nil {
-		t.Errorf("expected no error, got %q", err.Error())
-	}
-}
-
-// func AssertNil(t *testing.T, value any) {
-// 	t.Helper()
-// 	if value != nil {
-// 		t.Errorf("expected nil, got %v", value)
-// 	}
-// }
-
 func TestBuffer_Append(t *testing.T) {
 	b := new(buffer)
 	AssertZero(t, b.Len())
@@ -139,6 +97,21 @@ func TestBuffer_Clip(t *testing.T) {
 	AssertEqual(t, len("foobar"), b.Cap())
 }
 
+func TestBuffer_WriteTo_Err(t *testing.T) {
+	w := writerFunc(func(b []byte) (int, error) { return 0, errors.New("nope") })
+	b := new(buffer)
+	b.AppendString("foobar")
+	_, err := b.WriteTo(w)
+	AssertError(t, err)
+
+	w = writerFunc(func(b []byte) (int, error) { return 0, nil })
+	_, err = b.WriteTo(w)
+	AssertError(t, err)
+	if !errors.Is(err, io.ErrShortWrite) {
+		t.Fatalf("Expected io.ErrShortWrite, go %T", err)
+	}
+}
+
 func BenchmarkBuffer(b *testing.B) {
 	data := []byte("foobarbaz")
 

encoding.go

@@ -138,10 +138,11 @@ func (e *encoder) writeValue(buf *buffer, value slog.Value) {
 			return
 		case fmt.Stringer:
 			e.writeColoredString(buf, v.String(), colorAttrValue)
+			return
 		}
 		fallthrough
-	// case slog.KindString:
-	// 	fallthrough
+	case slog.KindString:
+		fallthrough
 	default:
 		e.writeColoredString(buf, value.String(), colorAttrValue)
 	}

handler_test.go

@@ -3,6 +3,7 @@ package console
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"os"
@@ -34,6 +35,14 @@ func TestHandler_NoColor(t *testing.T) {
 	AssertEqual(t, expected, buf.String())
 }
 
+type theStringer struct{}
+
+func (t theStringer) String() string { return "stringer" }
+
+type noStringer struct {
+	Foo string
+}
+
 func TestHandler_Attr(t *testing.T) {
 	buf := bytes.Buffer{}
 	h := NewHandler(&buf, &HandlerOptions{NoColor: true})
@@ -48,10 +57,13 @@ func TestHandler_Attr(t *testing.T) {
 		slog.Time("time", now),
 		slog.Duration("dur", time.Second),
 		slog.Group("group", slog.String("foo", "bar"), slog.Group("subgroup", slog.String("foo", "bar"))),
+		slog.Any("err", errors.New("the error")),
+		slog.Any("stringer", theStringer{}),
+		slog.Any("nostringer", noStringer{Foo: "bar"}),
 	)
 	AssertNoError(t, h.Handle(context.Background(), rec))
 
-	expected := fmt.Sprintf("%s INF foobar bool=true int=-12 uint=12 float=3.14 foo=bar time=%s dur=1s group.foo=bar group.subgroup.foo=bar\r\n", now.Format(time.DateTime), now.Format(time.RFC3339))
+	expected := fmt.Sprintf("%s INF foobar bool=true int=-12 uint=12 float=3.14 foo=bar time=%s dur=1s group.foo=bar group.subgroup.foo=bar err=the error stringer=stringer nostringer={bar}\r\n", now.Format(time.DateTime), now.Format(time.RFC3339))
 	AssertEqual(t, expected, buf.String())
 }
 
@@ -148,3 +160,10 @@ func TestHandler_Source(t *testing.T) {
 	AssertNoError(t, h2.Handle(context.Background(), rec))
 	AssertEqual(t, fmt.Sprintf("%s INF foobar\r\n", now.Format(time.DateTime)), buf.String())
 }
+
+func TestHandler_Err(t *testing.T) {
+	w := writerFunc(func(b []byte) (int, error) { return 0, errors.New("nope") })
+	h := NewHandler(w, &HandlerOptions{NoColor: true})
+	rec := slog.NewRecord(time.Now(), slog.LevelInfo, "foobar", 0)
+	AssertError(t, h.Handle(context.Background(), rec))
+}

utils_test.go

@@ -0,0 +1,62 @@
+package console
+
+import (
+	"cmp"
+	"testing"
+)
+
+func AssertZero[E comparable](t *testing.T, v E) {
+	t.Helper()
+	var zero E
+	if v != zero {
+		t.Errorf("expected zero value, got %v", v)
+	}
+}
+
+func AssertEqual[E comparable](t *testing.T, expected, value E) {
+	t.Helper()
+	if expected != value {
+		t.Errorf("expected %v, got %v", expected, value)
+	}
+}
+
+func AssertNotEqual[E comparable](t *testing.T, expected, value E) {
+	t.Helper()
+	if expected == value {
+		t.Errorf("expected to be different, got %v", value)
+	}
+}
+
+func AssertGreaterOrEqual[E cmp.Ordered](t *testing.T, expected, value E) {
+	t.Helper()
+	if expected > value {
+		t.Errorf("expected to be %v to be greater than %v", value, expected)
+	}
+}
+
+func AssertNoError(t *testing.T, err error) {
+	t.Helper()
+	if err != nil {
+		t.Errorf("expected no error, got %q", err.Error())
+	}
+}
+
+func AssertError(t *testing.T, err error) {
+	t.Helper()
+	if err == nil {
+		t.Error("expected an error, got nil")
+	}
+}
+
+// func AssertNil(t *testing.T, value any) {
+// 	t.Helper()
+// 	if value != nil {
+// 		t.Errorf("expected nil, got %v", value)
+// 	}
+// }
+
+type writerFunc func([]byte) (int, error)
+
+func (w writerFunc) Write(b []byte) (int, error) {
+	return w(b)
+}