scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test(screen): avoid boss room in save coverage

Browse Source
This commit is contained in:
scawful
2025-12-22 14:30:01 -05:00
parent e733bc78d6
commit 3c9c3455af
1 changed files with 64 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
test/e2e/rom_dependent/screen_editor_save_test.cc
View File

@@ -92,8 +92,25 @@ TEST_F(ScreenEditorSaveTest, SingleFloorRoom_SaveAndReload) {
// Test with first dungeon (Hyrule Castle) // Test with first dungeon (Hyrule Castle)
const int dungeon_id = 0; const int dungeon_id = 0;
const int floor = 0; int floor = -1;
const int room = 0; int room = -1;
for (int f = 0; f < dungeon_maps_[dungeon_id].nbr_of_floor +
dungeon_maps_[dungeon_id].nbr_of_basement;
f++) {
for (int r = 0; r < zelda3::kNumRooms; r++) {
if (dungeon_maps_[dungeon_id].floor_rooms[f][r] != 0x0F &&
dungeon_maps_[dungeon_id].floor_gfx[f][r] != 0xFF) {
floor = f;
room = r;
break;
}
}
if (floor != -1) break;
}
if (floor == -1 || room == -1) {
GTEST_SKIP() << "No non-empty rooms with valid GFX available for test";
}
// Record original value // Record original value
uint8_t original_room = dungeon_maps_[dungeon_id].floor_rooms[floor][room]; uint8_t original_room = dungeon_maps_[dungeon_id].floor_rooms[floor][room];
@@ -213,8 +230,25 @@ TEST_F(ScreenEditorSaveTest, GfxData_Persistence) {
} }
const int dungeon_id = 0; const int dungeon_id = 0;
const int floor = 0; int floor = -1;
const int room = 0; int room = -1;
for (int f = 0; f < dungeon_maps_[dungeon_id].nbr_of_floor +
dungeon_maps_[dungeon_id].nbr_of_basement;
f++) {
for (int r = 0; r < zelda3::kNumRooms; r++) {
if (dungeon_maps_[dungeon_id].floor_rooms[f][r] != 0x0F &&
dungeon_maps_[dungeon_id].floor_gfx[f][r] != 0xFF) {
floor = f;
room = r;
break;
}
}
if (floor != -1) break;
}
if (floor == -1 || room == -1) {
GTEST_SKIP() << "No non-empty rooms with valid GFX available for test";
}
// Record and modify GFX data // Record and modify GFX data
uint8_t original_gfx = dungeon_maps_[dungeon_id].floor_gfx[floor][room]; uint8_t original_gfx = dungeon_maps_[dungeon_id].floor_gfx[floor][room];
@@ -356,16 +390,33 @@ TEST_F(ScreenEditorSaveTest, RoundTrip_NoModification) {
// Test 8: Large batch dungeon modifications // Test 8: Large batch dungeon modifications
TEST_F(ScreenEditorSaveTest, LargeBatch_DungeonModifications) { TEST_F(ScreenEditorSaveTest, LargeBatch_DungeonModifications) {
// Modify all dungeons, all floors, first room // Modify all dungeons, all floors, first room
std::map<std::pair<int, int>, uint8_t> modifications; struct Modification {
int dungeon;
int floor;
int room;
uint8_t value;
};
std::vector<Modification> modifications;
for (size_t d = 0; d < dungeon_maps_.size(); ++d) { for (size_t d = 0; d < dungeon_maps_.size(); ++d) {
const int levels = dungeon_maps_[d].nbr_of_floor + const int levels = dungeon_maps_[d].nbr_of_floor +
dungeon_maps_[d].nbr_of_basement; dungeon_maps_[d].nbr_of_basement;
for (int l = 0; l < levels; ++l) { for (int l = 0; l < levels; ++l) {
uint8_t original = dungeon_maps_[d].floor_rooms[l][0]; int room_index = 0;
uint8_t modified = (original + d + l) % 0xFF; while (room_index < zelda3::kNumRooms &&
dungeon_maps_[d].floor_rooms[l][0] = modified; dungeon_maps_[d].floor_rooms[l][room_index] ==
modifications[{static_cast<int>(d), l}] = modified; dungeon_maps_[d].boss_room) {
room_index++;
}
if (room_index >= zelda3::kNumRooms) {
continue;
}
uint8_t original = dungeon_maps_[d].floor_rooms[l][room_index];
uint8_t modified = static_cast<uint8_t>((original + d + l) % 0xFF);
dungeon_maps_[d].floor_rooms[l][room_index] = modified;
modifications.push_back(
{static_cast<int>(d), l, room_index, modified});
} }
} }
@@ -382,9 +433,10 @@ TEST_F(ScreenEditorSaveTest, LargeBatch_DungeonModifications) {
ASSERT_TRUE(reloaded_maps.ok()); ASSERT_TRUE(reloaded_maps.ok());
int verified_count = 0; int verified_count = 0;
for (const auto& [key, expected] : modifications) { for (const auto& modification : modifications) {
auto [d, l] = key; if ((*reloaded_maps)[modification.dungeon]
if ((*reloaded_maps)[d].floor_rooms[l][0] == expected) { .floor_rooms[modification.floor][modification.room] ==
modification.value) {
verified_count++; verified_count++;
} }
} }