Refactor OverworldTest to initialize overworld_ with ROM data and improve formatting of assertions
This commit is contained in:
@@ -21,7 +21,7 @@ class OverworldTest : public ::testing::Test, public SharedRom {
|
|||||||
}
|
}
|
||||||
void TearDown() override {}
|
void TearDown() override {}
|
||||||
|
|
||||||
zelda3::Overworld overworld_;
|
zelda3::Overworld overworld_{*rom()};
|
||||||
};
|
};
|
||||||
|
|
||||||
TEST_F(OverworldTest, OverworldLoadNoRomDataError) {
|
TEST_F(OverworldTest, OverworldLoadNoRomDataError) {
|
||||||
@@ -39,17 +39,16 @@ TEST_F(OverworldTest, OverworldLoadNoRomDataError) {
|
|||||||
TEST_F(OverworldTest, OverworldLoadRomDataOk) {
|
TEST_F(OverworldTest, OverworldLoadRomDataOk) {
|
||||||
// Arrange
|
// Arrange
|
||||||
EXPECT_OK(rom()->LoadFromFile("zelda3.sfc"));
|
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
|
// Act
|
||||||
auto status = overworld_.Load(*rom());
|
auto status = overworld_.Load(*rom());
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
EXPECT_TRUE(status.ok());
|
EXPECT_TRUE(status.ok());
|
||||||
EXPECT_EQ(overworld_.overworld_maps().size(),
|
EXPECT_EQ(overworld_.overworld_maps().size(), zelda3::kNumOverworldMaps);
|
||||||
zelda3::kNumOverworldMaps);
|
EXPECT_EQ(overworld_.tiles16().size(), zelda3::kNumTile16Individual);
|
||||||
EXPECT_EQ(overworld_.tiles16().size(),
|
|
||||||
zelda3::kNumTile16Individual);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace test
|
} // namespace test
|
||||||
|
|||||||
Reference in New Issue
Block a user