github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34775 from ivan4th/remove-copies-of-objectdiff

Browse Source 
Automatic merge from submit-queue

Remove copies of ObjectDiff function
This commit is contained in:
Kubernetes Submit Queue 2016-12-02 06:18:34 -08:00 committed by GitHub
commit 129d37bde5
2 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/conversion/converter_test.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package conversion
import (
"encoding/json"
"fmt"
"reflect"
"strconv"
@ -522,7 +521,7 @@ func TestConverter_fuzz(t *testing.T) {
continue
}
if e, a := item.from, item.check; !reflect.DeepEqual(e, a) {
t.Errorf("(%v, %v): unexpected diff: %v", i, j, objDiff(e, a))
t.Errorf("(%v, %v): unexpected diff: %v", i, j, diff.ObjectDiff(e, a))
}
}
}
@ -570,7 +569,7 @@ func TestConverter_MapElemAddr(t *testing.T) {
third := Foo{}
err = c.Convert(&second, &third, AllowDifferentFieldTypeNames, nil)
if e, a := first, third; !reflect.DeepEqual(e, a) {
t.Errorf("Unexpected diff: %v", objDiff(e, a))
t.Errorf("Unexpected diff: %v", diff.ObjectDiff(e, a))
}
}
@ -821,27 +820,7 @@ func TestConverter_FieldRename(t *testing.T) {
continue
}
if e, a := item.expect, item.to; !reflect.DeepEqual(e, a) {
t.Errorf("%v: unexpected diff: %v", name, objDiff(e, a))
t.Errorf("%v: unexpected diff: %v", name, diff.ObjectDiff(e, a))
}
}
}
func objDiff(a, b interface{}) string {
ab, err := json.Marshal(a)
if err != nil {
panic("a")
}
bb, err := json.Marshal(b)
if err != nil {
panic("b")
}
return diff.StringDiff(string(ab), string(bb))
// An alternate diff attempt, in case json isn't showing you
// the difference. (reflect.DeepEqual makes a distinction between
// nil and empty slices, for example.)
//return diff.StringDiff(
// fmt.Sprintf("%#v", a),
// fmt.Sprintf("%#v", b),
//)
}

22
pkg/runtime/serializer/codec_test.go
View File

@ -179,26 +179,6 @@ func GetTestScheme() (*runtime.Scheme, runtime.Codec) {
return s, codec
}
func objDiff(a, b interface{}) string {
ab, err := json.Marshal(a)
if err != nil {
panic("a")
}
bb, err := json.Marshal(b)
if err != nil {
panic("b")
}
return diff.StringDiff(string(ab), string(bb))
// An alternate diff attempt, in case json isn't showing you
// the difference. (reflect.DeepEqual makes a distinction between
// nil and empty slices, for example.)
//return diff.StringDiff(
// fmt.Sprintf("%#v", a),
// fmt.Sprintf("%#v", b),
//)
}
var semantic = conversion.EqualitiesOrDie(
func(a, b MyWeirdCustomEmbeddedVersionKindField) bool {
a.APIVersion, a.ObjectKind = "", ""
@ -232,7 +212,7 @@ func runTest(t *testing.T, source interface{}) {
return
}
if !semantic.DeepEqual(source, obj3) {
t.Errorf("3: %v: diff: %v", name, objDiff(source, obj3))
t.Errorf("3: %v: diff: %v", name, diff.ObjectDiff(source, obj3))
return
}
}