Skip to content

Commit abcf7ab

Browse files
mmorel-35mmorel-35
committed
chore: use expecter struct from mockery
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent e161522 commit abcf7ab

35 files changed

+1670
-1258
lines changed

‎.mockery.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,8 @@ packages:
8686
dir: applicationset/services/scm_provider/azure_devops/git/mocks
8787
interfaces:
8888
Client: {}
89+
github.com/argoproj/gitops-engine/pkg/cache:
90+
config:
91+
dir: gitops-engine/pkg/cache/mocks
92+
interfaces:
93+
ClusterCache: {}

‎applicationset/controllers/applicationset_controller_test.go‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,16 +1832,12 @@ func TestGetMinRequeueAfter(t *testing.T) {
18321832
Clusters: &v1alpha1.ClusterGenerator{},
18331833
}
18341834

1835-
generatorMock0 := mocks.Generator{}
1836-
generatorMock0.On("GetRequeueAfter", &generator).
1837-
Return(generators.NoRequeueAfter)
1835+
generatorMock1 := mocks.NewGenerator(t)
1836+
generatorMock1.EXPECT().GetRequeueAfter(&generator).
1837+
Return(time.Duration(1) * time.Second).Times(2)
18381838

1839-
generatorMock1 := mocks.Generator{}
1840-
generatorMock1.On("GetRequeueAfter", &generator).
1841-
Return(time.Duration(1) * time.Second)
1842-
1843-
generatorMock10 := mocks.Generator{}
1844-
generatorMock10.On("GetRequeueAfter", &generator).
1839+
generatorMock10 := mocks.NewGenerator(t)
1840+
generatorMock10.EXPECT().GetRequeueAfter(&generator).
18451841
Return(time.Duration(10) * time.Second)
18461842

