Skip to content

Commit 4e926fc

Browse files
committed
fixing unit tests
Signed-off-by: yairgott <[email protected]>
1 parent 634ffec commit 4e926fc

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

testing/schema_manager_test.cc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,18 @@ TEST_F(SchemaManagerTest, TestEmptyAuxLoadAfterRDBReplication) {
360360
&fake_ctx_, eid, REDISMODULE_SUBEVENT_LOADING_REPL_START, nullptr);
361361
ON_CALL(*kMockRedisModule, GetContextFromIO(testing::_))
362362
.WillByDefault(testing::Return(&fake_ctx_));
363+
ON_CALL(*kMockRedisModule, GetDbIdFromIO(testing::_))
364+
.WillByDefault(testing::Return(db_num_));
365+
ON_CALL(*kMockRedisModule, GetDetachedThreadSafeContext(testing::_))
366+
.WillByDefault(testing::Return(&fake_ctx_));
367+
ON_CALL(*kMockRedisModule, SelectDb(&fake_ctx_, db_num_))
368+
.WillByDefault(testing::Return(REDISMODULE_OK));
369+
ON_CALL(*kMockRedisModule, FreeThreadSafeContext(testing::_))
370+
.WillByDefault(testing::Return());
363371
RedisModuleIO *fake_rdb = reinterpret_cast<RedisModuleIO *>(0xDEADBEEF);
364372
EXPECT_CALL(*kMockRedisModule, LoadUnsigned(fake_rdb))
365373
.WillOnce(testing::Return(0));
374+
366375
VMSDK_EXPECT_OK(SchemaManager::Instance().AuxLoad(fake_rdb, 0,
367376
REDISMODULE_AUX_AFTER_RDB));
368377

vmsdk/src/testing_infra/module.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ class MockRedisModule {
250250
MOCK_METHOD(char **, GetClusterNodesList,
251251
(RedisModuleCtx * ctx, size_t *numnodes));
252252
MOCK_METHOD(RedisModuleCtx *, GetContextFromIO, (RedisModuleIO * rdb));
253+
MOCK_METHOD(int, GetDbIdFromIO, (RedisModuleIO * rdb));
253254
MOCK_METHOD(void, FreeClusterNodesList, (char **ids));
254255
MOCK_METHOD(int, CallReplyType, (RedisModuleCallReply * reply));
255256
MOCK_METHOD(RedisModuleString *, CreateStringFromCallReply,
@@ -1340,6 +1341,10 @@ inline RedisModuleCtx *TestRedisModule_GetContextFromIO(RedisModuleIO *rdb) {
13401341
return kMockRedisModule->GetContextFromIO(rdb);
13411342
}
13421343

1344+
inline int TestRedisModule_GetDbIdFromIO(RedisModuleIO *rdb) {
1345+
return kMockRedisModule->GetDbIdFromIO(rdb);
1346+
}
1347+
13431348
inline void TestRedisModule_FreeClusterNodesList(char **ids) {
13441349
return kMockRedisModule->FreeClusterNodesList(ids);
13451350
}
@@ -1488,6 +1493,7 @@ inline void TestRedisModule_Init() {
14881493
RedisModule_SendClusterMessage = &TestRedisModule_SendClusterMessage;
14891494
RedisModule_GetClusterNodesList = &TestRedisModule_GetClusterNodesList;
14901495
RedisModule_GetContextFromIO = &TestRedisModule_GetContextFromIO;
1496+
RedisModule_GetDbIdFromIO = &TestRedisModule_GetDbIdFromIO;
14911497
RedisModule_FreeClusterNodesList = &TestRedisModule_FreeClusterNodesList;
14921498
RedisModule_CallReplyType = &TestRedisModule_CallReplyType;
14931499
RedisModule_CreateStringFromCallReply =

0 commit comments

Comments
 (0)