From cb0e18e6a12c59f3e70470cb5257f094f91b2c31 Mon Sep 17 00:00:00 2001
From: Pires <pjpires@gmail.com>
Date: Fri, 15 Jan 2021 18:47:50 +0000
Subject: [PATCH] log: refactor klogv2 tests

Signed-off-by: Pires <pjpires@gmail.com>
---
 log/klogv2/klogv2_test.go | 51 ++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/log/klogv2/klogv2_test.go b/log/klogv2/klogv2_test.go
index 85c6fd169..625dbe034 100644
--- a/log/klogv2/klogv2_test.go
+++ b/log/klogv2/klogv2_test.go
@@ -21,40 +21,47 @@ import (
 
 func TestFieldMap_String(t *testing.T) {
 	var tests = []struct {
-		fields   fieldMap
+		desc     string
+		fields   *fieldMap
 		expected string
 	}{
 		{
-			fieldMap{Fields: nil},
-			"",
+			desc:     "fieldMap with nil fields",
+			fields:   &fieldMap{Fields: nil},
+			expected: "",
 		},
 		{
-			fieldMap{Fields: make(log.Fields)},
-			"",
+			desc:     "fieldMap with empty fields",
+			fields:   &fieldMap{Fields: make(log.Fields)},
+			expected: "",
 		},
 		{
-			fieldMap{Fields: map[string]interface{}{"one": 1}},
-			" [one=1]",
+			desc:     "fieldMap with single field",
+			fields:   &fieldMap{Fields: map[string]interface{}{"one": 1}},
+			expected: " [one=1]",
 		},
 		{
-			fieldMap{Fields: map[string]interface{}{"one": 1, "two": 2}},
-			" [one=1 two=2]",
+			desc:     "fieldMap with two fields",
+			fields:   &fieldMap{Fields: map[string]interface{}{"one": 1, "two": 2}},
+			expected: " [one=1 two=2]",
 		},
 	}
 
 	for _, tt := range tests {
-		// Assert fields haven't been processed yet.
-		if len(tt.fields.processedFields) > 0 {
-			t.Fatal("fields shouldn't have been processed yet")
-		}
-		// Assert fields have been processed, if any.
-		actual := tt.fields.String()
-		if len(tt.fields.Fields) > 0 && len(tt.fields.processedFields) == 0 {
-			t.Fatal("fields should have been processed by now")
-		}
-		// Assert processFields yields desired results.
-		if actual != tt.expected {
-			t.Fatalf("expected: %s, got: %s", actual, tt.expected)
-		}
+		t.Run(tt.desc, func(t *testing.T) {
+			// Assert fields haven't been processed yet.
+			if len(tt.fields.processedFields) > 0 {
+				t.Fatal("fields shouldn't have been processed yet")
+			}
+			// Assert fields have been processed, if any.
+			actual := tt.fields.String()
+			if len(tt.fields.Fields) > 0 && len(tt.fields.processedFields) == 0 {
+				t.Fatal("fields should have been processed by now")
+			}
+			// Assert processFields yields desired results.
+			if actual != tt.expected {
+				t.Fatalf("expected: %s, got: %s", actual, tt.expected)
+			}
+		})
 	}
 }