From d783bbc0bca6823da1ffbec40b9cff7bf343e731 Mon Sep 17 00:00:00 2001 From: Jerome Brette Date: Thu, 25 Jul 2019 03:13:15 +0000 Subject: [PATCH] DeepEqual method seems cleaner than adding Defaulting before every reflect.DeepEqual call --- pkg/target/kusttarget_test.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 68bc55d7f..a66416d4d 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -6,7 +6,6 @@ package target_test import ( "encoding/base64" "fmt" - "reflect" "strings" "testing" @@ -334,12 +333,10 @@ vars: t.Fatalf("unexpected size %d", len(vars)) } for i := range vars[:2] { - // We have to enforce the Defaulting call in someVars[i] - // to protect from a potential call of vars[i].ObjRef.GVK() + // By using Var.DeepEqual, we are protecting the code + // from a potential invocation of vars[i].ObjRef.GVK() // during AccumulateTarget - vars[i].Defaulting() - someVars[i].Defaulting() - if !reflect.DeepEqual(vars[i], someVars[i]) { + if !vars[i].DeepEqual(someVars[i]) { t.Fatalf("unexpected var[%d]:\n %v\n %v", i, vars[i], someVars[i]) } } @@ -392,9 +389,10 @@ resources: t.Fatalf("expected 4 vars, got %d", len(vars)) } for i := range vars { - vars[i].Defaulting() - someVars[i].Defaulting() - if !reflect.DeepEqual(vars[i], someVars[i]) { + // By using Var.DeepEqual, we are protecting the code + // from a potential invocation of vars[i].ObjRef.GVK() + // during AccumulateTarget + if !vars[i].DeepEqual(someVars[i]) { t.Fatalf("unexpected var[%d]:\n %v\n %v", i, vars[i], someVars[i]) } }