From 146f85eb3137bb159dde772a065c81d758e3e25b Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 18 Jan 2025 15:10:11 -0500 Subject: [PATCH] Refactor OverworldTest to initialize overworld_ with ROM data and improve formatting of assertions --- src/test/zelda3/overworld_test.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/zelda3/overworld_test.cc b/src/test/zelda3/overworld_test.cc index 290c3870..4009fd83 100644 --- a/src/test/zelda3/overworld_test.cc +++ b/src/test/zelda3/overworld_test.cc @@ -21,7 +21,7 @@ class OverworldTest : public ::testing::Test, public SharedRom { } void TearDown() override {} - zelda3::Overworld overworld_; + zelda3::Overworld overworld_{*rom()}; }; TEST_F(OverworldTest, OverworldLoadNoRomDataError) { @@ -39,17 +39,16 @@ TEST_F(OverworldTest, OverworldLoadNoRomDataError) { TEST_F(OverworldTest, OverworldLoadRomDataOk) { // Arrange EXPECT_OK(rom()->LoadFromFile("zelda3.sfc")); - ASSERT_OK_AND_ASSIGN(auto gfx_data, LoadAllGraphicsData(*rom(), /*defer_render=*/true)); + ASSERT_OK_AND_ASSIGN(auto gfx_data, + LoadAllGraphicsData(*rom(), /*defer_render=*/true)); // Act auto status = overworld_.Load(*rom()); // Assert EXPECT_TRUE(status.ok()); - EXPECT_EQ(overworld_.overworld_maps().size(), - zelda3::kNumOverworldMaps); - EXPECT_EQ(overworld_.tiles16().size(), - zelda3::kNumTile16Individual); + EXPECT_EQ(overworld_.overworld_maps().size(), zelda3::kNumOverworldMaps); + EXPECT_EQ(overworld_.tiles16().size(), zelda3::kNumTile16Individual); } } // namespace test