diff --git a/db/write_controller_test.cc b/db/write_controller_test.cc index a24ebaacb96998693a10755fb213aa6d03b76992..41f831389ac2ae9d156467d8e7d10e94745e6e70 100644 --- a/db/write_controller_test.cc +++ b/db/write_controller_test.cc @@ -16,11 +16,11 @@ TEST_F(WriteControllerTest, SanityTest) { auto stop_token_1 = controller.GetStopToken(); auto stop_token_2 = controller.GetStopToken(); - ASSERT_EQ(true, controller.IsStopped()); + ASSERT_TRUE(controller.IsStopped()); stop_token_1.reset(); - ASSERT_EQ(true, controller.IsStopped()); + ASSERT_TRUE(controller.IsStopped()); stop_token_2.reset(); - ASSERT_EQ(false, controller.IsStopped()); + ASSERT_FALSE(controller.IsStopped()); auto delay_token_1 = controller.GetDelayToken(5); ASSERT_EQ(static_cast(5), controller.GetDelay()); @@ -32,7 +32,7 @@ TEST_F(WriteControllerTest, SanityTest) { delay_token_1.reset(); ASSERT_EQ(static_cast(0), controller.GetDelay()); delay_token_1.reset(); - ASSERT_EQ(false, controller.IsStopped()); + ASSERT_FALSE(controller.IsStopped()); } } // namespace rocksdb diff --git a/utilities/backupable/backupable_db_test.cc b/utilities/backupable/backupable_db_test.cc index 658082c41b64eba7bfcaddd39029eb7999daec07..69ea741a856e9a260091d37c621a7f2912b36771 100644 --- a/utilities/backupable/backupable_db_test.cc +++ b/utilities/backupable/backupable_db_test.cc @@ -539,13 +539,10 @@ TEST_F(BackupableDBTest, NoDoubleCopy) { test_backup_env_->AssertWrittenFiles(should_have_written); ASSERT_OK(db_->DeleteBackup(1)); - ASSERT_EQ(true, - test_backup_env_->FileExists(backupdir_ + "/shared/00010.sst")); + ASSERT_TRUE(test_backup_env_->FileExists(backupdir_ + "/shared/00010.sst")); // 00011.sst was only in backup 1, should be deleted - ASSERT_EQ(false, - test_backup_env_->FileExists(backupdir_ + "/shared/00011.sst")); - ASSERT_EQ(true, - test_backup_env_->FileExists(backupdir_ + "/shared/00015.sst")); + ASSERT_FALSE(test_backup_env_->FileExists(backupdir_ + "/shared/00011.sst")); + ASSERT_TRUE(test_backup_env_->FileExists(backupdir_ + "/shared/00015.sst")); // MANIFEST file size should be only 100 uint64_t size; @@ -924,14 +921,14 @@ TEST_F(BackupableDBTest, DeleteTmpFiles) { file_manager_->WriteToFile(shared_tmp, "tmp"); file_manager_->CreateDir(private_tmp_dir); file_manager_->WriteToFile(private_tmp_file, "tmp"); - ASSERT_EQ(true, file_manager_->FileExists(private_tmp_dir)); + ASSERT_TRUE(file_manager_->FileExists(private_tmp_dir)); OpenBackupableDB(); // Need to call this explicitly to delete tmp files (void) db_->GarbageCollect(); CloseBackupableDB(); - ASSERT_EQ(false, file_manager_->FileExists(shared_tmp)); - ASSERT_EQ(false, file_manager_->FileExists(private_tmp_file)); - ASSERT_EQ(false, file_manager_->FileExists(private_tmp_dir)); + ASSERT_FALSE(file_manager_->FileExists(shared_tmp)); + ASSERT_FALSE(file_manager_->FileExists(private_tmp_file)); + ASSERT_FALSE(file_manager_->FileExists(private_tmp_dir)); } TEST_F(BackupableDBTest, KeepLogFiles) {