Skip to content

Commit 4e9dd12

Browse files
dependabot[bot]Umang01-hash
dependabot[bot]
and
Umang01-hash
authored
build(deps): bump github.com/arangodb/go-driver/v2 from 2.1.3 to 2.1.6 in /pkg/gofr/datasource/arangodb (#2512)
* build(deps): bump github.com/arangodb/go-driver/v2 Bumps [github.com/arangodb/go-driver/v2](https://github.com/arangodb/go-driver) from 2.1.3 to 2.1.6. - [Release notes](https://github.com/arangodb/go-driver/releases) - [Changelog](https://github.com/arangodb/go-driver/blob/master/CHANGELOG.md) - [Commits](arangodb/go-driver@v2.1.3...v2.1.6) --- updated-dependencies: - dependency-name: github.com/arangodb/go-driver/v2 dependency-version: 2.1.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * update arango version --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Umang Mundhra <[email protected]>
1 parent a581441 commit 4e9dd12

File tree

11 files changed

+2131
-517
lines changed

11 files changed

+2131
-517
lines changed

‎pkg/gofr/datasource/arangodb/arango_db.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,14 @@ func (d *DB) CreateCollection(ctx context.Context, database, collection string,
8282
return ErrCollectionExists
8383
}
8484

85-
options := arangodb.CreateCollectionProperties{Type: arangodb.CollectionTypeDocument}
85+
collectionType := arangodb.CollectionTypeDocument
8686
if isEdge {
87-
options.Type = arangodb.CollectionTypeEdge
87+
collectionType = arangodb.CollectionTypeEdge
8888
}
8989

90-
_, err = db.CreateCollection(tracerCtx, collection, &options)
90+
options := arangodb.CreateCollectionPropertiesV2{Type: &collectionType}
91+
92+
_, err = db.CreateCollectionV2(tracerCtx, collection, &options)
9193

9294
return err
9395
}

‎pkg/gofr/datasource/arangodb/arango_db_test.go‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ func Test_Client_CreateDB(t *testing.T) {
1818
ctx := context.Background()
1919
database := "testDB"
2020

21-
mockArango.EXPECT().CreateDatabase(gomock.Any(), database, nil).Return(nil)
21+
mockArango.EXPECT().DatabaseExists(gomock.Any(), gomock.Any()).Return(false, nil)
22+
mockArango.EXPECT().CreateDatabase(gomock.Any(), database, nil).Return(nil, nil)
2223
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
2324
mockMetrics.EXPECT().RecordHistogram(gomock.Any(), "app_arango_stats", gomock.Any(),
2425
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
@@ -33,7 +34,8 @@ func Test_Client_CreateDB_Error(t *testing.T) {
3334
ctx := context.Background()
3435
database := "errorDB"
3536

36-
mockArango.EXPECT().CreateDatabase(gomock.Any(), database, nil).Return(errDBNotFound)
37+
mockArango.EXPECT().DatabaseExists(gomock.Any(), gomock.Any()).Return(false, errDBNotFound)
38+
mockArango.EXPECT().CreateDatabase(gomock.Any(), database, nil).Return(nil, errDBNotFound)
3739
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
3840
mockMetrics.EXPECT().RecordHistogram(gomock.Any(), "app_arango_stats", gomock.Any(),
3941
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
@@ -44,11 +46,12 @@ func Test_Client_CreateDB_Error(t *testing.T) {
4446
}
4547

4648
func Test_Client_CreateDB_AlreadyExists(t *testing.T) {
47-
client, _, _, mockLogger, mockMetrics := setupDB(t)
49+
client, mockArango, _, mockLogger, mockMetrics := setupDB(t)
4850

4951
ctx := context.Background()
5052
database := "dbExists"
5153

54+
mockArango.EXPECT().DatabaseExists(gomock.Any(), gomock.Any()).Return(true, nil)
5255
mockLogger.EXPECT().Debugf("database %s already exists", database)
5356
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
5457
mockMetrics.EXPECT().RecordHistogram(gomock.Any(), "app_arango_stats", gomock.Any(),
@@ -63,11 +66,12 @@ func Test_Client_DropDB(t *testing.T) {
6366

6467
ctx := context.Background()
6568
database := "testDB"
66-
mockDB := NewMockDatabase(gomock.NewController(t))
69+
ctrl := gomock.NewController(t)
70+
mockDB := NewMockDatabase(ctrl)
6771

6872
// Mock the database method to return a mock database instance
6973
mockArango.EXPECT().GetDatabase(gomock.Any(), database, &arangodb.GetDatabaseOptions{}).
70-
Return(mockDB, nil).Times(1)
74+
Return(arangodb.Database(mockDB), nil).Times(1)
7175
mockDB.EXPECT().Remove(gomock.Any()).Return(nil).Times(1)
7276
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
7377
mockMetrics.EXPECT().RecordHistogram(gomock.Any(), "app_arango_stats", gomock.Any(),
@@ -114,10 +118,10 @@ func Test_Client_CreateCollection(t *testing.T) {
114118
client, mockArango, _, mockLogger, mockMetrics := setupDB(t)
115119
mockDB := NewMockDatabase(gomock.NewController(t))
116120

117-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
121+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
118122
Return(mockDB, nil)
119123
mockDB.EXPECT().CollectionExists(gomock.Any(), "testCollection").Return(false, nil)
120-
mockDB.EXPECT().CreateCollection(gomock.Any(), "testCollection", gomock.Any()).Return(nil, nil)
124+
mockDB.EXPECT().CreateCollectionV2(gomock.Any(), "testCollection", gomock.Any()).Return(nil, nil)
121125
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
122126
mockMetrics.EXPECT().RecordHistogram(gomock.Any(), "app_arango_stats", gomock.Any(),
123127
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
@@ -130,10 +134,10 @@ func Test_Client_CreateCollection_Error(t *testing.T) {
130134
client, mockArango, _, mockLogger, mockMetrics := setupDB(t)
131135
mockDB := NewMockDatabase(gomock.NewController(t))
132136

133-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
137+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
134138
Return(mockDB, nil)
135139
mockDB.EXPECT().CollectionExists(gomock.Any(), "testCollection").Return(false, nil)
136-
mockDB.EXPECT().CreateCollection(gomock.Any(), "testCollection", gomock.Any()).Return(nil, errCollectionNotFound)
140+
mockDB.EXPECT().CreateCollectionV2(gomock.Any(), "testCollection", gomock.Any()).Return(nil, errCollectionNotFound)
137141
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
138142
mockMetrics.EXPECT().RecordHistogram(gomock.Any(), "app_arango_stats", gomock.Any(),
139143
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
@@ -147,7 +151,7 @@ func Test_Client_CreateCollection_AlreadyExists(t *testing.T) {
147151
client, mockArango, _, mockLogger, mockMetrics := setupDB(t)
148152
mockDB := NewMockDatabase(gomock.NewController(t))
149153

150-
mockArango.EXPECT().GetDatabase(gomock.Any(), "dbExists", &arangodb.GetDatabaseOptions{}).
154+
mockArango.EXPECT().GetDatabase(gomock.Any(), "dbExists", nil).
151155
Return(mockDB, nil)
152156
mockDB.EXPECT().CollectionExists(gomock.Any(), "testCollection").Return(true, nil)
153157
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
@@ -162,12 +166,14 @@ func Test_Client_CreateCollection_AlreadyExists(t *testing.T) {
162166

163167
func Test_Client_DropCollection(t *testing.T) {
164168
client, mockArango, _, mockLogger, mockMetrics := setupDB(t)
165-
mockDB := NewMockDatabase(gomock.NewController(t))
166-
mockCollection := NewMockCollection(gomock.NewController(t))
169+
ctrl := gomock.NewController(t)
170+
mockDB := NewMockDatabase(ctrl)
171+
mockCollection := NewMockCollection(ctrl)
167172

168-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
173+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
169174
Return(mockDB, nil)
170-
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).Return(mockCollection, nil)
175+
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
176+
Return(mockCollection, nil)
171177
mockCollection.EXPECT().Remove(gomock.Any()).Return(nil)
172178
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
173179
mockMetrics.EXPECT().RecordHistogram(gomock.Any(), "app_arango_stats",
@@ -182,7 +188,7 @@ func Test_Client_DropCollection_Error(t *testing.T) {
182188
client, mockArango, _, mockLogger, mockMetrics := setupDB(t)
183189
mockDB := NewMockDatabase(gomock.NewController(t))
184190

185-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
191+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
186192
Return(mockDB, nil)
187193
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
188194
Return(nil, errCollectionNotFound)

‎pkg/gofr/datasource/arangodb/arango_document_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func Test_Client_CreateDocument(t *testing.T) {
1515
mockDB := NewMockDatabase(gomock.NewController(t))
1616
mockCollection := NewMockCollection(gomock.NewController(t))
1717

18-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
18+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
1919
Return(mockDB, nil).AnyTimes()
2020
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
2121
Return(mockCollection, nil).AnyTimes()
@@ -38,7 +38,7 @@ func Test_Client_CreateDocument_Error(t *testing.T) {
3838
mockDB := NewMockDatabase(gomock.NewController(t))
3939
mockCollection := NewMockCollection(gomock.NewController(t))
4040

41-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
41+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
4242
Return(mockDB, nil).AnyTimes()
4343
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
4444
Return(mockCollection, nil).AnyTimes()
@@ -60,7 +60,7 @@ func Test_Client_GetDocument(t *testing.T) {
6060
mockDB := NewMockDatabase(gomock.NewController(t))
6161
mockCollection := NewMockCollection(gomock.NewController(t))
6262

63-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
63+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
6464
Return(mockDB, nil).AnyTimes()
6565
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
6666
Return(mockCollection, nil).AnyTimes()
@@ -80,7 +80,7 @@ func Test_Client_GetDocument_Error(t *testing.T) {
8080
mockDB := NewMockDatabase(gomock.NewController(t))
8181
mockCollection := NewMockCollection(gomock.NewController(t))
8282

83-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
83+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
8484
Return(mockDB, nil).AnyTimes()
8585
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
8686
Return(mockCollection, nil).AnyTimes()
@@ -101,7 +101,7 @@ func Test_Client_UpdateDocument(t *testing.T) {
101101
mockCollection := NewMockCollection(gomock.NewController(t))
102102
testDocument := map[string]any{"field": "value"}
103103

104-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
104+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
105105
Return(mockDB, nil).AnyTimes()
106106
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
107107
Return(mockCollection, nil).AnyTimes()
@@ -123,7 +123,7 @@ func Test_Client_UpdateDocument_Error(t *testing.T) {
123123
mockCollection := NewMockCollection(gomock.NewController(t))
124124
testDocument := map[string]any{"field": "value"}
125125

126-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
126+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
127127
Return(mockDB, nil).AnyTimes()
128128
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
129129
Return(mockCollection, nil).AnyTimes()
@@ -142,7 +142,7 @@ func Test_Client_DeleteDocument(t *testing.T) {
142142
mockDB := NewMockDatabase(gomock.NewController(t))
143143
mockCollection := NewMockCollection(gomock.NewController(t))
144144

145-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
145+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
146146
Return(mockDB, nil).AnyTimes()
147147
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
148148
Return(mockCollection, nil).AnyTimes()
@@ -163,7 +163,7 @@ func Test_Client_DeleteDocument_Error(t *testing.T) {
163163
mockDB := NewMockDatabase(gomock.NewController(t))
164164
mockCollection := NewMockCollection(gomock.NewController(t))
165165

166-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
166+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
167167
Return(mockDB, nil).AnyTimes()
168168
mockDB.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
169169
Return(mockCollection, nil).AnyTimes()
@@ -184,7 +184,7 @@ func TestExecuteCollectionOperation(t *testing.T) {
184184

185185
mockLogger := NewMockLogger(ctrl)
186186
mockMetrics := NewMockMetrics(ctrl)
187-
mockArango := NewMockArango(ctrl)
187+
mockArango := NewMockClient(ctrl)
188188
mockDatabase := NewMockDatabase(ctrl)
189189
mockCollection := NewMockCollection(ctrl)
190190

@@ -201,7 +201,7 @@ func TestExecuteCollectionOperation(t *testing.T) {
201201
operation := "createDocument"
202202
documentID := "doc123"
203203

204-
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", &arangodb.GetDatabaseOptions{}).
204+
mockArango.EXPECT().GetDatabase(gomock.Any(), "testDB", nil).
205205
Return(mockDatabase, nil).AnyTimes()
206206
mockDatabase.EXPECT().GetCollection(gomock.Any(), "testCollection", nil).
207207
Return(mockCollection, nil).AnyTimes()

‎pkg/gofr/datasource/arangodb/arango_graph_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
// TestGraph represents the test environment for graph-related tests.
1414
type TestGraph struct {
1515
Ctrl *gomock.Controller
16-
MockArango *MockArango
16+
MockArango *MockClient
1717
MockDB *MockDatabase
1818
MockLogger *MockLogger
1919
MockMetrics *MockMetrics
@@ -30,7 +30,7 @@ func setupGraphTest(t *testing.T) *TestGraph {
3030
t.Helper()
3131
ctrl := gomock.NewController(t)
3232

33-
mockArango := NewMockArango(ctrl)
33+
mockArango := NewMockClient(ctrl)
3434
mockDB := NewMockDatabase(ctrl)
3535
mockLogger := NewMockLogger(ctrl)
3636
mockMetrics := NewMockMetrics(ctrl)
@@ -72,7 +72,7 @@ func TestGraph_CreateGraph_Success(t *testing.T) {
7272
mockGraph := NewMockGraph(test.Ctrl)
7373
graphInterface := arangodb.Graph(mockGraph)
7474

75-
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, &arangodb.GetDatabaseOptions{}).
75+
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, nil).
7676
Return(test.MockDB, nil)
7777
test.MockDB.EXPECT().GraphExists(test.Ctx, test.GraphName).Return(false, nil)
7878
test.MockDB.EXPECT().CreateGraph(
@@ -88,7 +88,7 @@ func TestGraph_CreateGraph_AlreadyExists(t *testing.T) {
8888
test := setupGraphTest(t)
8989
defer test.Ctrl.Finish()
9090

91-
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, &arangodb.GetDatabaseOptions{}).
91+
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, nil).
9292
Return(test.MockDB, nil)
9393
test.MockDB.EXPECT().GraphExists(test.Ctx, test.GraphName).Return(true, nil)
9494
test.MockLogger.EXPECT().Debugf("graph %s already exists in database %s", test.GraphName, test.DBName)
@@ -108,7 +108,7 @@ func TestGraph_CreateGraph_Error(t *testing.T) {
108108
To: []string{"toColl"},
109109
}}}
110110

111-
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, &arangodb.GetDatabaseOptions{}).
111+
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, nil).
112112
Return(test.MockDB, nil)
113113
test.MockDB.EXPECT().GraphExists(test.Ctx, test.GraphName).Return(false, nil)
114114
test.MockDB.EXPECT().CreateGraph(test.Ctx, test.GraphName, options, nil).Return(nil, errInvalidEdgeDocumentType)
@@ -126,7 +126,7 @@ func TestGraph_DropGraph_Success(t *testing.T) {
126126
mockGraph := NewMockGraph(test.Ctrl)
127127
graphInterface := arangodb.Graph(mockGraph)
128128

129-
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, &arangodb.GetDatabaseOptions{}).
129+
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, nil).
130130
Return(test.MockDB, nil)
131131
test.MockDB.EXPECT().Graph(test.Ctx, test.GraphName, nil).Return(graphInterface, nil)
132132
mockGraph.EXPECT().Remove(test.Ctx, &arangodb.RemoveGraphOptions{DropCollections: true}).Return(nil)
@@ -140,7 +140,7 @@ func TestGraph_DropGraph_DBError(t *testing.T) {
140140
test := setupGraphTest(t)
141141
defer test.Ctrl.Finish()
142142

143-
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, &arangodb.GetDatabaseOptions{}).
143+
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, nil).
144144
Return(nil, errDBNotFound)
145145

146146
err := test.Graph.DropGraph(test.Ctx, test.DBName, test.GraphName)
@@ -155,7 +155,7 @@ func TestGraph_DropGraph_Error(t *testing.T) {
155155
mockGraph := NewMockGraph(test.Ctrl)
156156
graphInterface := arangodb.Graph(mockGraph)
157157

158-
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, &arangodb.GetDatabaseOptions{}).
158+
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, nil).
159159
Return(test.MockDB, nil)
160160
test.MockDB.EXPECT().Graph(test.Ctx, test.GraphName, nil).Return(graphInterface, nil)
161161
mockGraph.EXPECT().Remove(test.Ctx, &arangodb.RemoveGraphOptions{DropCollections: true}).Return(errStatusDown)
@@ -180,7 +180,7 @@ func TestClient_GetEdges_Success(t *testing.T) {
180180

181181
var resp EdgeDetails
182182

183-
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, &arangodb.GetDatabaseOptions{}).
183+
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, nil).
184184
Return(test.MockDB, nil)
185185
test.MockDB.EXPECT().GetEdges(test.Ctx, edgeCollection, vertexID, nil).Return(expectedEdges, nil)
186186

@@ -200,7 +200,7 @@ func TestClient_GetEdges_DBError(t *testing.T) {
200200

201201
var resp EdgeDetails
202202

203-
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, &arangodb.GetDatabaseOptions{}).
203+
test.MockArango.EXPECT().GetDatabase(test.Ctx, test.DBName, nil).
204204
Return(nil, errDBNotFound)
205205

206206
err := test.Client.GetEdges(test.Ctx, test.DBName, test.GraphName, edgeCollection, vertexID, &resp)

‎pkg/gofr/datasource/arangodb/arango_helper_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
func Test_Client_CreateUser(t *testing.T) {
1414
client, mockArango, _, mockLogger, mockMetrics := setupDB(t)
1515

16-
mockArango.EXPECT().AddUser(gomock.Any(), "test", &arangodb.UserOptions{Password: "user123"}).
17-
Return(nil, nil)
16+
mockArango.EXPECT().CreateUser(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil)
17+
1818
mockLogger.EXPECT().Debug(gomock.Any())
1919
mockMetrics.EXPECT().RecordHistogram(context.Background(), "app_arango_stats",
2020
gomock.Any(), "endpoint", gomock.Any(), gomock.Any(), gomock.Any())
@@ -29,8 +29,7 @@ func Test_Client_CreateUser(t *testing.T) {
2929
func Test_Client_DropUser(t *testing.T) {
3030
client, mockArango, _, mockLogger, mockMetrics := setupDB(t)
3131

32-
// Ensure the mock returns nil as an error type
33-
mockArango.EXPECT().DropUser(gomock.Any(), "test").Return(nil)
32+
mockArango.EXPECT().RemoveUser(gomock.Any(), gomock.Any()).Return(nil)
3433
mockLogger.EXPECT().Debug(gomock.Any())
3534
mockMetrics.EXPECT().RecordHistogram(context.Background(), "app_arango_stats", gomock.Any(),
3635
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any())
@@ -113,7 +112,7 @@ func TestUser(t *testing.T) {
113112
ctrl := gomock.NewController(t)
114113
defer ctrl.Finish()
115114

116-
mockArango := NewMockArango(ctrl)
115+
mockArango := NewMockClient(ctrl)
117116
mockUser := NewMockUser(ctrl)
118117
client := &Client{client: mockArango}
119118

@@ -147,7 +146,7 @@ func TestClient_Database(t *testing.T) {
147146

148147
mockLogger := NewMockLogger(ctrl)
149148
mockMetrics := NewMockMetrics(ctrl)
150-
mockArango := NewMockArango(ctrl)
149+
mockArango := NewMockClient(ctrl)
151150

152151
config := Config{Host: "localhost", Port: 8527, User: "root", Password: "root"}
153152
client := New(config)
@@ -164,7 +163,7 @@ func TestClient_Database(t *testing.T) {
164163

165164
t.Run("Get database Success", func(t *testing.T) {
166165
mockArango.EXPECT().
167-
GetDatabase(ctx, dbName, &arangodb.GetDatabaseOptions{}).
166+
GetDatabase(ctx, dbName, nil).
168167
Return(mockDatabase, nil)
169168
mockDatabase.EXPECT().Name().Return(dbName)
170169

@@ -176,7 +175,7 @@ func TestClient_Database(t *testing.T) {
176175

177176
t.Run("Get database Error", func(t *testing.T) {
178177
mockArango.EXPECT().
179-
GetDatabase(ctx, dbName, &arangodb.GetDatabaseOptions{}).
178+
GetDatabase(ctx, dbName, nil).
180179
Return(nil, errDBNotFound)
181180

182181
db, err := client.database(ctx, dbName)
@@ -187,7 +186,7 @@ func TestClient_Database(t *testing.T) {
187186
// Test database operations
188187
t.Run("database Operations", func(t *testing.T) {
189188
mockArango.EXPECT().
190-
GetDatabase(ctx, dbName, &arangodb.GetDatabaseOptions{}).
189+
GetDatabase(ctx, dbName, nil).
191190
Return(mockDatabase, nil)
192191
mockDatabase.EXPECT().Name().Return(dbName)
193192
mockDatabase.EXPECT().Remove(ctx).Return(nil)

0 commit comments

Comments
 (0)