Skip to content

Commit 3652b7b

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

34 files changed

+1617
-1179
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,15 +1832,15 @@ func TestGetMinRequeueAfter(t *testing.T) {
18321832
Clusters: &v1alpha1.ClusterGenerator{},
18331833
}
18341834

1835-
generatorMock0 := mocks.Generator{}
1835+
generatorMock0 := mocks.NewGenerator(t)
18361836
generatorMock0.On("GetRequeueAfter", &generator).
18371837
Return(generators.NoRequeueAfter)
18381838

1839-
generatorMock1 := mocks.Generator{}
1839+
generatorMock1 := mocks.NewGenerator(t)
18401840
generatorMock1.On("GetRequeueAfter", &generator).
18411841
Return(time.Duration(1) * time.Second)
18421842

1843-
generatorMock10 := mocks.Generator{}
1843+
generatorMock10 := mocks.NewGenerator(t)
18441844
generatorMock10.On("GetRequeueAfter", &generator).
18451845
Return(time.Duration(10) * time.Second)
18461846

@@ -1850,9 +1850,9 @@ func TestGetMinRequeueAfter(t *testing.T) {
18501850
Recorder: record.NewFakeRecorder(0),
18511851
Metrics: metrics,
18521852
Generators: map[string]generators.Generator{
1853-
"List": &generatorMock10,
1854-
"Git": &generatorMock1,
1855-
"Clusters": &generatorMock1,
1853+
"List": generatorMock10,
1854+
"Git": generatorMock1,
1855+
"Clusters": generatorMock1,
18561856
},
18571857
}
18581858

@@ -1889,7 +1889,7 @@ func TestRequeueGeneratorFails(t *testing.T) {
18891889
PullRequest: &v1alpha1.PullRequestGenerator{},
18901890
}
18911891

1892-
generatorMock := mocks.Generator{}
1892+
generatorMock := mocks.NewGenerator(t)
18931893
generatorMock.On("GetTemplate", &generator).
18941894
Return(&v1alpha1.ApplicationSetTemplate{})
18951895
generatorMock.On("GenerateParams", &generator, mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).
@@ -1902,7 +1902,7 @@ func TestRequeueGeneratorFails(t *testing.T) {
19021902
Scheme: scheme,
19031903
Recorder: record.NewFakeRecorder(0),
19041904
Generators: map[string]generators.Generator{
1905-
"PullRequest": &generatorMock,
1905+
"PullRequest": generatorMock,
19061906
},
19071907
Metrics: metrics,
19081908
}

