@@ -771,41 +771,41 @@ TEST_P(DataIntegrationTest, ClientQueryColumnFamilyWithHistory) {
771771 auto c1_ts_new =
772772 std::get<0 >(c1_entry0).get <sys_time<std::chrono::microseconds>>();
773773 ASSERT_STATUS_OK (c1_ts_new);
774- auto expected_current_time_ms =
774+ auto c1_expected_current_time_ms =
775775 duration_cast<milliseconds>(std::chrono::microseconds (current_time));
776776 EXPECT_EQ (duration_cast<milliseconds>(c1_ts_new->time_since_epoch ()),
777- expected_current_time_ms );
777+ c1_expected_current_time_ms );
778778 EXPECT_EQ (std::get<1 >(c1_entry0), column_1_value_new);
779779
780780 auto const & c1_entry1 = (*history_map)[" c1" ][1 ];
781781 auto c1_ts_old =
782782 std::get<0 >(c1_entry1).get <sys_time<std::chrono::microseconds>>();
783783 ASSERT_STATUS_OK (c1_ts_old);
784- auto expected_old_time_ms =
784+ auto c1_expected_old_time_ms =
785785 duration_cast<milliseconds>(std::chrono::microseconds (old_time));
786786 EXPECT_EQ (duration_cast<milliseconds>(c1_ts_old->time_since_epoch ()),
787- expected_old_time_ms );
787+ c1_expected_old_time_ms );
788788 EXPECT_EQ (std::get<1 >(c1_entry1), column_1_value_old);
789789
790790 // Verify cells returned ordered from newest to oldest.
791791 auto const & c2_entry0 = (*history_map)[" c2" ][0 ];
792792 auto c2_ts_new =
793793 std::get<0 >(c2_entry0).get <sys_time<std::chrono::microseconds>>();
794794 ASSERT_STATUS_OK (c2_ts_new);
795- auto expected_current_time_ms =
795+ auto c2_expected_current_time_ms =
796796 duration_cast<milliseconds>(std::chrono::microseconds (current_time));
797797 EXPECT_EQ (duration_cast<milliseconds>(c2_ts_new->time_since_epoch ()),
798- expected_current_time_ms );
798+ c2_expected_current_time_ms );
799799 EXPECT_EQ (std::get<1 >(c2_entry0), column_2_value_new);
800800
801801 auto const & c2_entry1 = (*history_map)[" c2" ][1 ];
802802 auto c2_ts_old =
803803 std::get<0 >(c2_entry1).get <sys_time<std::chrono::microseconds>>();
804804 ASSERT_STATUS_OK (c2_ts_old);
805- auto expected_old_time_ms =
805+ auto c2_expected_old_time_ms =
806806 duration_cast<milliseconds>(std::chrono::microseconds (old_time));
807807 EXPECT_EQ (duration_cast<milliseconds>(c2_ts_old->time_since_epoch ()),
808- expected_old_time_ms );
808+ c2_expected_old_time_ms );
809809 EXPECT_EQ (std::get<1 >(c2_entry1), column_2_value_old);
810810}
811811
0 commit comments