From c38dfefd73468cdff17b1959c1d08fcdc9731db2 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Tue, 6 Jul 2021 18:23:22 +0200
Subject: [PATCH] Fixing some tests

---
 CMakeLists.txt                      |  4 ++--
 sources/SNES.cpp                    |  4 +---
 tests/PPU/testPpuWriteFromVmain.cpp |  1 -
 tests/testMemoryBus.cpp             |  5 ++++-
 tests/tests.hpp                     | 11 ++++++-----
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fbb775..90c83e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,6 @@ find_package(Catch2 REQUIRED)
 target_link_libraries(unit_tests PRIVATE Catch2::Catch2WithMain)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-	#	target_link_libraries(unit_tests PRIVATE -lgcov)
-	#	target_compile_options(unit_tests PUBLIC -fprofile-arcs -ftest-coverage)
+	target_link_libraries(unit_tests PRIVATE -lgcov)
+	target_compile_options(unit_tests PUBLIC -fprofile-arcs -ftest-coverage)
 endif ()
diff --git a/sources/SNES.cpp b/sources/SNES.cpp
index 4ff23cd..f4a8dc5 100644
--- a/sources/SNES.cpp
+++ b/sources/SNES.cpp
@@ -15,9 +15,7 @@ namespace ComSquare
 	      cpu(this->bus, cartridge.header),
 	      ppu(renderer),
 	      apu(renderer)
-	{
-		this->bus.mapComponents(*this);
-	}
+	{}
 
 	SNES::SNES(const std::string &romPath, Renderer::IRenderer &renderer)
 	    : bus(),
diff --git a/tests/PPU/testPpuWriteFromVmain.cpp b/tests/PPU/testPpuWriteFromVmain.cpp
index b094bbc..aed1091 100644
--- a/tests/PPU/testPpuWriteFromVmain.cpp
+++ b/tests/PPU/testPpuWriteFromVmain.cpp
@@ -2,7 +2,6 @@
 // Created by cbihan on 2/11/20.
 //
 
-#include "Models/Ints.hpp"
 #include <bitset>
 #include "tests.hpp"
 #include <catch2/catch.hpp>
diff --git a/tests/testMemoryBus.cpp b/tests/testMemoryBus.cpp
index 6bbe4b8..042d224 100644
--- a/tests/testMemoryBus.cpp
+++ b/tests/testMemoryBus.cpp
@@ -201,7 +201,10 @@ TEST_CASE("GetRomMirror2 BusAccessor", "[BusAccessor]")
 TEST_CASE("GetRomMirror3 BusAccessor", "[BusAccessor]")
 {
 	Init()
-	auto *accessor = dynamic_cast<Memory::RectangleShadow *>(snes.bus.getAccessor(0xDE1248));
+	snes.cartridge.header.mappingMode = Cartridge::LoRom;
+	auto *rawAccessor = snes.bus.getAccessor(0xDE1248);
+	REQUIRE(rawAccessor);
+	auto *accessor = dynamic_cast<Memory::RectangleShadow *>(rawAccessor);
 	REQUIRE(accessor);
 	REQUIRE(&accessor->_initial == &snes.cartridge);
 }
diff --git a/tests/tests.hpp b/tests/tests.hpp
index 3580280..299c588 100644
--- a/tests/tests.hpp
+++ b/tests/tests.hpp
@@ -18,13 +18,14 @@
 #define Init() \
 	Renderer::NoRenderer norenderer(0, 0, 0);                  \
 	auto snesPtr = std::make_unique<SNES>(norenderer);         \
-    SNES &snes = *snesPtr;                                     \
+	SNES &snes = *snesPtr;                                     \
 	snes.cartridge._size = 100;                                \
-    delete[] snes.cartridge._data;                             \
+	delete[] snes.cartridge._data;                             \
 	snes.cartridge._data = new uint8_t[snes.cartridge._size];  \
-    memset(snes.cartridge._data, 0, snes.cartridge._size);     \
+	memset(snes.cartridge._data, 0, snes.cartridge._size);     \
 	snes.cartridge.header.mappingMode = Cartridge::LoRom;      \
 	snes.sram._size = 100;                                     \
-    delete[] snes.sram._data;                                  \
+	delete[] snes.sram._data;                                  \
 	snes.sram._data = new uint8_t[snes.sram._size];            \
-	memset(snes.sram._data, 0, snes.cartridge._size);
+	memset(snes.sram._data, 0, snes.cartridge._size);          \
+	snes.bus.mapComponents(snes);