‎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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ 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
}
@@ -97,7 +97,7 @@ func TestGenerateApplications(t *testing.T) {
9797
generatorMock.On("GetTemplate", &generator).
9898
Return(&v1alpha1.ApplicationSetTemplate{})
9999

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

102102
var expectedApps []v1alpha1.Application
103103

@@ -115,9 +115,9 @@ func TestGenerateApplications(t *testing.T) {
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,7 +200,7 @@ 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
}
@@ -211,15 +211,15 @@ func TestMergeTemplateApplications(t *testing.T) {
211211
generatorMock.On("GetTemplate", &generator).
212212
Return(&cc.overrideTemplate)
213213

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

216216
rendererMock.On("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,7 +312,7 @@ 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
}
@@ -321,10 +321,10 @@ func TestGenerateAppsUsingPullRequestGenerator(t *testing.T) {
321321
Return(cases.params, nil)
322322

323323
generatorMock.On("GetTemplate", &generator).
324-
Return(&cases.template, nil)
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: 5 additions & 4 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{}
348+
func getMockGitGenerator(t *testing.T) Generator {
349+
t.Helper()
350+
argoCDServiceMock := mocks.NewRepos(t)
350351
argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything).Return([]string{"app1", "app2", "app_3", "p1/app4"}, nil)
351-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "namespace")
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)

‎applicationset/generators/git_test.go‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -320,11 +320,11 @@ func TestGitGenerateParamsFromDirectories(t *testing.T) {
320320
t.Run(testCaseCopy.name, func(t *testing.T) {
321321
t.Parallel()
322322

323-
argoCDServiceMock := mocks.Repos{}
323+
argoCDServiceMock := mocks.NewRepos(t)
324324

325325
argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(testCaseCopy.repoApps, testCaseCopy.repoError)
326326

327-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "")
327+
gitGenerator := NewGitGenerator(argoCDServiceMock, "")
328328
applicationSetInfo := v1alpha1.ApplicationSet{
329329
ObjectMeta: metav1.ObjectMeta{
330330
Name: "set",
@@ -623,11 +623,11 @@ func TestGitGenerateParamsFromDirectoriesGoTemplate(t *testing.T) {
623623
t.Run(testCaseCopy.name, func(t *testing.T) {
624624
t.Parallel()
625625

626-
argoCDServiceMock := mocks.Repos{}
626+
argoCDServiceMock := mocks.NewRepos(t)
627627

628628
argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(testCaseCopy.repoApps, testCaseCopy.repoError)
629629

630-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "")
630+
gitGenerator := NewGitGenerator(argoCDServiceMock, "")
631631
applicationSetInfo := v1alpha1.ApplicationSet{
632632
ObjectMeta: metav1.ObjectMeta{
633633
Name: "set",
@@ -1000,11 +1000,11 @@ cluster:
10001000
t.Run(testCaseCopy.name, func(t *testing.T) {
10011001
t.Parallel()
10021002

1003-
argoCDServiceMock := mocks.Repos{}
1003+
argoCDServiceMock := mocks.NewRepos(t)
10041004
argoCDServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
10051005
Return(testCaseCopy.repoFileContents, testCaseCopy.repoPathsError)
10061006

1007-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "")
1007+
gitGenerator := NewGitGenerator(argoCDServiceMock, "")
10081008
applicationSetInfo := v1alpha1.ApplicationSet{
10091009
ObjectMeta: metav1.ObjectMeta{
10101010
Name: "set",
@@ -1331,7 +1331,7 @@ env: testing
13311331
t.Run(testCaseCopy.name, func(t *testing.T) {
13321332
t.Parallel()
13331333

1334-
argoCDServiceMock := mocks.Repos{}
1334+
argoCDServiceMock := mocks.NewRepos(t)
13351335

13361336
// IMPORTANT: we try to get the files from the repo server that matches the patterns
13371337
// If we find those files also satisfy the exclude pattern, we remove them from map
@@ -1350,7 +1350,7 @@ env: testing
13501350
Return(testCaseCopy.includeFiles, testCaseCopy.repoPathsError)
13511351
}
13521352

1353-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "")
1353+
gitGenerator := NewGitGenerator(argoCDServiceMock, "")
13541354
applicationSetInfo := v1alpha1.ApplicationSet{
13551355
ObjectMeta: metav1.ObjectMeta{
13561356
Name: "set",
@@ -1672,7 +1672,7 @@ env: testing
16721672
t.Run(testCaseCopy.name, func(t *testing.T) {
16731673
t.Parallel()
16741674

1675-
argoCDServiceMock := mocks.Repos{}
1675+
argoCDServiceMock := mocks.NewRepos(t)
16761676

16771677
// IMPORTANT: we try to get the files from the repo server that matches the patterns
16781678
// If we find those files also satisfy the exclude pattern, we remove them from map
@@ -1691,7 +1691,7 @@ env: testing
16911691
Return(testCaseCopy.includeFiles, testCaseCopy.repoPathsError)
16921692
}
16931693

1694-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "")
1694+
gitGenerator := NewGitGenerator(argoCDServiceMock, "")
16951695
applicationSetInfo := v1alpha1.ApplicationSet{
16961696
ObjectMeta: metav1.ObjectMeta{
16971697
Name: "set",
@@ -1908,7 +1908,7 @@ func TestGitGeneratorParamsFromFilesWithExcludeOptionGoTemplate(t *testing.T) {
19081908
t.Run(testCaseCopy.name, func(t *testing.T) {
19091909
t.Parallel()
19101910

1911-
argoCDServiceMock := mocks.Repos{}
1911+
argoCDServiceMock := mocks.NewRepos(t)
19121912
// IMPORTANT: we try to get the files from the repo server that matches the patterns
19131913
// If we find those files also satisfy the exclude pattern, we remove them from map
19141914
// This is generally done by the g.repos.GetFiles() function.
@@ -1926,7 +1926,7 @@ func TestGitGeneratorParamsFromFilesWithExcludeOptionGoTemplate(t *testing.T) {
19261926
Return(testCaseCopy.includeFiles, testCaseCopy.repoPathsError)
19271927
}
19281928

1929-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "")
1929+
gitGenerator := NewGitGenerator(argoCDServiceMock, "")
19301930
applicationSetInfo := v1alpha1.ApplicationSet{
19311931
ObjectMeta: metav1.ObjectMeta{
19321932
Name: "set",
@@ -2279,11 +2279,11 @@ cluster:
22792279
t.Run(testCaseCopy.name, func(t *testing.T) {
22802280
t.Parallel()
22812281

2282-
argoCDServiceMock := mocks.Repos{}
2282+
argoCDServiceMock := mocks.NewRepos(t)
22832283
argoCDServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
22842284
Return(testCaseCopy.repoFileContents, testCaseCopy.repoPathsError)
22852285

2286-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "")
2286+
gitGenerator := NewGitGenerator(argoCDServiceMock, "")
22872287
applicationSetInfo := v1alpha1.ApplicationSet{
22882288
ObjectMeta: metav1.ObjectMeta{
22892289
Name: "set",
@@ -2482,35 +2482,37 @@ func TestGitGenerator_GenerateParams(t *testing.T) {
24822482
},
24832483
}
24842484
for _, testCase := range cases {
2485-
argoCDServiceMock := mocks.Repos{}
2485+
t.Run(testCase.name, func(t *testing.T) {
2486+
argoCDServiceMock := mocks.NewRepos(t)
2487+
2488+
if testCase.callGetDirectories {
2489+
var project any
2490+
if testCase.expectedProject != nil {
2491+
project = *testCase.expectedProject
2492+
} else {
2493+
project = mock.Anything
2494+
}
24862495

2487-
if testCase.callGetDirectories {
2488-
var project any
2489-
if testCase.expectedProject != nil {
2490-
project = *testCase.expectedProject
2491-
} else {
2492-
project = mock.Anything
2496+
argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything, project, mock.Anything, mock.Anything).Return(testCase.repoApps, testCase.repoPathsError)
24932497
}
2498+
gitGenerator := NewGitGenerator(argoCDServiceMock, "argocd")
24942499

2495-
argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything, project, mock.Anything, mock.Anything).Return(testCase.repoApps, testCase.repoPathsError)
2496-
}
2497-
gitGenerator := NewGitGenerator(&argoCDServiceMock, "argocd")
2498-
2499-
scheme := runtime.NewScheme()
2500-
err := v1alpha1.AddToScheme(scheme)
2501-
require.NoError(t, err)
2500+
scheme := runtime.NewScheme()
2501+
err := v1alpha1.AddToScheme(scheme)
2502+
require.NoError(t, err)
25022503

2503-
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&testCase.appProject).Build()
2504+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&testCase.appProject).Build()
25042505

2505-
got, err := gitGenerator.GenerateParams(&testCase.appset.Spec.Generators[0], &testCase.appset, client)
2506+
got, err := gitGenerator.GenerateParams(&testCase.appset.Spec.Generators[0], &testCase.appset, client)
25062507

2507-
if testCase.expectedError != nil {
2508-
require.EqualError(t, err, testCase.expectedError.Error())
2509-
} else {
2510-
require.NoError(t, err)
2511-
assert.Equal(t, testCase.expected, got)
2512-
}
2508+
if testCase.expectedError != nil {
2509+
require.EqualError(t, err, testCase.expectedError.Error())
2510+
} else {
2511+
require.NoError(t, err)
2512+
assert.Equal(t, testCase.expected, got)
2513+
}
25132514

2514-
argoCDServiceMock.AssertExpectations(t)
2515+
argoCDServiceMock.AssertExpectations(t)
2516+
})
25152517
}
25162518
}

‎applicationset/generators/matrix_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ func TestGitGenerator_GenerateParams_list_x_git_matrix_generator(t *testing.T) {
10851085
},
10861086
}
10871087

1088-
repoServiceMock := &mocks.Repos{}
1088+
repoServiceMock := mocks.NewRepos(t)
10891089
repoServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(map[string][]byte{
10901090
"some/path.json": []byte("test: content"),
10911091
}, nil)

‎applicationset/services/pull_request/azure_devops_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func TestListPullRequest(t *testing.T) {
9191
SearchCriteria: &git.GitPullRequestSearchCriteria{},
9292
}
9393

94-
gitClientMock := azureMock.Client{}
94+
gitClientMock := azureMock.NewClient(t)
9595
clientFactoryMock := &AzureClientFactoryMock{mock: &mock.Mock{}}
9696
clientFactoryMock.mock.On("GetClient", mock.Anything).Return(&gitClientMock, nil)
9797
gitClientMock.On("GetPullRequestsByProject", ctx, args).Return(&pullRequestMock, nil)
@@ -245,7 +245,7 @@ func TestAzureDevOpsListReturnsRepositoryNotFoundError(t *testing.T) {
245245

246246
pullRequestMock := []git.GitPullRequest{}
247247

248-
gitClientMock := azureMock.Client{}
248+
gitClientMock := azureMock.NewClient(t)
249249
clientFactoryMock := &AzureClientFactoryMock{mock: &mock.Mock{}}
250250
clientFactoryMock.mock.On("GetClient", mock.Anything).Return(&gitClientMock, nil)
251251

0 commit comments

Comments
 (0)