|
5 | 5 | "fmt"
|
6 | 6 | "testing"
|
7 | 7 |
|
8 |
| - "github.com/stretchr/testify/assert" |
| 8 | + "github.com/google/go-cmp/cmp" |
| 9 | + "github.com/google/go-cmp/cmp/cmpopts" |
9 | 10 |
|
10 | 11 | "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
11 | 12 | )
|
@@ -210,10 +211,8 @@ spec:
|
210 | 211 | if len(tt.expectedLabels) != len(o.object.GetLabels()) {
|
211 | 212 | t.Errorf("Expected length of labels to be %v but is %v", len(tt.expectedLabels), len(o.object.GetLabels()))
|
212 | 213 | }
|
213 |
| - for k, v := range tt.expectedLabels { |
214 |
| - if o.object.GetLabels()[k] != v { |
215 |
| - t.Fatalf("unexpected result, expected ========\n%v\n\nactual ========\n%v\n", tt.expectedLabels, o.object.GetLabels()) |
216 |
| - } |
| 214 | + if diff := cmp.Diff(tt.expectedLabels, o.object.GetLabels()); diff != "" { |
| 215 | + t.Fatalf("result mismatch (-want +got):\n%s", diff) |
217 | 216 | }
|
218 | 217 | }
|
219 | 218 | })
|
@@ -621,11 +620,16 @@ spec:
|
621 | 620 | if tt.inputManifest == "" {
|
622 | 621 | o, _ := NewObject(&unstructured.Unstructured{})
|
623 | 622 | err = o.MutateContainers(tt.fn)
|
624 |
| - assert.EqualError(t, err, tt.errorString) |
| 623 | + if diff := cmp.Diff(tt.errorString, err.Error()); diff != "" { |
| 624 | + t.Errorf("error mismatch (-want +got):\n%s", diff) |
| 625 | + } |
| 626 | + |
625 | 627 | } else {
|
626 | 628 | for _, o := range objects.Items {
|
627 | 629 | err = o.MutateContainers(tt.fn)
|
628 |
| - assert.EqualError(t, err, tt.errorString) |
| 630 | + if diff := cmp.Diff(tt.errorString, err.Error()); diff != "" { |
| 631 | + t.Errorf("error mismatch (-want +got):\n%s", diff) |
| 632 | + } |
629 | 633 | }
|
630 | 634 | }
|
631 | 635 | }
|
@@ -829,11 +833,15 @@ spec:
|
829 | 833 | if tt.inputManifest == "" {
|
830 | 834 | o, _ := NewObject(&unstructured.Unstructured{})
|
831 | 835 | err = o.MutatePodSpec(tt.fn)
|
832 |
| - assert.EqualError(t, err, tt.errorString) |
| 836 | + if diff := cmp.Diff(tt.errorString, err.Error()); diff != "" { |
| 837 | + t.Errorf("error mismatch (-want +got):\n%s", diff) |
| 838 | + } |
833 | 839 | } else {
|
834 | 840 | for _, o := range objects.Items {
|
835 | 841 | err = o.MutatePodSpec(tt.fn)
|
836 |
| - assert.EqualError(t, err, tt.errorString) |
| 842 | + if diff := cmp.Diff(tt.errorString, err.Error()); diff != "" { |
| 843 | + t.Errorf("error mismatch (-want +got):\n%s", diff) |
| 844 | + } |
837 | 845 | }
|
838 | 846 | }
|
839 | 847 | }
|
@@ -978,7 +986,9 @@ func Test_Sort(t *testing.T) {
|
978 | 986 | for _, tt := range tests {
|
979 | 987 | t.Run(tt.name, func(t *testing.T) {
|
980 | 988 | tt.inputObjects.Sort(tt.scoreFunc)
|
981 |
| - assert.Equal(t, tt.expectedObjects, tt.inputObjects) |
| 989 | + if diff := cmp.Diff(tt.expectedObjects, tt.inputObjects, cmpopts.IgnoreUnexported(Object{})); diff != "" { |
| 990 | + t.Errorf("objects mismatch (-want +got):\n%s", diff) |
| 991 | + } |
982 | 992 | })
|
983 | 993 | }
|
984 | 994 | }
|
0 commit comments