diff --git a/k8sdeps/transformer/patch/transformer_test.go b/k8sdeps/transformer/patch/transformer_test.go index 370d740c1..61a4ac048 100644 --- a/k8sdeps/transformer/patch/transformer_test.go +++ b/k8sdeps/transformer/patch/transformer_test.go @@ -124,7 +124,7 @@ func TestOverlayRun(t *testing.T) { t.Fatalf("unexpected error: %v", err) } if !reflect.DeepEqual(base, expected) { - err = expected.ErrorIfNotEqual(base) + err = expected.ErrorIfNotEqualSets(base) t.Fatalf("actual doesn't match expected: %v", err) } } @@ -254,7 +254,7 @@ func TestMultiplePatches(t *testing.T) { t.Fatalf("unexpected error: %v", err) } if !reflect.DeepEqual(base, expected) { - err = expected.ErrorIfNotEqual(base) + err = expected.ErrorIfNotEqualSets(base) t.Fatalf("actual doesn't match expected: %v", err) } } @@ -402,7 +402,7 @@ func TestNoSchemaOverlayRun(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(base); err != nil { + if err = expected.ErrorIfNotEqualSets(base); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } @@ -486,7 +486,7 @@ func TestNoSchemaMultiplePatches(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(base); err != nil { + if err = expected.ErrorIfNotEqualSets(base); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } diff --git a/pkg/patch/transformer/factory_test.go b/pkg/patch/transformer/factory_test.go index 72b8c7836..09173a855 100644 --- a/pkg/patch/transformer/factory_test.go +++ b/pkg/patch/transformer/factory_test.go @@ -248,7 +248,7 @@ func TestNewPatchJson6902FactoryMulti(t *testing.T) { t.Fatalf("unexpected error : %v", err) } if !reflect.DeepEqual(base, expected) { - err = expected.ErrorIfNotEqual(base) + err = expected.ErrorIfNotEqualSets(base) t.Fatalf("actual doesn't match expected: %v", err) } } diff --git a/pkg/patch/transformer/patchjson6902json_test.go b/pkg/patch/transformer/patchjson6902json_test.go index 48cb52e8d..647ac178f 100644 --- a/pkg/patch/transformer/patchjson6902json_test.go +++ b/pkg/patch/transformer/patchjson6902json_test.go @@ -110,7 +110,7 @@ func TestJsonPatchJSONTransformer_Transform(t *testing.T) { t.Fatalf("unexpected error: %v", err) } if !reflect.DeepEqual(base, expected) { - err = expected.ErrorIfNotEqual(base) + err = expected.ErrorIfNotEqualSets(base) t.Fatalf("actual doesn't match expected: %v", err) } } diff --git a/pkg/resmap/factory.go b/pkg/resmap/factory.go index e578e3a1b..757a3aedb 100644 --- a/pkg/resmap/factory.go +++ b/pkg/resmap/factory.go @@ -66,7 +66,7 @@ func (rmF *Factory) NewResMapFromBytes(b []byte) (ResMap, error) { // Deprecated. // FromMap returns a ResMap with arbitrary internal ordering, // panicing on error. For tests only. -// See also ErrorIfNotEqual. +// See also ErrorIfNotEqualSets. func FromMap(arg map[resid.ResId]*resource.Resource) ResMap { result, err := fromMap(arg) if err != nil { diff --git a/pkg/resmap/factory_test.go b/pkg/resmap/factory_test.go index cb0f7a8e5..7744921a7 100644 --- a/pkg/resmap/factory_test.go +++ b/pkg/resmap/factory_test.go @@ -77,7 +77,7 @@ metadata: if m.Size() != 3 { t.Fatalf("result should contain 3, but got %d", m.Size()) } - if err := expected.ErrorIfNotEqual(m); err != nil { + if err := expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } diff --git a/pkg/resmap/resmap.go b/pkg/resmap/resmap.go index 48d80e4b8..4616c952e 100644 --- a/pkg/resmap/resmap.go +++ b/pkg/resmap/resmap.go @@ -151,7 +151,7 @@ type ResMap interface { // not the underlying resources. ShallowCopy() ResMap - // ErrorIfNotEqual returns an error if the + // ErrorIfNotEqualSets returns an error if the // argument doesn't have the same Ids and resource // data as self. Ordering is _not_ taken into account, // as this function was solely used in tests written @@ -159,10 +159,9 @@ type ResMap interface { // and those tests are initialized with maps which // by definition have random ordering, and will // fail spuriously. - // TODO: rename to ErrorIfNotEqualSets // TODO: modify tests to not use resmap.FromMap, // TODO: - and replace this with a stricter equals. - ErrorIfNotEqual(ResMap) error + ErrorIfNotEqualSets(ResMap) error // Debug prints the ResMap. Debug(title string) @@ -409,8 +408,8 @@ func (m *resWrangler) AsYaml(twiddle ResTwiddler) ([]byte, error) { return buf.Bytes(), nil } -// ErrorIfNotEqual implements ResMap. -func (m *resWrangler) ErrorIfNotEqual(other ResMap) error { +// ErrorIfNotEqualSets implements ResMap. +func (m *resWrangler) ErrorIfNotEqualSets(other ResMap) error { m2, ok := other.(*resWrangler) if !ok { panic(fmt.Errorf("bad cast")) diff --git a/pkg/resmap/resmap_test.go b/pkg/resmap/resmap_test.go index 0b254d6a1..2d6d37038 100644 --- a/pkg/resmap/resmap_test.go +++ b/pkg/resmap/resmap_test.go @@ -382,7 +382,7 @@ func TestFilterBy(t *testing.T) { test := test t.Run(name, func(t *testing.T) { got := test.resMap.ResourcesThatCouldReference(test.filter) - err := test.expected.ErrorIfNotEqual(got) + err := test.expected.ErrorIfNotEqualSets(got) if err != nil { t.Fatalf("Expected %v but got back %v", test.expected, got) } @@ -415,7 +415,7 @@ func TestDeepCopy(t *testing.T) { if &rm1 == &rm2 { t.Fatal("DeepCopy returned a reference to itself instead of a copy") } - err := rm1.ErrorIfNotEqual(rm1) + err := rm1.ErrorIfNotEqualSets(rm1) if err != nil { t.Fatal(err) } @@ -524,7 +524,7 @@ func TestErrorIfNotEqual(t *testing.T) { }), }) - err := rm1.ErrorIfNotEqual(rm1) + err := rm1.ErrorIfNotEqualSets(rm1) if err != nil { t.Fatalf("%v should equal itself %v", rm1, err) } @@ -541,7 +541,7 @@ func TestErrorIfNotEqual(t *testing.T) { }) // test the different number of keys path - err = rm1.ErrorIfNotEqual(rm2) + err = rm1.ErrorIfNotEqualSets(rm2) if err == nil { t.Fatalf("%v should not equal %v %v", rm1, rm2, err) } @@ -558,7 +558,7 @@ func TestErrorIfNotEqual(t *testing.T) { }) // test the different key values path - err = rm2.ErrorIfNotEqual(rm3) + err = rm2.ErrorIfNotEqualSets(rm3) if err == nil { t.Fatalf("%v should not equal %v %v", rm1, rm2, err) } @@ -575,7 +575,7 @@ func TestErrorIfNotEqual(t *testing.T) { }) // test the deepcopy path - err = rm2.ErrorIfNotEqual(rm4) + err = rm2.ErrorIfNotEqualSets(rm4) if err == nil { t.Fatalf("%v should not equal %v %v", rm1, rm2, err) } @@ -608,7 +608,7 @@ func TestAppendAll(t *testing.T) { if err := input1.AppendAll(input2); err != nil { t.Fatalf("unexpected error: %v", err) } - if err := expected.ErrorIfNotEqual(input1); err != nil { + if err := expected.ErrorIfNotEqualSets(input1); err != nil { input1.Debug("1") expected.Debug("ex") t.Fatalf("%#v doesn't equal expected %#v", input1, expected) @@ -616,7 +616,7 @@ func TestAppendAll(t *testing.T) { if err := input1.AppendAll(nil); err != nil { t.Fatalf("unexpected error: %v", err) } - if err := expected.ErrorIfNotEqual(input1); err != nil { + if err := expected.ErrorIfNotEqualSets(input1); err != nil { t.Fatalf("%#v doesn't equal expected %#v", input1, expected) } } @@ -678,14 +678,14 @@ func TestAbsorbAll(t *testing.T) { if err := w.AbsorbAll(makeMap2(types.BehaviorMerge)); err != nil { t.Fatalf("unexpected error: %v", err) } - if err := expected.ErrorIfNotEqual(w); err != nil { + if err := expected.ErrorIfNotEqualSets(w); err != nil { t.Fatal(err) } w = makeMap1() if err := w.AbsorbAll(nil); err != nil { t.Fatalf("unexpected error: %v", err) } - if err := w.ErrorIfNotEqual(makeMap1()); err != nil { + if err := w.ErrorIfNotEqualSets(makeMap1()); err != nil { t.Fatal(err) } w = makeMap1() @@ -693,7 +693,7 @@ func TestAbsorbAll(t *testing.T) { if err := w.AbsorbAll(w2); err != nil { t.Fatalf("unexpected error: %v", err) } - if err := w2.ErrorIfNotEqual(w); err != nil { + if err := w2.ErrorIfNotEqualSets(w); err != nil { t.Fatal(err) } w = makeMap1() diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 18eeee31c..d1f2e02a3 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -198,7 +198,7 @@ func TestResources(t *testing.T) { t.Fatalf("unexpected Resources error %v", err) } - if err = expected.ErrorIfNotEqual(actual); err != nil { + if err = expected.ErrorIfNotEqualSets(actual); err != nil { t.Fatalf("unexpected inequality: %v", err) } } diff --git a/pkg/transformers/labelsandannotations_test.go b/pkg/transformers/labelsandannotations_test.go index 79f2aaa96..14ebef92c 100644 --- a/pkg/transformers/labelsandannotations_test.go +++ b/pkg/transformers/labelsandannotations_test.go @@ -440,7 +440,7 @@ func TestLabelsRun(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(m); err != nil { + if err = expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } @@ -576,7 +576,7 @@ func TestAnnotationsRun(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(m); err != nil { + if err = expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } @@ -619,7 +619,7 @@ func TestAnnotaionsRunWithNullValue(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(m); err != nil { + if err = expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } diff --git a/pkg/transformers/multitransformer.go b/pkg/transformers/multitransformer.go index ed30c168a..dc446c6f7 100644 --- a/pkg/transformers/multitransformer.go +++ b/pkg/transformers/multitransformer.go @@ -78,7 +78,7 @@ func (o *multiTransformer) transformWithCheckConflict(m resmap.ResMap) error { if err != nil { return err } - err = m.ErrorIfNotEqual(mcopy) + err = m.ErrorIfNotEqualSets(mcopy) if err != nil { return fmt.Errorf("found conflict between different patches\n%v", err) } diff --git a/pkg/transformers/namereference_test.go b/pkg/transformers/namereference_test.go index 70ab1c090..2506fdafb 100644 --- a/pkg/transformers/namereference_test.go +++ b/pkg/transformers/namereference_test.go @@ -492,7 +492,7 @@ func TestNameReferenceHappyRun(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(m); err != nil { + if err = expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } @@ -619,7 +619,7 @@ func TestNameReferencePersistentVolumeHappyRun(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(m); err != nil { + if err = expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } diff --git a/pkg/transformers/namespace_test.go b/pkg/transformers/namespace_test.go index df9483319..ee3a6c02c 100644 --- a/pkg/transformers/namespace_test.go +++ b/pkg/transformers/namespace_test.go @@ -197,7 +197,7 @@ func TestNamespaceRun(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(m); err != nil { + if err = expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } @@ -253,7 +253,7 @@ func TestNamespaceRunForClusterLevelKind(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(m); err != nil { + if err = expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } diff --git a/pkg/transformers/prefixsuffixname_test.go b/pkg/transformers/prefixsuffixname_test.go index 2b1cb1653..64af91577 100644 --- a/pkg/transformers/prefixsuffixname_test.go +++ b/pkg/transformers/prefixsuffixname_test.go @@ -90,7 +90,7 @@ func TestPrefixSuffixNameRun(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if err = expected.ErrorIfNotEqual(m); err != nil { + if err = expected.ErrorIfNotEqualSets(m); err != nil { t.Fatalf("actual doesn't match expected: %v", err) } } diff --git a/pkg/transformers/refvars_test.go b/pkg/transformers/refvars_test.go index 63b62c85a..6ef6c50e8 100644 --- a/pkg/transformers/refvars_test.go +++ b/pkg/transformers/refvars_test.go @@ -101,7 +101,7 @@ func TestVarRef(t *testing.T) { a, e := tc.given.res, tc.expected.res if !reflect.DeepEqual(a, e) { - err = e.ErrorIfNotEqual(a) + err = e.ErrorIfNotEqualSets(a) t.Fatalf("actual doesn't match expected: \nACTUAL:\n%v\nEXPECTED:\n%v\nERR: %v", a, e, err) }