Skip to content

Commit 4a6fe13

Browse files
committed
skdfjlsj
1 parent e889696 commit 4a6fe13

File tree

1 file changed

+51
-25
lines changed

1 file changed

+51
-25
lines changed

pkg/workceptor/command_test.go

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@ import (
1414
"github.com/golang/mock/gomock"
1515
)
1616

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) {
1827
ctrl := gomock.NewController(t)
1928
ctx := context.Background()
2029

@@ -30,11 +39,11 @@ func createTestSetup(t *testing.T) (workceptor.WorkUnit, *mock_workceptor.MockBa
3039
cwc := &workceptor.CommandWorkerCfg{}
3140
mockBaseWorkUnit.EXPECT().Init(w, "", "", workceptor.FileSystem{}, nil)
3241
workUnit := cwc.NewWorker(mockBaseWorkUnit, w, "", "")
33-
return workUnit, mockBaseWorkUnit, mockNetceptor, ctrl
42+
return workUnit, mockBaseWorkUnit, mockNetceptor, ctrl, w
3443
}
3544

3645
func TestSetFromParams2(t *testing.T) {
37-
wu, mockBaseWorkUnit, _, _ := createTestSetup(t)
46+
wu, mockBaseWorkUnit, _, _, _ := createTestSetup(t)
3847

3948
paramsTestCases := []struct {
4049
name string
@@ -81,7 +90,7 @@ func TestSetFromParams2(t *testing.T) {
8190
}
8291

8392
func TestUnredactedStatus(t *testing.T) {
84-
wu, mockBaseWorkUnit, _, _ := createTestSetup(t)
93+
wu, mockBaseWorkUnit, _, _, _ := createTestSetup(t)
8594
statusLock := &sync.RWMutex{}
8695
mockBaseWorkUnit.EXPECT().GetStatusLock().Return(statusLock).Times(2)
8796
mockBaseWorkUnit.EXPECT().GetStatusWithoutExtraData().Return(&workceptor.StatusFileData{})
@@ -92,22 +101,23 @@ func TestUnredactedStatus(t *testing.T) {
92101
wu.UnredactedStatus()
93102
}
94103

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)
104106

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)
106111

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+
}
108118

109119
func TestRestart(t *testing.T) {
110-
wu, mockBaseWorkUnit, _, _ := createTestSetup(t)
120+
wu, mockBaseWorkUnit, _, _, _ := createTestSetup(t)
111121

112122
restartTestCases := []struct {
113123
name string
@@ -168,14 +178,15 @@ func TestRestart(t *testing.T) {
168178
for _, testCase := range restartTestCases {
169179
t.Run(testCase.name, func(t *testing.T) {
170180
testCase.expectedCalls()
181+
mockBaseWorkUnit.EXPECT().MonitorLocalStatus().AnyTimes()
171182
err := wu.Restart()
172183
testCase.errorCatch(err, t)
173184
})
174185
}
175186
}
176187

177188
func TestCancel(t *testing.T) {
178-
wu, mockBaseWorkUnit, _, _ := createTestSetup(t)
189+
wu, mockBaseWorkUnit, _, _, _ := createTestSetup(t)
179190

180191
paramsTestCases := []struct {
181192
name string
@@ -186,12 +197,7 @@ func TestCancel(t *testing.T) {
186197
name: "return no error 1",
187198
expectedCalls: func() {
188199
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)
195201
},
196202
errorCatch: func(err error, t *testing.T) {
197203
if err != nil {
@@ -291,7 +297,7 @@ func TestCancel(t *testing.T) {
291297
}
292298

293299
func TestRelease(t *testing.T) {
294-
wu, mockBaseWorkUnit, _, _ := createTestSetup(t)
300+
wu, mockBaseWorkUnit, _, _, _ := createTestSetup(t)
295301

296302
releaseTestCases := []struct {
297303
name string
@@ -337,5 +343,25 @@ func TestRelease(t *testing.T) {
337343
testCase.errorCatch(err, t)
338344
})
339345
}
340-
341346
}
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

Comments
 (0)