Merge pull request #4263 from haytok/refactor_portutil_test.go

test: refactor TestTestParseFlagPWithPlatformSpec and TestParsePortsL…

Author: AkihiroSuda

pkg/portutil/portutil_test.go

@@ -22,6 +22,8 @@ import (
 	"sort"
 	"testing"
 
+	"gotest.tools/v3/assert"
+
 	"github.com/containerd/go-cni"
 
 	"github.com/containerd/nerdctl/v2/pkg/labels"
@@ -124,45 +126,30 @@ func TestTestParseFlagPWithPlatformSpec(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := ParseFlagP(tt.args.s)
-			t.Log(err)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ParseFlagP() error = %v, wantErr %v", err, tt.wantErr)
-				return
+			if err != nil {
+				t.Log(err)
+				assert.Equal(t, true, tt.wantErr)
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				if len(got) == len(tt.want) {
-					if len(got) > 0 {
-						var hostPorts []int32
-						var containerPorts []int32
-						for _, value := range got {
-							hostPorts = append(hostPorts, value.HostPort)
-							containerPorts = append(containerPorts, value.ContainerPort)
-						}
-						sort.Slice(hostPorts, func(i, j int) bool {
-							return i < j
-						})
-						sort.Slice(containerPorts, func(i, j int) bool {
-							return i < j
-						})
-						if (hostPorts[len(hostPorts)-1] - hostPorts[0]) != (containerPorts[len(hostPorts)-1] - containerPorts[0]) {
-							t.Errorf("ParseFlagP() = %v, want %v", got, tt.want)
-						}
-						sort.Slice(got, func(i, j int) bool {
-							return got[i].HostPort < got[j].HostPort
-						})
-						for i := 0; i < len(got); i++ {
-							if got[i].ContainerPort != tt.want[i].ContainerPort || got[i].Protocol != tt.want[i].Protocol || got[i].HostIP != tt.want[i].HostIP {
-								t.Errorf("ParseFlagP() = %v, want %v", got, tt.want)
-							}
-						}
+				assert.Equal(t, len(got), len(tt.want))
+				if len(got) > 0 {
+					sort.Slice(got, func(i, j int) bool {
+						return got[i].HostPort < got[j].HostPort
+					})
+					assert.Equal(
+						t,
+						got[len(got)-1].HostPort-got[0].HostPort,
+						got[len(got)-1].ContainerPort-got[0].ContainerPort,
+					)
+					for i := range len(got) {
+						assert.Equal(t, got[i].ContainerPort, tt.want[i].ContainerPort)
+						assert.Equal(t, got[i].Protocol, tt.want[i].Protocol)
+						assert.Equal(t, got[i].HostIP, tt.want[i].HostIP)
 					}
-				} else {
-					t.Errorf("ParseFlagP() = %v, want %v", got, tt.want)
 				}
 			}
 		})
 	}
-
 }
 
 func TestParsePortsLabel(t *testing.T) {
@@ -213,40 +200,27 @@ func TestParsePortsLabel(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := ParsePortsLabel(tt.labelMap)
-			t.Log(err)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ParsePortsLabel() error = %v, wantErr %v", err, tt.wantErr)
-				return
+			if err != nil {
+				t.Log(err)
+				assert.Equal(t, true, tt.wantErr)
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				if len(got) == len(tt.want) {
-					if len(got) > 0 {
-						var hostPorts []int32
-						var containerPorts []int32
-						for _, value := range got {
-							hostPorts = append(hostPorts, value.HostPort)
-							containerPorts = append(containerPorts, value.ContainerPort)
-						}
-						sort.Slice(hostPorts, func(i, j int) bool {
-							return i < j
-						})
-						sort.Slice(containerPorts, func(i, j int) bool {
-							return i < j
-						})
-						if (hostPorts[len(hostPorts)-1] - hostPorts[0]) != (containerPorts[len(hostPorts)-1] - containerPorts[0]) {
-							t.Errorf("ParsePortsLabel() = %v, want %v", got, tt.want)
-						}
-						sort.Slice(got, func(i, j int) bool {
-							return got[i].HostPort < got[j].HostPort
-						})
-						for i := 0; i < len(got); i++ {
-							if got[i].HostPort != tt.want[i].HostPort || got[i].ContainerPort != tt.want[i].ContainerPort || got[i].Protocol != tt.want[i].Protocol || got[i].HostIP != tt.want[i].HostIP {
-								t.Errorf("ParsePortsLabel() = %v, want %v", got, tt.want)
-							}
-						}
+				assert.Equal(t, len(got), len(tt.want))
+				if len(got) > 0 {
+					sort.Slice(got, func(i, j int) bool {
+						return got[i].HostPort < got[j].HostPort
+					})
+					assert.Equal(
+						t,
+						got[len(got)-1].HostPort-got[0].HostPort,
+						got[len(got)-1].ContainerPort-got[0].ContainerPort,
+					)
+					for i := range len(got) {
+						assert.Equal(t, got[i].HostPort, tt.want[i].HostPort)
+						assert.Equal(t, got[i].ContainerPort, tt.want[i].ContainerPort)
+						assert.Equal(t, got[i].Protocol, tt.want[i].Protocol)
+						assert.Equal(t, got[i].HostIP, tt.want[i].HostIP)
 					}
-				} else {
-					t.Errorf("ParsePortsLabel() = %v, want %v", got, tt.want)
 				}
 			}
 		})