Merge pull request #2626 from thaJeztah/test_cleanup

cli/command/formatter/container_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
 	"gotest.tools/v3/assert"
@@ -90,7 +91,7 @@ func TestContainerPsContext(t *testing.T) {
 		ctx = ContainerContext{c: c.container, trunc: c.trunc}
 		v := c.call()
 		if strings.Contains(v, ",") {
-			compareMultipleValues(t, v, c.expValue)
+			test.CompareMultipleValues(t, v, c.expValue)
 		} else if v != c.expValue {
 			t.Fatalf("Expected %s, was %s\n", c.expValue, v)
 		}

cli/command/formatter/custom_test.go

@@ -1,12 +0,0 @@
-package formatter
-
-import (
-	"testing"
-
-	"github.com/docker/cli/internal/test"
-)
-
-// Deprecated: use internal/test.CompareMultipleValues instead
-func compareMultipleValues(t *testing.T, value, expected string) {
-	test.CompareMultipleValues(t, value, expected)
-}

cli/command/formatter/image_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
 	"gotest.tools/v3/assert"
@@ -24,63 +25,69 @@ func TestImageContext(t *testing.T) {
 		expValue string
 		call     func() string
 	}{
-		{imageContext{
+		{
-			i:     types.ImageSummary{ID: imageID},
+			imageCtx: imageContext{i: types.ImageSummary{ID: imageID}, trunc: true},
-			trunc: true,
+			expValue: stringid.TruncateID(imageID),
-		}, stringid.TruncateID(imageID), ctx.ID},
+			call:     ctx.ID,
-		{imageContext{
+		},
-			i:     types.ImageSummary{ID: imageID},
+		{
-			trunc: false,
+			imageCtx: imageContext{i: types.ImageSummary{ID: imageID}, trunc: false},
-		}, imageID, ctx.ID},
+			expValue: imageID,
-		{imageContext{
+			call:     ctx.ID,
-			i:     types.ImageSummary{Size: 10, VirtualSize: 10},
+		},
-			trunc: true,
+		{
-		}, "10B", ctx.Size},
+			imageCtx: imageContext{i: types.ImageSummary{Size: 10, VirtualSize: 10}, trunc: true},
-		{imageContext{
+			expValue: "10B",
-			i:     types.ImageSummary{Created: unix},
+			call:     ctx.Size,
-			trunc: true,
+		},
-		}, time.Unix(unix, 0).String(), ctx.CreatedAt},
+		{
+			imageCtx: imageContext{i: types.ImageSummary{Created: unix}, trunc: true},
+			expValue: time.Unix(unix, 0).String(), call: ctx.CreatedAt,
+		},
 		// FIXME
 		// {imageContext{
 		// 	i:     types.ImageSummary{Created: unix},
 		// 	trunc: true,
 		// }, units.HumanDuration(time.Unix(unix, 0)), createdSinceHeader, ctx.CreatedSince},
-		{imageContext{
-			i:    types.ImageSummary{},
-			repo: "busybox",
-		}, "busybox", ctx.Repository},
-		{imageContext{
-			i:   types.ImageSummary{},
-			tag: "latest",
-		}, "latest", ctx.Tag},
-		{imageContext{
-			i:      types.ImageSummary{},
-			digest: "sha256:d149ab53f8718e987c3a3024bb8aa0e2caadf6c0328f1d9d850b2a2a67f2819a",
-		}, "sha256:d149ab53f8718e987c3a3024bb8aa0e2caadf6c0328f1d9d850b2a2a67f2819a", ctx.Digest},
 		{
-			imageContext{
+			imageCtx: imageContext{i: types.ImageSummary{}, repo: "busybox"},
-				i: types.ImageSummary{Containers: 10},
+			expValue: "busybox",
-			}, "10", ctx.Containers,
+			call:     ctx.Repository,
 		},
 		{
-			imageContext{
+			imageCtx: imageContext{i: types.ImageSummary{}, tag: "latest"},
-				i: types.ImageSummary{VirtualSize: 10000},
+			expValue: "latest",
-			}, "10kB", ctx.VirtualSize,
+			call:     ctx.Tag,
 		},
 		{
-			imageContext{
+			imageCtx: imageContext{i: types.ImageSummary{}, digest: "sha256:d149ab53f8718e987c3a3024bb8aa0e2caadf6c0328f1d9d850b2a2a67f2819a"},
-				i: types.ImageSummary{SharedSize: 10000},
+			expValue: "sha256:d149ab53f8718e987c3a3024bb8aa0e2caadf6c0328f1d9d850b2a2a67f2819a",
-			}, "10kB", ctx.SharedSize,
+			call:     ctx.Digest,
 		},
 		{
-			imageContext{
+			imageCtx: imageContext{i: types.ImageSummary{Containers: 10}},
-				i: types.ImageSummary{SharedSize: 5000, VirtualSize: 20000},
+			expValue: "10",
-			}, "15kB", ctx.UniqueSize,
+			call:     ctx.Containers,
 		},
 		{
-			imageContext{
+			imageCtx: imageContext{i: types.ImageSummary{VirtualSize: 10000}},
-				i: types.ImageSummary{Created: zeroTime},
+			expValue: "10kB",
-			}, "", ctx.CreatedSince,
+			call:     ctx.VirtualSize,
+		},
+		{
+			imageCtx: imageContext{i: types.ImageSummary{SharedSize: 10000}},
+			expValue: "10kB",
+			call:     ctx.SharedSize,
+		},
+		{
+			imageCtx: imageContext{i: types.ImageSummary{SharedSize: 5000, VirtualSize: 20000}},
+			expValue: "15kB",
+			call:     ctx.UniqueSize,
+		},
+		{
+			imageCtx: imageContext{i: types.ImageSummary{Created: zeroTime}},
+			expValue: "",
+			call:     ctx.CreatedSince,
 		},
 	}
 
@@ -88,7 +95,7 @@ func TestImageContext(t *testing.T) {
 		ctx = c.imageCtx
 		v := c.call()
 		if strings.Contains(v, ",") {
-			compareMultipleValues(t, v, c.expValue)
+			test.CompareMultipleValues(t, v, c.expValue)
 		} else {
 			assert.Check(t, is.Equal(c.expValue, v))
 		}

cli/command/formatter/volume_test.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
 	"gotest.tools/v3/assert"
@@ -46,7 +47,7 @@ func TestVolumeContext(t *testing.T) {
 		ctx = c.volumeCtx
 		v := c.call()
 		if strings.Contains(v, ",") {
-			compareMultipleValues(t, v, c.expValue)
+			test.CompareMultipleValues(t, v, c.expValue)
 		} else if v != c.expValue {
 			t.Fatalf("Expected %s, was %s\n", c.expValue, v)
 		}