@@ -14,7 +14,16 @@ import (
14
14
"github.com/golang/mock/gomock"
15
15
)
16
16
17
- func createTestSetup (t * testing.T ) (workceptor.WorkUnit , * mock_workceptor.MockBaseWorkUnitForWorkUnit , * mock_workceptor.MockNetceptorForWorkceptor , * gomock.Controller ) {
17
+ func statusExpectCalls (mockBaseWorkUnit * mock_workceptor.MockBaseWorkUnitForWorkUnit ) {
18
+ statusLock := & sync.RWMutex {}
19
+ mockBaseWorkUnit .EXPECT ().GetStatusLock ().Return (statusLock ).Times (2 )
20
+ mockBaseWorkUnit .EXPECT ().GetStatusWithoutExtraData ().Return (& workceptor.StatusFileData {})
21
+ mockBaseWorkUnit .EXPECT ().GetStatusCopy ().Return (workceptor.StatusFileData {
22
+ ExtraData : & workceptor.CommandExtraData {},
23
+ })
24
+ }
25
+
26
+ func createTestSetup (t * testing.T ) (workceptor.WorkUnit , * mock_workceptor.MockBaseWorkUnitForWorkUnit , * mock_workceptor.MockNetceptorForWorkceptor , * gomock.Controller , * workceptor.Workceptor ) {
18
27
ctrl := gomock .NewController (t )
19
28
ctx := context .Background ()
20
29
@@ -30,11 +39,11 @@ func createTestSetup(t *testing.T) (workceptor.WorkUnit, *mock_workceptor.MockBa
30
39
cwc := & workceptor.CommandWorkerCfg {}
31
40
mockBaseWorkUnit .EXPECT ().Init (w , "" , "" , workceptor.FileSystem {}, nil )
32
41
workUnit := cwc .NewWorker (mockBaseWorkUnit , w , "" , "" )
33
- return workUnit , mockBaseWorkUnit , mockNetceptor , ctrl
42
+ return workUnit , mockBaseWorkUnit , mockNetceptor , ctrl , w
34
43
}
35
44
36
45
func TestSetFromParams2 (t * testing.T ) {
37
- wu , mockBaseWorkUnit , _ , _ := createTestSetup (t )
46
+ wu , mockBaseWorkUnit , _ , _ , _ := createTestSetup (t )
38
47
39
48
paramsTestCases := []struct {
40
49
name string
@@ -81,7 +90,7 @@ func TestSetFromParams2(t *testing.T) {
81
90
}
82
91
83
92
func TestUnredactedStatus (t * testing.T ) {
84
- wu , mockBaseWorkUnit , _ , _ := createTestSetup (t )
93
+ wu , mockBaseWorkUnit , _ , _ , _ := createTestSetup (t )
85
94
statusLock := & sync.RWMutex {}
86
95
mockBaseWorkUnit .EXPECT ().GetStatusLock ().Return (statusLock ).Times (2 )
87
96
mockBaseWorkUnit .EXPECT ().GetStatusWithoutExtraData ().Return (& workceptor.StatusFileData {})
@@ -92,22 +101,23 @@ func TestUnredactedStatus(t *testing.T) {
92
101
wu .UnredactedStatus ()
93
102
}
94
103
95
- // func TestStart(t *testing.T) {
96
- // wu, mockBaseWorkUnit, _, _ := createTestSetup(t)
97
- // // w, err := workceptor.New(context.Background(), mockNetceptor, "")
98
- // // if err != nil {
99
- // // fmt.Println(err)
100
- // // }
101
-
102
- // stuff := mockBaseWorkUnit.EXPECT().GetWorkceptor().Return()
103
- // // mockNetceptor.EXPECT().GetLogger()
104
+ func TestStart (t * testing.T ) {
105
+ wu , mockBaseWorkUnit , mockNetceptor , _ , w := createTestSetup (t )
104
106
105
- // wu.Start()
107
+ mockBaseWorkUnit .EXPECT ().GetWorkceptor ().Return (w ).Times (2 )
108
+ mockNetceptor .EXPECT ().GetLogger ().Times (2 )
109
+ mockBaseWorkUnit .EXPECT ().UpdateBasicStatus (gomock .Any (), gomock .Any (), gomock .Any ())
110
+ statusExpectCalls (mockBaseWorkUnit )
106
111
107
- // }
112
+ mockBaseWorkUnit .EXPECT ().UnitDir ()
113
+ mockBaseWorkUnit .EXPECT ().UpdateFullStatus (gomock .Any ())
114
+ mockBaseWorkUnit .EXPECT ().MonitorLocalStatus ().AnyTimes ()
115
+ mockBaseWorkUnit .EXPECT ().UpdateFullStatus (gomock .Any ()).AnyTimes ()
116
+ wu .Start ()
117
+ }
108
118
109
119
func TestRestart (t * testing.T ) {
110
- wu , mockBaseWorkUnit , _ , _ := createTestSetup (t )
120
+ wu , mockBaseWorkUnit , _ , _ , _ := createTestSetup (t )
111
121
112
122
restartTestCases := []struct {
113
123
name string
@@ -168,14 +178,15 @@ func TestRestart(t *testing.T) {
168
178
for _ , testCase := range restartTestCases {
169
179
t .Run (testCase .name , func (t * testing.T ) {
170
180
testCase .expectedCalls ()
181
+ mockBaseWorkUnit .EXPECT ().MonitorLocalStatus ().AnyTimes ()
171
182
err := wu .Restart ()
172
183
testCase .errorCatch (err , t )
173
184
})
174
185
}
175
186
}
176
187
177
188
func TestCancel (t * testing.T ) {
178
- wu , mockBaseWorkUnit , _ , _ := createTestSetup (t )
189
+ wu , mockBaseWorkUnit , _ , _ , _ := createTestSetup (t )
179
190
180
191
paramsTestCases := []struct {
181
192
name string
@@ -186,12 +197,7 @@ func TestCancel(t *testing.T) {
186
197
name : "return no error 1" ,
187
198
expectedCalls : func () {
188
199
mockBaseWorkUnit .EXPECT ().CancelContext ()
189
- mockBaseWorkUnit .EXPECT ().GetStatusLock ().Return (& sync.RWMutex {}).Times (2 )
190
- mockBaseWorkUnit .EXPECT ().GetStatusWithoutExtraData ().Return (& workceptor.StatusFileData {})
191
- mockBaseWorkUnit .EXPECT ().GetStatusCopy ().Return (workceptor.StatusFileData {
192
- ExtraData : & workceptor.CommandExtraData {},
193
- })
194
-
200
+ statusExpectCalls (mockBaseWorkUnit )
195
201
},
196
202
errorCatch : func (err error , t * testing.T ) {
197
203
if err != nil {
@@ -291,7 +297,7 @@ func TestCancel(t *testing.T) {
291
297
}
292
298
293
299
func TestRelease (t * testing.T ) {
294
- wu , mockBaseWorkUnit , _ , _ := createTestSetup (t )
300
+ wu , mockBaseWorkUnit , _ , _ , _ := createTestSetup (t )
295
301
296
302
releaseTestCases := []struct {
297
303
name string
@@ -337,5 +343,25 @@ func TestRelease(t *testing.T) {
337
343
testCase .errorCatch (err , t )
338
344
})
339
345
}
340
-
341
346
}
347
+
348
+ // func TestCommandWorkerCfgRun(t *testing.T) {
349
+ // cfgTestCases := []struct {
350
+ // name string
351
+ // verifySignature bool
352
+ // }{
353
+ // {
354
+ // name: "error 1",
355
+ // verifySignature: true,
356
+ // },
357
+ // }
358
+ // for _, testCase := range cfgTestCases {
359
+ // t.Run(testCase.name, func(t *testing.T) {
360
+ // commandWorkerCfg := workceptor.CommandWorkerCfg{
361
+ // VerifySignature: testCase.verifySignature,
362
+ // }
363
+ // commandWorkerCfg.Run()
364
+ // })
365
+ // }
366
+
367
+ // }
0 commit comments