Skip to content

K
k3s
Commit 508724b1 authored by Vojtech Vitek (V-Teq)'s avatar Vojtech Vitek (V-Teq)
Browse files
Options

meta_test should not depend on runtime.TypeMeta

parent 6aabd980
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
pkg/api/meta/meta_test.go
View file @ 508724b1
...@@ -388,7 +388,7 @@ func TestGenericListMeta(t *testing.T) { ...@@ -388,7 +388,7 @@ func TestGenericListMeta(t *testing.T) {
} }
type MyAPIObject struct { type MyAPIObject struct {
runtime.TypeMeta `yaml:",inline" json:",inline"` TypeMeta InternalTypeMeta `json:",inline" yaml:",inline"`
} }
func (*MyAPIObject) IsAnAPIObject() {} func (*MyAPIObject) IsAnAPIObject() {}
...@@ -405,8 +405,8 @@ func TestResourceVersionerOfAPI(t *testing.T) { ...@@ -405,8 +405,8 @@ func TestResourceVersionerOfAPI(t *testing.T) {
} }
testCases := map[string]T{ testCases := map[string]T{
"empty api object": {&MyAPIObject{}, ""}, "empty api object": {&MyAPIObject{}, ""},
"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: runtime.TypeMeta{ResourceVersion: "1"}}, "1"}, "pointer to api object with version": {&MyAPIObject{TypeMeta: InternalTypeMeta{ResourceVersion: "1"}}, "1"},
} }
versioning := NewAccessor() versioning := NewAccessor()
for key, testCase := range testCases { for key, testCase := range testCases {
...@@ -436,7 +436,7 @@ func TestResourceVersionerOfAPI(t *testing.T) { ...@@ -436,7 +436,7 @@ func TestResourceVersionerOfAPI(t *testing.T) {
runtime.Object runtime.Object
Expected string 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 { for key, testCase := range setCases {
if err := versioning.SetResourceVersion(testCase.Object, "5"); err != nil { if err := versioning.SetResourceVersion(testCase.Object, "5"); err != nil {
...@@ -460,7 +460,7 @@ func TestTypeMetaSelfLinker(t *testing.T) { ...@@ -460,7 +460,7 @@ func TestTypeMetaSelfLinker(t *testing.T) {
succeed bool succeed bool
}{ }{
"normal": { "normal": {
obj: &MyAPIObject{TypeMeta: runtime.TypeMeta{SelfLink: "foobar"}}, obj: &MyAPIObject{TypeMeta: InternalTypeMeta{SelfLink: "foobar"}},
expect: "foobar", expect: "foobar",
try: "newbar", try: "newbar",
succeed: true, succeed: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment