@@ -107,29 +107,29 @@ TEST_F(UpdateLocationTest, MultipleUpdatesSequentially) {
107107 const std::string first_location = " /warehouse/first" ;
108108 ASSERT_TRUE (arrow_fs->CreateDir (first_location + " /metadata" ).ok ());
109109
110- ICEBERG_UNWRAP_OR_FAIL (auto update1 , table_->NewUpdateLocation ());
111- update1 ->SetLocation (first_location);
112- ICEBERG_UNWRAP_OR_FAIL (auto result1 , update1->Apply ());
113- EXPECT_EQ (result1 , first_location);
114- EXPECT_THAT (update1 ->Commit (), IsOk ());
110+ ICEBERG_UNWRAP_OR_FAIL (auto update , table_->NewUpdateLocation ());
111+ update ->SetLocation (first_location);
112+ ICEBERG_UNWRAP_OR_FAIL (auto result , update1->Apply ());
113+ EXPECT_EQ (result , first_location);
114+ EXPECT_THAT (update ->Commit (), IsOk ());
115115
116116 // Reload and verify
117- ICEBERG_UNWRAP_OR_FAIL (auto reloaded1 , catalog_->LoadTable (table_ident_));
118- EXPECT_EQ (reloaded1 ->location (), first_location);
117+ ICEBERG_UNWRAP_OR_FAIL (reloaded , catalog_->LoadTable (table_ident_));
118+ EXPECT_EQ (reloaded ->location (), first_location);
119119
120120 // Second update
121121 const std::string second_location = " /warehouse/second" ;
122122 ASSERT_TRUE (arrow_fs->CreateDir (second_location + " /metadata" ).ok ());
123123
124- ICEBERG_UNWRAP_OR_FAIL (auto update2, reloaded1 ->NewUpdateLocation ());
125- update2 ->SetLocation (second_location);
126- ICEBERG_UNWRAP_OR_FAIL (auto result2, update2 ->Apply ());
127- EXPECT_EQ (result2 , second_location);
128- EXPECT_THAT (update2 ->Commit (), IsOk ());
124+ ICEBERG_UNWRAP_OR_FAIL (update, reloaded ->NewUpdateLocation ());
125+ update ->SetLocation (second_location);
126+ ICEBERG_UNWRAP_OR_FAIL (result, update ->Apply ());
127+ EXPECT_EQ (result , second_location);
128+ EXPECT_THAT (update ->Commit (), IsOk ());
129129
130130 // Reload and verify
131- ICEBERG_UNWRAP_OR_FAIL (auto reloaded2 , catalog_->LoadTable (table_ident_));
132- EXPECT_EQ (reloaded2 ->location (), second_location);
131+ ICEBERG_UNWRAP_OR_FAIL (reloaded , catalog_->LoadTable (table_ident_));
132+ EXPECT_EQ (reloaded ->location (), second_location);
133133}
134134
135135} // namespace iceberg
0 commit comments