Merge pull request #1462 from AllenZMC/improve_test_util

accelerate merge clusters during schedule and improve test coverage

pkg/util/binding.go

@@ -87,6 +87,12 @@ func DivideReplicasByTargetCluster(clusters []workv1alpha2.TargetCluster, sum in
 
 // MergeTargetClusters will merge the replicas in two TargetCluster
 func MergeTargetClusters(old, new []workv1alpha2.TargetCluster) []workv1alpha2.TargetCluster {
+	switch {
+	case len(old) == 0:
+		return new
+	case len(new) == 0:
+		return old
+	}
 	// oldMap is a map of the result for the old replicas so that it can be merged with the new result easily
 	oldMap := make(map[string]int32)
 	for _, cluster := range old {

pkg/util/binding_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
 
 	policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
 	workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2"
@@ -358,3 +359,151 @@ func TestGetSumOfReplicas(t *testing.T) {
 		})
 	}
 }
+
+func TestConvertToClusterNames(t *testing.T) {
+	tests := []struct {
+		name     string
+		clusters []workv1alpha2.TargetCluster
+		expected sets.String
+	}{
+		{
+			name:     "empty",
+			clusters: []workv1alpha2.TargetCluster{},
+			expected: sets.String{},
+		},
+		{
+			name: "not empty",
+			clusters: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember1,
+					Replicas: 2,
+				},
+				{
+					Name:     ClusterMember2,
+					Replicas: 3,
+				},
+			},
+			expected: sets.NewString(ClusterMember1, ClusterMember2),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := ConvertToClusterNames(tt.clusters)
+			if !reflect.DeepEqual(got, tt.expected) {
+				t.Errorf("ConvertToClusterNames() = %v, want %v", got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestMergeTargetClusters(t *testing.T) {
+	tests := []struct {
+		name     string
+		old      []workv1alpha2.TargetCluster
+		new      []workv1alpha2.TargetCluster
+		expected []workv1alpha2.TargetCluster
+	}{
+		{
+			name:     "empty",
+			old:      []workv1alpha2.TargetCluster{},
+			new:      []workv1alpha2.TargetCluster{},
+			expected: []workv1alpha2.TargetCluster{},
+		},
+		{
+			name: "old clusters are empty",
+			old:  []workv1alpha2.TargetCluster{},
+			new: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember2,
+					Replicas: 3,
+				},
+			},
+			expected: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember2,
+					Replicas: 3,
+				},
+			},
+		},
+		{
+			name: "new clusters are empty",
+			old: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember1,
+					Replicas: 3,
+				},
+			},
+			new: []workv1alpha2.TargetCluster{},
+			expected: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember1,
+					Replicas: 3,
+				},
+			},
+		},
+		{
+			name: "no cluster with the same name",
+			old: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember1,
+					Replicas: 2,
+				},
+			},
+			new: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember2,
+					Replicas: 3,
+				},
+			},
+			expected: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember1,
+					Replicas: 2,
+				},
+				{
+					Name:     ClusterMember2,
+					Replicas: 3,
+				},
+			},
+		},
+		{
+			name: "some clusters have the same name in the old and new clusters",
+			old: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember1,
+					Replicas: 2,
+				},
+			},
+			new: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember1,
+					Replicas: 4,
+				},
+				{
+					Name:     ClusterMember2,
+					Replicas: 3,
+				},
+			},
+			expected: []workv1alpha2.TargetCluster{
+				{
+					Name:     ClusterMember1,
+					Replicas: 6,
+				},
+				{
+					Name:     ClusterMember2,
+					Replicas: 3,
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := MergeTargetClusters(tt.old, tt.new)
+			if !testhelper.IsScheduleResultEqual(got, tt.expected) {
+				t.Errorf("MergeTargetClusters() = %v, want %v", got, tt.expected)
+			}
+		})
+	}
+}