github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

meta_test should not depend on runtime.TypeMeta

pull/6/head
Vojtech Vitek (V-Teq) 2014-12-01 16:34:02 +01:00
parent 6aabd9804f
commit 508724b1f8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/meta/meta_test.go
View File

@ -388,7 +388,7 @@ func TestGenericListMeta(t *testing.T) {
}
type MyAPIObject struct {
runtime.TypeMeta `yaml:",inline" json:",inline"`
TypeMeta InternalTypeMeta `json:",inline" yaml:",inline"`
}
func (*MyAPIObject) IsAnAPIObject() {}
@ -405,8 +405,8 @@ func TestResourceVersionerOfAPI(t *testing.T) {
}
testCases := map[string]T{
"empty api object": {&MyAPIObject{}, ""},
"api object with version": {&MyAPIObject{TypeMeta: runtime.TypeMeta{ResourceVersion: "1"}}, "1"},
"pointer to api object with version": {&MyAPIObject{TypeMeta: runtime.TypeMeta{ResourceVersion: "1"}}, "1"},
"api object with version": {&MyAPIObject{TypeMeta: InternalTypeMeta{ResourceVersion: "1"}}, "1"},
"pointer to api object with version": {&MyAPIObject{TypeMeta: InternalTypeMeta{ResourceVersion: "1"}}, "1"},
}
versioning := NewAccessor()
for key, testCase := range testCases {
@ -436,7 +436,7 @@ func TestResourceVersionerOfAPI(t *testing.T) {
runtime.Object
Expected string
}{
"pointer to api object with version": {&MyAPIObject{TypeMeta: runtime.TypeMeta{ResourceVersion: "1"}}, "1"},
"pointer to api object with version": {&MyAPIObject{TypeMeta: InternalTypeMeta{ResourceVersion: "1"}}, "1"},
}
for key, testCase := range setCases {
if err := versioning.SetResourceVersion(testCase.Object, "5"); err != nil {
@ -460,7 +460,7 @@ func TestTypeMetaSelfLinker(t *testing.T) {
succeed bool
}{
"normal": {
obj: &MyAPIObject{TypeMeta: runtime.TypeMeta{SelfLink: "foobar"}},
obj: &MyAPIObject{TypeMeta: InternalTypeMeta{SelfLink: "foobar"}},
expect: "foobar",
try: "newbar",
succeed: true,