ref: 5e660947757023434dd7a1ec8b8239c0577fd501
parent: f4e1cb8d05720ac58f7d89b95b8fe275ac632091
author: Vazrupe (HyeonGyu Lee) <[email protected]>
date: Tue Sep 3 17:20:20 EDT 2019
tpl: Remove eq argument limitation Fixes #6237
--- a/tpl/compare/compare.go
+++ b/tpl/compare/compare.go
@@ -90,19 +90,15 @@
return dflt, nil
}
-// Eq returns the boolean truth of arg1 == arg2.
-func (ns *Namespace) Eq(x, y interface{}) bool {- if ns.caseInsensitive {+// Eq returns the boolean truth of arg1 == arg2 || arg1 == arg3 || arg1 == arg4.
+func (n *Namespace) Eq(first interface{}, others ...interface{}) bool {+ if n.caseInsensitive { panic("caseInsensitive not implemented for Eq")}
- if e, ok := x.(compare.Eqer); ok {- return e.Eq(y)
+ if len(others) == 0 {+ panic("missing arguments for comparison")}
- if e, ok := y.(compare.Eqer); ok {- return e.Eq(x)
- }
-
normalize := func(v interface{}) interface{} { if types.IsNil(v) {return nil
@@ -119,9 +115,24 @@
return v
}
}
- x = normalize(x)
- y = normalize(y)
- return reflect.DeepEqual(x, y)
+
+ normFirst := normalize(first)
+ for _, other := range others {+ if e, ok := first.(compare.Eqer); ok {+ return e.Eq(other)
+ }
+
+ if e, ok := other.(compare.Eqer); ok {+ return e.Eq(first)
+ }
+
+ other = normalize(other)
+ if reflect.DeepEqual(normFirst, other) {+ return true
+ }
+ }
+
+ return false
}
// Ne returns the boolean truth of arg1 != arg2.
--- a/tpl/compare/compare_test.go
+++ b/tpl/compare/compare_test.go
@@ -145,6 +145,10 @@
n := New(false)
+ twoEq := func(a, b interface{}) bool {+ return n.Eq(a, b)
+ }
+
for _, test := range []struct {tstCompareType
funcUnderTest func(a, b interface{}) bool@@ -153,7 +157,7 @@
{tstLt, n.Lt}, {tstGe, n.Ge}, {tstLe, n.Le},- {tstEq, n.Eq},+ {tstEq, twoEq}, {tstNe, n.Ne}, } {doTestCompare(t, test.tstCompareType, test.funcUnderTest)
@@ -234,6 +238,28 @@
if !success { t.Fatalf("[%d][%s] %v compared to %v: %t", i, path.Base(runtime.FuncForPC(reflect.ValueOf(funcUnderTest).Pointer()).Name()), test.left, test.right, result)}
+ }
+}
+
+func TestEqualExtend(t *testing.T) {+ t.Parallel()
+ c := qt.New(t)
+
+ ns := New(false)
+
+ for _, test := range []struct {+ first interface{}+ others []interface{}+ expect bool
+ }{+ {1, []interface{}{1, 2}, true},+ {1, []interface{}{2, 1}, true},+ {1, []interface{}{2, 3}, false},+ } {+
+ result := ns.Eq(test.first, test.others...)
+
+ c.Assert(result, qt.Equals, test.expect)
}
}