From ed0121dd45218a1f61a52ab1d39e9935edd4610c Mon Sep 17 00:00:00 2001 From: scawful Date: Mon, 30 Dec 2024 08:01:03 -0500 Subject: [PATCH] Refactor test files: remove unused namespaces and improve include organization for clarity --- src/test/emu/cpu_test.cc | 10 +++------- src/test/emu/ppu_test.cc | 20 +++++++------------- src/test/emu/spc700_test.cc | 8 +++----- src/test/gfx/compression_test.cc | 4 +--- src/test/gfx/snes_palette_test.cc | 16 +++++++--------- src/test/mocks/mock_memory.h | 4 +--- src/test/rom_test.cc | 2 -- src/test/yaze_test.cc | 6 ------ src/test/zelda3/dungeon_room_test.cc | 3 --- src/test/zelda3/message_test.cc | 2 -- src/test/zelda3/overworld_test.cc | 2 -- src/test/zelda3/sprite_builder_test.cc | 4 +--- 12 files changed, 23 insertions(+), 58 deletions(-) diff --git a/src/test/emu/cpu_test.cc b/src/test/emu/cpu_test.cc index cb28bf1e..93179e68 100644 --- a/src/test/emu/cpu_test.cc +++ b/src/test/emu/cpu_test.cc @@ -3,21 +3,18 @@ #include #include -#include "app/emu/cpu/clock.h" -#include "app/emu/cpu/internal/opcodes.h" #include "app/emu/memory/asm_parser.h" #include "app/emu/memory/memory.h" #include "test/mocks/mock_memory.h" namespace yaze { namespace test { -namespace emu { using yaze::emu::AsmParser; using yaze::emu::Cpu; -using yaze::emu::memory::CpuCallbacks; -using yaze::emu::memory::MockClock; -using yaze::emu::memory::MockMemory; +using yaze::emu::CpuCallbacks; +using yaze::emu::MockClock; +using yaze::emu::MockMemory; /** * \test Test fixture for CPU unit tests @@ -4198,6 +4195,5 @@ TEST_F(CpuTest, XCESwitchBackAndForth) { EXPECT_FALSE(cpu.E); // Emulation mode flag should be cleared } -} // namespace emu } // namespace test } // namespace yaze diff --git a/src/test/emu/ppu_test.cc b/src/test/emu/ppu_test.cc index 02520efc..a7491cbd 100644 --- a/src/test/emu/ppu_test.cc +++ b/src/test/emu/ppu_test.cc @@ -2,22 +2,17 @@ #include -#include "app/emu/cpu/clock.h" -#include "app/emu/memory/memory.h" #include "test/mocks/mock_memory.h" namespace yaze { namespace test { -namespace emu { -using yaze::emu::Clock; -using yaze::emu::memory::MockClock; -using yaze::emu::memory::MockMemory; -using yaze::emu::video::BackgroundMode; -using yaze::emu::video::PpuInterface; -using yaze::emu::video::SpriteAttributes; -using yaze::emu::video::Tilemap; -using yaze::gfx::Bitmap; +using yaze::emu::MockClock; +using yaze::emu::MockMemory; +using yaze::emu::BackgroundMode; +using yaze::emu::PpuInterface; +using yaze::emu::SpriteAttributes; +using yaze::emu::Tilemap; /** * @brief Mock Ppu class for testing @@ -57,6 +52,5 @@ class PpuTest : public ::testing::Test { } }; -} // namespace emu } // namespace test -} // namespace yaze \ No newline at end of file +} // namespace yaze diff --git a/src/test/emu/spc700_test.cc b/src/test/emu/spc700_test.cc index 882cd22d..05b4bbe7 100644 --- a/src/test/emu/spc700_test.cc +++ b/src/test/emu/spc700_test.cc @@ -6,13 +6,12 @@ namespace yaze { namespace test { -namespace emu { using testing::_; using testing::Return; -using yaze::emu::audio::ApuCallbacks; -using yaze::emu::audio::AudioRam; -using yaze::emu::audio::Spc700; +using yaze::emu::ApuCallbacks; +using yaze::emu::AudioRam; +using yaze::emu::Spc700; /** * @brief MockAudioRam is a mock class for the AudioRam class. @@ -471,6 +470,5 @@ TEST_F(Spc700Test, BootIplRomOk) { // EXPECT_EQ(spc700.PC, 0xFFC1 + 0x3F); } -} // namespace emu } // namespace test } // namespace yaze diff --git a/src/test/gfx/compression_test.cc b/src/test/gfx/compression_test.cc index f4822837..1a058282 100644 --- a/src/test/gfx/compression_test.cc +++ b/src/test/gfx/compression_test.cc @@ -12,7 +12,6 @@ namespace yaze { namespace test { -namespace gfx { using yaze::Rom; using yaze::gfx::lc_lz2::CompressionContext; @@ -423,6 +422,5 @@ TEST(LC_LZ2_CompressionTest, DecompressionMixingCommand) { EXPECT_THAT(random1_o, ElementsAreArray(decomp_result.data(), 9)); } -} // namespace gfx } // namespace test -} // namespace yaze \ No newline at end of file +} // namespace yaze diff --git a/src/test/gfx/snes_palette_test.cc b/src/test/gfx/snes_palette_test.cc index 4e9be997..64e2c61a 100644 --- a/src/test/gfx/snes_palette_test.cc +++ b/src/test/gfx/snes_palette_test.cc @@ -7,11 +7,10 @@ namespace yaze { namespace test { -namespace gfx { using ::testing::ElementsAreArray; using yaze::gfx::ConvertRgbToSnes; -using yaze::gfx::ConvertSnestoRGB; +using yaze::gfx::ConvertSnestoRgb; using yaze::gfx::Extract; using yaze::gfx::SnesPalette; @@ -40,7 +39,7 @@ TEST(SnesColorTest, ConvertRgbToSnes) { TEST(SnesColorTest, ConvertSnestoRGB) { uint16_t snes = 0x4210; - snes_color color = ConvertSnestoRGB(snes); + snes_color color = ConvertSnestoRgb(snes); ASSERT_EQ(color.red, 132); ASSERT_EQ(color.green, 132); ASSERT_EQ(color.blue, 132); @@ -53,13 +52,13 @@ TEST(SnesColorTest, ConvertSnesToRGB_Binary) { uint16_t purple = 0b0111110000011111; snes_color testcolor; - testcolor = ConvertSnestoRGB(red); + testcolor = ConvertSnestoRgb(red); ASSERT_EQ(0xFF0000, test_convert(testcolor)); - testcolor = ConvertSnestoRGB(green); + testcolor = ConvertSnestoRgb(green); ASSERT_EQ(0x00FF00, test_convert(testcolor)); - testcolor = ConvertSnestoRGB(blue); + testcolor = ConvertSnestoRgb(blue); ASSERT_EQ(0x0000FF, test_convert(testcolor)); - testcolor = ConvertSnestoRGB(purple); + testcolor = ConvertSnestoRgb(purple); ASSERT_EQ(0xFF00FF, test_convert(testcolor)); } @@ -93,6 +92,5 @@ TEST(SnesColorTest, Convert) { EXPECT_THAT(data, ElementsAreArray(snes_string.data(), 10)); } -} // namespace gfx } // namespace test -} // namespace yaze \ No newline at end of file +} // namespace yaze diff --git a/src/test/mocks/mock_memory.h b/src/test/mocks/mock_memory.h index 0c90430d..7a97311a 100644 --- a/src/test/mocks/mock_memory.h +++ b/src/test/mocks/mock_memory.h @@ -10,7 +10,6 @@ namespace yaze { namespace emu { -namespace memory { /** * @brief Mock CPU class for testing @@ -220,8 +219,7 @@ class MockMemory : public Memory { uint16_t SP_ = 0x01FF; }; -} // namespace memory } // namespace emu } // namespace yaze -#endif // YAZE_TEST_MOCK_MOCK_MEMORY_H \ No newline at end of file +#endif // YAZE_TEST_MOCK_MOCK_MEMORY_H diff --git a/src/test/rom_test.cc b/src/test/rom_test.cc index 382d02e5..4dc4da0a 100644 --- a/src/test/rom_test.cc +++ b/src/test/rom_test.cc @@ -5,14 +5,12 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "app/gfx/snes_color.h" #include "test/core/testing.h" namespace yaze { namespace test { using ::testing::_; -using ::testing::DoAll; using ::testing::Return; const static std::vector kMockRomData = { diff --git a/src/test/yaze_test.cc b/src/test/yaze_test.cc index dae578e7..8534ae60 100644 --- a/src/test/yaze_test.cc +++ b/src/test/yaze_test.cc @@ -1,17 +1,11 @@ #define SDL_MAIN_HANDLED -#include "yaze.h" - #include #include "absl/debugging/failure_signal_handler.h" #include "absl/debugging/symbolize.h" #include "test/integration/test_editor.h" -namespace yaze { -namespace test {} // namespace test -} // namespace yaze - int main(int argc, char* argv[]) { absl::InitializeSymbolizer(argv[0]); diff --git a/src/test/zelda3/dungeon_room_test.cc b/src/test/zelda3/dungeon_room_test.cc index 1f0ce2cb..29c611be 100644 --- a/src/test/zelda3/dungeon_room_test.cc +++ b/src/test/zelda3/dungeon_room_test.cc @@ -3,11 +3,9 @@ #include "app/rom.h" #include "app/zelda3/dungeon/room.h" -#include "gtest/gtest.h" namespace yaze { namespace test { -namespace zelda3 { class DungeonRoomTest : public ::testing::Test, public SharedRom { protected: @@ -31,6 +29,5 @@ TEST_F(DungeonRoomTest, SingleRoomLoadOk) { test_room.LoadRoomFromROM(); } -} // namespace zelda3 } // namespace test } // namespace yaze diff --git a/src/test/zelda3/message_test.cc b/src/test/zelda3/message_test.cc index 187ef164..bf22d2fa 100644 --- a/src/test/zelda3/message_test.cc +++ b/src/test/zelda3/message_test.cc @@ -6,7 +6,6 @@ namespace yaze { namespace test { -namespace zelda3 { class MessageTest : public ::testing::Test, public SharedRom { protected: @@ -44,6 +43,5 @@ TEST_F(MessageTest, VerifySingleMessageFromRomOk) { // TODO - Implement this test } -} // namespace zelda3 } // namespace test } // namespace yaze diff --git a/src/test/zelda3/overworld_test.cc b/src/test/zelda3/overworld_test.cc index 8e2b2c4b..8e27e18c 100644 --- a/src/test/zelda3/overworld_test.cc +++ b/src/test/zelda3/overworld_test.cc @@ -10,7 +10,6 @@ namespace yaze { namespace test { -namespace zelda3 { class OverworldTest : public ::testing::Test, public SharedRom { protected: @@ -53,6 +52,5 @@ TEST_F(OverworldTest, OverworldLoadRomDataOk) { zelda3::kNumTile16Individual); } -} // namespace zelda3 } // namespace test } // namespace yaze diff --git a/src/test/zelda3/sprite_builder_test.cc b/src/test/zelda3/sprite_builder_test.cc index 271e610b..56d2fcf8 100644 --- a/src/test/zelda3/sprite_builder_test.cc +++ b/src/test/zelda3/sprite_builder_test.cc @@ -5,7 +5,6 @@ namespace yaze { namespace test { -namespace zelda3 { using namespace yaze::zelda3; @@ -61,6 +60,5 @@ TEST_F(SpriteBuilderTest, BuildSpritePropertiesOk) { )")); } -} // namespace zelda3 } // namespace test -} // namespace yaze \ No newline at end of file +} // namespace yaze