18471843
r := ApplicationSetReconciler{
@@ -1850,9 +1846,9 @@ func TestGetMinRequeueAfter(t *testing.T) {
18501846
Recorder: record.NewFakeRecorder(0),
18511847
Metrics: metrics,
18521848
Generators: map[string]generators.Generator{
1853-
"List": &generatorMock10,
1854-
"Git": &generatorMock1,
1855-
"Clusters": &generatorMock1,
1849+
"List": generatorMock10,
1850+
"Git": generatorMock1,
1851+
"Clusters": generatorMock1,
18561852
},
18571853
}
18581854

@@ -1889,10 +1885,10 @@ func TestRequeueGeneratorFails(t *testing.T) {
18891885
PullRequest: &v1alpha1.PullRequestGenerator{},
18901886
}
18911887

1892-
generatorMock := mocks.Generator{}
1893-
generatorMock.On("GetTemplate", &generator).
1888+
generatorMock := mocks.NewGenerator(t)
1889+
generatorMock.EXPECT().GetTemplate(&generator).
18941890
Return(&v1alpha1.ApplicationSetTemplate{})
1895-
generatorMock.On("GenerateParams", &generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
1891+
generatorMock.EXPECT().GenerateParams(&generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
18961892
Return([]map[string]any{}, errors.New("Simulated error generating params that could be related to an external service/API call"))
18971893

18981894
metrics := appsetmetrics.NewFakeAppsetMetrics()
@@ -1902,7 +1898,7 @@ func TestRequeueGeneratorFails(t *testing.T) {
19021898
Scheme: scheme,
19031899
Recorder: record.NewFakeRecorder(0),
19041900
Generators: map[string]generators.Generator{
1905-
"PullRequest": &generatorMock,
1901+
"PullRequest": generatorMock,
19061902
},
19071903
Metrics: metrics,
19081904
}

‎applicationset/controllers/requeue_after_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
)
2323

2424
func TestRequeueAfter(t *testing.T) {
25-
mockServer := &mocks.Repos{}
25+
mockServer := mocks.NewRepos(t)
2626
ctx := t.Context()
2727
scheme := runtime.NewScheme()
2828
err := argov1alpha1.AddToScheme(scheme)

‎applicationset/controllers/template/template_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -86,38 +86,38 @@ func TestGenerateApplications(t *testing.T) {
8686
}
8787

8888
t.Run(cc.name, func(t *testing.T) {
89-
generatorMock := genmock.Generator{}
89+
generatorMock := genmock.NewGenerator(t)
9090
generator := v1alpha1.ApplicationSetGenerator{
9191
List: &v1alpha1.ListGenerator{},
9292
}
9393

94-
generatorMock.On("GenerateParams", &generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
94+
generatorMock.EXPECT().GenerateParams(&generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
9595
Return(cc.params, cc.generateParamsError)
9696

97-
generatorMock.On("GetTemplate", &generator).
97+
generatorMock.EXPECT().GetTemplate(&generator).
9898
Return(&v1alpha1.ApplicationSetTemplate{})
9999

100-
rendererMock := rendmock.Renderer{}
100+
rendererMock := rendmock.NewRenderer(t)
101101

102102
var expectedApps []v1alpha1.Application
103103

104104
if cc.generateParamsError == nil {
105105
for _, p := range cc.params {
106106
if cc.rendererError != nil {
107-
rendererMock.On("RenderTemplateParams", GetTempApplication(cc.template), mock.AnythingOfType("*v1alpha1.ApplicationSetSyncPolicy"), p, false, []string(nil)).
107+
rendererMock.EXPECT().RenderTemplateParams(GetTempApplication(cc.template), mock.AnythingOfType("*v1alpha1.ApplicationSetSyncPolicy"), p, false, []string(nil)).
108108
Return(nil, cc.rendererError)
109109
} else {
110-
rendererMock.On("RenderTemplateParams", GetTempApplication(cc.template), mock.AnythingOfType("*v1alpha1.ApplicationSetSyncPolicy"), p, false, []string(nil)).
110+
rendererMock.EXPECT().RenderTemplateParams(GetTempApplication(cc.template), mock.AnythingOfType("*v1alpha1.ApplicationSetSyncPolicy"), p, false, []string(nil)).
111111
Return(&app, nil)
112112
expectedApps = append(expectedApps, app)
113113
}
114114
}
115115
}
116116

117117
generators := map[string]generators.Generator{
118-
"List": &generatorMock,
118+
"List": generatorMock,
119119
}
120-
renderer := &rendererMock
120+
renderer := rendererMock
121121

122122
got, reason, err := GenerateApplications(log.NewEntry(log.StandardLogger()), v1alpha1.ApplicationSet{
123123
ObjectMeta: metav1.ObjectMeta{
@@ -200,26 +200,26 @@ func TestMergeTemplateApplications(t *testing.T) {
200200
cc := c
201201

202202
t.Run(cc.name, func(t *testing.T) {
203-
generatorMock := genmock.Generator{}
203+
generatorMock := genmock.NewGenerator(t)
204204
generator := v1alpha1.ApplicationSetGenerator{
205205
List: &v1alpha1.ListGenerator{},
206206
}
207207

208-
generatorMock.On("GenerateParams", &generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
208+
generatorMock.EXPECT().GenerateParams(&generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
209209
Return(cc.params, nil)
210210

211-
generatorMock.On("GetTemplate", &generator).
211+
generatorMock.EXPECT().GetTemplate(&generator).
212212
Return(&cc.overrideTemplate)
213213

214-
rendererMock := rendmock.Renderer{}
214+
rendererMock := rendmock.NewRenderer(t)
215215

216-
rendererMock.On("RenderTemplateParams", GetTempApplication(cc.expectedMerged), mock.AnythingOfType("*v1alpha1.ApplicationSetSyncPolicy"), cc.params[0], false, []string(nil)).
216+
rendererMock.EXPECT().RenderTemplateParams(GetTempApplication(cc.expectedMerged), mock.AnythingOfType("*v1alpha1.ApplicationSetSyncPolicy"), cc.params[0], false, []string(nil)).
217217
Return(&cc.expectedApps[0], nil)
218218

219219
generators := map[string]generators.Generator{
220-
"List": &generatorMock,
220+
"List": generatorMock,
221221
}
222-
renderer := &rendererMock
222+
renderer := rendererMock
223223

224224
got, _, _ := GenerateApplications(log.NewEntry(log.StandardLogger()), v1alpha1.ApplicationSet{
225225
ObjectMeta: metav1.ObjectMeta{
@@ -312,19 +312,19 @@ func TestGenerateAppsUsingPullRequestGenerator(t *testing.T) {
312312
},
313313
} {
314314
t.Run(cases.name, func(t *testing.T) {
315-
generatorMock := genmock.Generator{}
315+
generatorMock := genmock.NewGenerator(t)
316316
generator := v1alpha1.ApplicationSetGenerator{
317317
PullRequest: &v1alpha1.PullRequestGenerator{},
318318
}
319319

320-
generatorMock.On("GenerateParams", &generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
320+
generatorMock.EXPECT().GenerateParams(&generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
321321
Return(cases.params, nil)
322322

323-
generatorMock.On("GetTemplate", &generator).
324-
Return(&cases.template, nil)
323+
generatorMock.EXPECT().GetTemplate(&generator).
324+
Return(&cases.template)
325325

326326
generators := map[string]generators.Generator{
327-
"PullRequest": &generatorMock,
327+
"PullRequest": generatorMock,
328328
}
329329
renderer := &utils.Render{}
330330

‎applicationset/generators/generator_spec_processor_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -345,17 +345,18 @@ func getMockClusterGenerator() Generator {
345345
return NewClusterGenerator(context.Background(), fakeClient, appClientset, "namespace")
346346
}
347347

348-
func getMockGitGenerator() Generator {
349-
argoCDServiceMock := mocks.Repos{}
350-
argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything).Return([]string{"app1", "app2", "app_3", "p1/app4"}, nil)
351-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "namespace")
348+
func getMockGitGenerator(t *testing.T) Generator {
349+
t.Helper()
350+
argoCDServiceMock := mocks.NewRepos(t)
351+
argoCDServiceMock.EXPECT().GetDirectories(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]string{"app1", "app2", "app_3", "p1/app4"}, nil).Maybe()
352+
gitGenerator := NewGitGenerator(argoCDServiceMock, "namespace")
352353
return gitGenerator
353354
}
354355

355356
func TestGetRelevantGenerators(t *testing.T) {
356357
testGenerators := map[string]Generator{
357358
"Clusters": getMockClusterGenerator(),
358-
"Git": getMockGitGenerator(),
359+
"Git": getMockGitGenerator(t),
359360
}
360361

361362
testGenerators["Matrix"] = NewMatrixGenerator(testGenerators)

0 commit comments

Comments
 (0)