From 0cbaaccb669579ad6738f3c4ec753781e6c32792 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Thu, 16 Jan 2025 05:08:04 -0500
Subject: [PATCH] Enhance message tests and refactor graphics data loading in
 overworld tests

---
 src/test/zelda3/message_test.cc   | 7 +++++++
 src/test/zelda3/overworld_test.cc | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/test/zelda3/message_test.cc b/src/test/zelda3/message_test.cc
index bf22d2fa..95321983 100644
--- a/src/test/zelda3/message_test.cc
+++ b/src/test/zelda3/message_test.cc
@@ -38,6 +38,13 @@ TEST_F(MessageTest, LoadMessagesFromRomOk) {
   [S:##]A
   [3]give
   [2]give >[CH2I]
+
+  Message ID: 2
+  Raw: [S:00][3][][:75][:44][CH2I]
+  Parsed: [S:00][3][][:75][:44][CH2I]
+  Raw Bytes: 7A 00 76 88 8A 75 88 44 68 
+  Parsed Bytes: 7A 00 76 88 8A 75 88 44 68 
+
  */
 TEST_F(MessageTest, VerifySingleMessageFromRomOk) {
   // TODO - Implement this test
diff --git a/src/test/zelda3/overworld_test.cc b/src/test/zelda3/overworld_test.cc
index 8e27e18c..290c3870 100644
--- a/src/test/zelda3/overworld_test.cc
+++ b/src/test/zelda3/overworld_test.cc
@@ -39,7 +39,7 @@ TEST_F(OverworldTest, OverworldLoadNoRomDataError) {
 TEST_F(OverworldTest, OverworldLoadRomDataOk) {
   // Arrange
   EXPECT_OK(rom()->LoadFromFile("zelda3.sfc"));
-  EXPECT_OK(rom()->LoadAllGraphicsData(/*defer_render=*/true));
+  ASSERT_OK_AND_ASSIGN(auto gfx_data, LoadAllGraphicsData(*rom(), /*defer_render=*/true));
 
   // Act
   auto status = overworld_.Load(*rom());