@@ -19,14 +19,14 @@ package fedinformer
19
19
import (
20
20
"testing"
21
21
22
- v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23
23
"k8s.io/apimachinery/pkg/runtime"
24
24
"k8s.io/client-go/tools/cache"
25
25
)
26
26
27
27
type TestObject struct {
28
- v1 .TypeMeta
29
- v1 .ObjectMeta
28
+ metav1 .TypeMeta
29
+ metav1 .ObjectMeta
30
30
Spec string
31
31
}
32
32
@@ -66,14 +66,14 @@ func TestNewHandlerOnAllEvents(t *testing.T) {
66
66
67
67
handler := & CustomResourceEventHandler {NewHandlerOnAllEvents (fn )}
68
68
69
- testObj := & TestObject {ObjectMeta : v1 .ObjectMeta {Name : "test-obj" }}
69
+ testObj := & TestObject {ObjectMeta : metav1 .ObjectMeta {Name : "test-obj" }}
70
70
71
71
handler .OnAdd (testObj , false )
72
72
if calledWith != testObj {
73
73
t .Errorf ("AddFunc: expected %v, got %v" , testObj , calledWith )
74
74
}
75
75
76
- newObj := & TestObject {ObjectMeta : v1 .ObjectMeta {Name : "test-obj" }, Spec : "updated" }
76
+ newObj := & TestObject {ObjectMeta : metav1 .ObjectMeta {Name : "test-obj" }, Spec : "updated" }
77
77
handler .OnUpdate (testObj , newObj )
78
78
if calledWith != newObj {
79
79
t .Errorf ("UpdateFunc: expected %v, got %v" , newObj , calledWith )
@@ -99,14 +99,14 @@ func TestNewHandlerOnEvents(t *testing.T) {
99
99
100
100
handler := & CustomResourceEventHandler {NewHandlerOnEvents (addFunc , updateFunc , deleteFunc )}
101
101
102
- testObj := & TestObject {ObjectMeta : v1 .ObjectMeta {Name : "test-obj" }}
102
+ testObj := & TestObject {ObjectMeta : metav1 .ObjectMeta {Name : "test-obj" }}
103
103
104
104
handler .OnAdd (testObj , false )
105
105
if ! addCalled {
106
106
t .Error ("AddFunc was not called" )
107
107
}
108
108
109
- newObj := & TestObject {ObjectMeta : v1 .ObjectMeta {Name : "test-obj" }, Spec : "updated" }
109
+ newObj := & TestObject {ObjectMeta : metav1 .ObjectMeta {Name : "test-obj" }, Spec : "updated" }
110
110
handler .OnUpdate (testObj , newObj )
111
111
if ! updateCalled {
112
112
t .Error ("UpdateFunc was not called" )
@@ -131,29 +131,29 @@ func TestNewFilteringHandlerOnAllEvents(t *testing.T) {
131
131
132
132
handler := NewFilteringHandlerOnAllEvents (filterFunc , addFunc , updateFunc , deleteFunc )
133
133
134
- passingObj := & TestObject {ObjectMeta : v1 .ObjectMeta {Name : "passing-obj" }, Spec : "pass" }
134
+ passingObj := & TestObject {ObjectMeta : metav1 .ObjectMeta {Name : "passing-obj" }, Spec : "pass" }
135
135
handler .OnAdd (passingObj , false )
136
136
if ! addCalled {
137
137
t .Error ("AddFunc was not called for passing object" )
138
138
}
139
139
140
140
addCalled = false
141
- failingObj := & TestObject {ObjectMeta : v1 .ObjectMeta {Name : "failing-obj" }, Spec : "fail" }
141
+ failingObj := & TestObject {ObjectMeta : metav1 .ObjectMeta {Name : "failing-obj" }, Spec : "fail" }
142
142
handler .OnAdd (failingObj , false )
143
143
if addCalled {
144
144
t .Error ("AddFunc was called for failing object" )
145
145
}
146
146
147
147
updateCalled = false
148
- newPassingObj := & TestObject {ObjectMeta : v1 .ObjectMeta {Name : "passing-obj" }, Spec : "pass" }
148
+ newPassingObj := & TestObject {ObjectMeta : metav1 .ObjectMeta {Name : "passing-obj" }, Spec : "pass" }
149
149
handler .OnUpdate (passingObj , newPassingObj )
150
150
if ! updateCalled {
151
151
t .Error ("UpdateFunc was not called for passing objects" )
152
152
}
153
153
154
154
updateCalled = false
155
155
deleteCalled = false
156
- newFailingObj := & TestObject {ObjectMeta : v1 .ObjectMeta {Name : "passing-obj" }, Spec : "fail" }
156
+ newFailingObj := & TestObject {ObjectMeta : metav1 .ObjectMeta {Name : "passing-obj" }, Spec : "fail" }
157
157
handler .OnUpdate (passingObj , newFailingObj )
158
158
if updateCalled {
159
159
t .Error ("UpdateFunc was called for failing new object" )
0 commit comments