From 3fa18636ec434f12d1b395929efef3fd7decbe0d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 27 Dec 2022 16:29:38 +0100 Subject: [PATCH] internal/test: use strings.Cut Signed-off-by: Sebastiaan van Stijn --- internal/test/strings.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/internal/test/strings.go b/internal/test/strings.go index d001c8f3f8..ccbfbbccdd 100644 --- a/internal/test/strings.go +++ b/internal/test/strings.go @@ -14,16 +14,14 @@ func CompareMultipleValues(t *testing.T, value, expected string) { // be guaranteed to have the same order as our expected value // We'll create maps and use reflect.DeepEquals to check instead: entriesMap := make(map[string]string) - expMap := make(map[string]string) - entries := strings.Split(value, ",") - expectedEntries := strings.Split(expected, ",") - for _, entry := range entries { - keyval := strings.Split(entry, "=") - entriesMap[keyval[0]] = keyval[1] + for _, entry := range strings.Split(value, ",") { + k, v, _ := strings.Cut(entry, "=") + entriesMap[k] = v } - for _, expected := range expectedEntries { - keyval := strings.Split(expected, "=") - expMap[keyval[0]] = keyval[1] + expMap := make(map[string]string) + for _, exp := range strings.Split(expected, ",") { + k, v, _ := strings.Cut(exp, "=") + expMap[k] = v } assert.Check(t, is.DeepEqual(expMap, entriesMap)) }