Skip to content

Commit 65fb59c

Browse files
SammyOinaSammyOina
committed
Update mockery calls in tests to include additional parameters for improved accuracy
Signed-off-by: Sammy Oina <sammyoina@gmail.com>
1 parent 2d9e750 commit 65fb59c

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎cli/certs_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ func TestGetCertCmd(t *testing.T) {
104104

105105
for _, tc := range cases {
106106
t.Run(tc.desc, func(t *testing.T) {
107-
sdkCall := sdkMock.On("ViewCertByClient", mock.Anything, mock.Anything, mock.Anything).Return(tc.serials, tc.sdkErr)
108-
sdkCall1 := sdkMock.On("ViewCert", mock.Anything, mock.Anything, mock.Anything).Return(tc.cert, tc.sdkErr)
107+
sdkCall := sdkMock.On("ViewCertByClient", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.serials, tc.sdkErr)
108+
sdkCall1 := sdkMock.On("ViewCert", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.cert, tc.sdkErr)
109109
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
110110
switch tc.logType {
111111
case entityLog:
@@ -183,7 +183,7 @@ func TestRevokeCertCmd(t *testing.T) {
183183

184184
for _, tc := range cases {
185185
t.Run(tc.desc, func(t *testing.T) {
186-
sdkCall := sdkMock.On("RevokeCert", tc.args[0], tc.args[1], tc.args[2]).Return(tc.time, tc.sdkErr)
186+
sdkCall := sdkMock.On("RevokeCert", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.time, tc.sdkErr)
187187
out := executeCommand(t, rootCmd, append([]string{revokeCmd}, tc.args...)...)
188188

189189
switch tc.logType {
@@ -253,7 +253,7 @@ func TestIssueCertCmd(t *testing.T) {
253253

254254
for _, tc := range cases {
255255
t.Run(tc.desc, func(t *testing.T) {
256-
sdkCall := sdkMock.On("IssueCert", mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.cert, tc.sdkErr)
256+
sdkCall := sdkMock.On("IssueCert", mock.Anything, mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.cert, tc.sdkErr)
257257
out := executeCommand(t, rootCmd, append([]string{issueCmd}, tc.args...)...)
258258

259259
switch tc.logType {

‎cli/channels_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestCreateChannelCmd(t *testing.T) {
8787

8888
for _, tc := range cases {
8989
t.Run(tc.desc, func(t *testing.T) {
90-
sdkCall := sdkMock.On("CreateChannel", mock.Anything, tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
90+
sdkCall := sdkMock.On("CreateChannel", mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
9191
out := executeCommand(t, rootCmd, append([]string{createCmd}, tc.args...)...)
9292

9393
switch tc.logType {
@@ -181,8 +181,8 @@ func TestGetChannelsCmd(t *testing.T) {
181181

182182
for _, tc := range cases {
183183
t.Run(tc.desc, func(t *testing.T) {
184-
sdkCall := sdkMock.On("Channel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
185-
sdkCall1 := sdkMock.On("Channels", mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
184+
sdkCall := sdkMock.On("Channel", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
185+
sdkCall1 := sdkMock.On("Channels", mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
186186

187187
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
188188

@@ -266,7 +266,7 @@ func TestDeleteChannelCmd(t *testing.T) {
266266

267267
for _, tc := range cases {
268268
t.Run(tc.desc, func(t *testing.T) {
269-
sdkCall := sdkMock.On("DeleteChannel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
269+
sdkCall := sdkMock.On("DeleteChannel", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
270270
out := executeCommand(t, rootCmd, append([]string{delCmd}, tc.args...)...)
271271

272272
switch tc.logType {
@@ -350,7 +350,7 @@ func TestUpdateChannelCmd(t *testing.T) {
350350
for _, tc := range cases {
351351
t.Run(tc.desc, func(t *testing.T) {
352352
var ch mgsdk.Channel
353-
sdkCall := sdkMock.On("UpdateChannel", mock.Anything, tc.args[2], tc.args[3]).Return(tc.channel, tc.sdkErr)
353+
sdkCall := sdkMock.On("UpdateChannel", mock.Anything, mock.Anything, tc.args[2], tc.args[3]).Return(tc.channel, tc.sdkErr)
354354
out := executeCommand(t, rootCmd, append([]string{updCmd}, tc.args...)...)
355355

356356
switch tc.logType {
@@ -429,7 +429,7 @@ func TestEnableChannelCmd(t *testing.T) {
429429

430430
for _, tc := range cases {
431431
t.Run(tc.desc, func(t *testing.T) {
432-
sdkCall := sdkMock.On("EnableChannel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
432+
sdkCall := sdkMock.On("EnableChannel", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
433433
out := executeCommand(t, rootCmd, append([]string{enableCmd}, tc.args...)...)
434434

435435
switch tc.logType {
@@ -510,7 +510,7 @@ func TestDisableChannelCmd(t *testing.T) {
510510

511511
for _, tc := range cases {
512512
t.Run(tc.desc, func(t *testing.T) {
513-
sdkCall := sdkMock.On("DisableChannel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
513+
sdkCall := sdkMock.On("DisableChannel", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
514514
out := executeCommand(t, rootCmd, append([]string{disableCmd}, tc.args...)...)
515515

516516
switch tc.logType {

‎cli/clients_test.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,9 @@ func TestUpdateClientCmd(t *testing.T) {
434434
for _, tc := range cases {
435435
t.Run(tc.desc, func(t *testing.T) {
436436
var tg smqsdk.Client
437-
sdkCall := sdkMock.On("UpdateClient", mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
438-
sdkCall1 := sdkMock.On("UpdateClientTags", mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
439-
sdkCall2 := sdkMock.On("UpdateClientSecret", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
437+
sdkCall := sdkMock.On("UpdateClient", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
438+
sdkCall1 := sdkMock.On("UpdateClientTags", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
439+
sdkCall2 := sdkMock.On("UpdateClientSecret", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
440440

441441
switch {
442442
case tc.args[0] == tagUpdateType:
@@ -530,7 +530,7 @@ func TestDeleteClientCmd(t *testing.T) {
530530

531531
for _, tc := range cases {
532532
t.Run(tc.desc, func(t *testing.T) {
533-
sdkCall := sdkMock.On("DeleteClient", tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
533+
sdkCall := sdkMock.On("DeleteClient", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
534534
out := executeCommand(t, rootCmd, append([]string{delCmd}, tc.args...)...)
535535

536536
switch tc.logType {
@@ -608,7 +608,7 @@ func TestEnableClientCmd(t *testing.T) {
608608

609609
for _, tc := range cases {
610610
t.Run(tc.desc, func(t *testing.T) {
611-
sdkCall := sdkMock.On("EnableClient", tc.args[0], tc.args[1], tc.args[2]).Return(tc.client, tc.sdkErr)
611+
sdkCall := sdkMock.On("EnableClient", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.client, tc.sdkErr)
612612
out := executeCommand(t, rootCmd, append([]string{enableCmd}, tc.args...)...)
613613

614614
switch tc.logType {
@@ -689,7 +689,7 @@ func TestDisableclientCmd(t *testing.T) {
689689

690690
for _, tc := range cases {
691691
t.Run(tc.desc, func(t *testing.T) {
692-
sdkCall := sdkMock.On("DisableClient", tc.args[0], tc.args[1], tc.args[2]).Return(tc.client, tc.sdkErr)
692+
sdkCall := sdkMock.On("DisableClient", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.client, tc.sdkErr)
693693
out := executeCommand(t, rootCmd, append([]string{disableCmd}, tc.args...)...)
694694

695695
switch tc.logType {
@@ -789,7 +789,7 @@ func TestConnectClientCmd(t *testing.T) {
789789

790790
for _, tc := range cases {
791791
t.Run(tc.desc, func(t *testing.T) {
792-
sdkCall := sdkMock.On("Connect", mock.Anything, tc.args[3], tc.args[4]).Return(tc.sdkErr)
792+
sdkCall := sdkMock.On("Connect", mock.Anything, mock.Anything, tc.args[3], tc.args[4]).Return(tc.sdkErr)
793793
out := executeCommand(t, rootCmd, append([]string{connCmd}, tc.args...)...)
794794

795795
switch tc.logType {
@@ -884,7 +884,7 @@ func TestDisconnectClientCmd(t *testing.T) {
884884

885885
for _, tc := range cases {
886886
t.Run(tc.desc, func(t *testing.T) {
887-
sdkCall := sdkMock.On("Disconnect", mock.Anything, tc.args[3], tc.args[4]).Return(tc.sdkErr)
887+
sdkCall := sdkMock.On("Disconnect", mock.Anything, mock.Anything, tc.args[3], tc.args[4]).Return(tc.sdkErr)
888888
out := executeCommand(t, rootCmd, append([]string{disconnCmd}, tc.args...)...)
889889

890890
switch tc.logType {
@@ -950,7 +950,7 @@ func TestCreateClientRoleCmd(t *testing.T) {
950950

951951
for _, tc := range cases {
952952
t.Run(tc.desc, func(t *testing.T) {
953-
sdkCall := sdkMock.On("CreateClientRole", tc.args[1], tc.args[2], roleReq, tc.args[3]).Return(tc.role, tc.sdkErr)
953+
sdkCall := sdkMock.On("CreateClientRole", mock.Anything, tc.args[1], tc.args[2], roleReq, tc.args[3]).Return(tc.role, tc.sdkErr)
954954
out := executeCommand(t, rootCmd, append([]string{"roles", "create"}, tc.args...)...)
955955

956956
switch tc.logType {
@@ -1021,9 +1021,9 @@ func TestGetClientRolesCmd(t *testing.T) {
10211021

10221022
for _, tc := range cases {
10231023
t.Run(tc.desc, func(t *testing.T) {
1024-
sdkCall := sdkMock.On("ClientRoles", tc.args[1], tc.args[2], mock.Anything, tc.args[3]).Return(tc.roles, tc.sdkErr)
1024+
sdkCall := sdkMock.On("ClientRoles", mock.Anything, tc.args[1], tc.args[2], mock.Anything, tc.args[3]).Return(tc.roles, tc.sdkErr)
10251025
if tc.args[0] != all {
1026-
sdkCall = sdkMock.On("ClientRole", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(role, tc.sdkErr)
1026+
sdkCall = sdkMock.On("ClientRole", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(role, tc.sdkErr)
10271027
}
10281028
out := executeCommand(t, rootCmd, append([]string{"roles", "get"}, tc.args...)...)
10291029

@@ -1091,7 +1091,7 @@ func TestUpdateClientRoleCmd(t *testing.T) {
10911091

10921092
for _, tc := range cases {
10931093
t.Run(tc.desc, func(t *testing.T) {
1094-
sdkCall := sdkMock.On("UpdateClientRole", tc.args[2], tc.args[1], tc.args[0], tc.args[3], tc.args[4]).Return(tc.role, tc.sdkErr)
1094+
sdkCall := sdkMock.On("UpdateClientRole", mock.Anything, tc.args[2], tc.args[1], tc.args[0], tc.args[3], tc.args[4]).Return(tc.role, tc.sdkErr)
10951095
out := executeCommand(t, rootCmd, append([]string{"roles", "update"}, tc.args...)...)
10961096

10971097
switch tc.logType {
@@ -1148,7 +1148,7 @@ func TestDeleteClientRoleCmd(t *testing.T) {
11481148

11491149
for _, tc := range cases {
11501150
t.Run(tc.desc, func(t *testing.T) {
1151-
sdkCall := sdkMock.On("DeleteClientRole", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.sdkErr)
1151+
sdkCall := sdkMock.On("DeleteClientRole", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.sdkErr)
11521152
out := executeCommand(t, rootCmd, append([]string{"roles", "delete"}, tc.args...)...)
11531153

11541154
switch tc.logType {
@@ -1212,7 +1212,7 @@ func TestAddClientRoleActionsCmd(t *testing.T) {
12121212

12131213
for _, tc := range cases {
12141214
t.Run(tc.desc, func(t *testing.T) {
1215-
sdkCall := sdkMock.On("AddClientRoleActions", tc.args[2], tc.args[1], tc.args[3], tc.actions, tc.args[4]).Return(tc.actions, tc.sdkErr)
1215+
sdkCall := sdkMock.On("AddClientRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.actions, tc.args[4]).Return(tc.actions, tc.sdkErr)
12161216
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "add"}, tc.args...)...)
12171217

12181218
switch tc.logType {
@@ -1273,7 +1273,7 @@ func TestListClientRoleActionsCmd(t *testing.T) {
12731273

12741274
for _, tc := range cases {
12751275
t.Run(tc.desc, func(t *testing.T) {
1276-
sdkCall := sdkMock.On("ClientRoleActions", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.actions, tc.sdkErr)
1276+
sdkCall := sdkMock.On("ClientRoleActions", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.actions, tc.sdkErr)
12771277
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "list"}, tc.args...)...)
12781278

12791279
switch tc.logType {
@@ -1351,9 +1351,9 @@ func TestDeleteClientRoleActionsCmd(t *testing.T) {
13511351
t.Run(tc.desc, func(t *testing.T) {
13521352
var sdkCall *mock.Call
13531353
if tc.args[0] == all {
1354-
sdkCall = sdkMock.On("RemoveAllClientRoleActions", tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
1354+
sdkCall = sdkMock.On("RemoveAllClientRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
13551355
} else {
1356-
sdkCall = sdkMock.On("RemoveClientRoleActions", tc.args[2], tc.args[1], tc.args[3], actions.Actions, tc.args[4]).Return(tc.sdkErr)
1356+
sdkCall = sdkMock.On("RemoveClientRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], actions.Actions, tc.args[4]).Return(tc.sdkErr)
13571357
}
13581358
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "delete"}, tc.args...)...)
13591359

@@ -1408,7 +1408,7 @@ func TestAvailableClientRoleActionsCmd(t *testing.T) {
14081408

14091409
for _, tc := range cases {
14101410
t.Run(tc.desc, func(t *testing.T) {
1411-
sdkCall := sdkMock.On("AvailableClientRoleActions", tc.args[0], tc.args[1]).Return(tc.actions, tc.sdkErr)
1411+
sdkCall := sdkMock.On("AvailableClientRoleActions", mock.Anything, tc.args[0], tc.args[1]).Return(tc.actions, tc.sdkErr)
14121412
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "available-actions"}, tc.args...)...)
14131413

14141414
switch tc.logType {
@@ -1475,7 +1475,7 @@ func TestAddClientRoleMembersCmd(t *testing.T) {
14751475

14761476
for _, tc := range cases {
14771477
t.Run(tc.desc, func(t *testing.T) {
1478-
sdkCall := sdkMock.On("AddClientRoleMembers", tc.args[2], tc.args[1], tc.args[3], tc.members, tc.args[4]).Return(tc.members, tc.sdkErr)
1478+
sdkCall := sdkMock.On("AddClientRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.members, tc.args[4]).Return(tc.members, tc.sdkErr)
14791479
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "add"}, tc.args...)...)
14801480

14811481
switch tc.logType {
@@ -1543,7 +1543,7 @@ func TestListClientRoleMembersCmd(t *testing.T) {
15431543

15441544
for _, tc := range cases {
15451545
t.Run(tc.desc, func(t *testing.T) {
1546-
sdkCall := sdkMock.On("ClientRoleMembers", tc.args[1], tc.args[0], tc.args[2], mock.Anything, tc.args[3]).Return(tc.members, tc.sdkErr)
1546+
sdkCall := sdkMock.On("ClientRoleMembers", mock.Anything, tc.args[1], tc.args[0], tc.args[2], mock.Anything, tc.args[3]).Return(tc.members, tc.sdkErr)
15471547
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "list"}, tc.args...)...)
15481548

15491549
switch tc.logType {
@@ -1621,9 +1621,9 @@ func TestDeleteClientRoleMembersCmd(t *testing.T) {
16211621
t.Run(tc.desc, func(t *testing.T) {
16221622
var sdkCall *mock.Call
16231623
if tc.args[0] == all {
1624-
sdkCall = sdkMock.On("RemoveAllClientRoleMembers", tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
1624+
sdkCall = sdkMock.On("RemoveAllClientRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
16251625
} else {
1626-
sdkCall = sdkMock.On("RemoveClientRoleMembers", tc.args[2], tc.args[1], tc.args[3], members.Members, tc.args[4]).Return(tc.sdkErr)
1626+
sdkCall = sdkMock.On("RemoveClientRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], members.Members, tc.args[4]).Return(tc.sdkErr)
16271627
}
16281628
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "delete"}, tc.args...)...)
16291629

0 commit comments

Comments
 (0)