zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2025-12-06 07:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some tests

Browse Source
This commit is contained in:
Zoe Roux
2021-07-06 18:23:22 +02:00
parent 37ced8e553
commit c38dfefd73
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -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 ()

4
sources/SNES.cpp
View File

@@ -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(),

1
tests/PPU/testPpuWriteFromVmain.cpp
View File

@@ -2,7 +2,6 @@
// Created by cbihan on 2/11/20.
//
#include "Models/Ints.hpp"
#include <bitset>
#include "tests.hpp"
#include <catch2/catch.hpp>

5
tests/testMemoryBus.cpp
View File

@@ -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);
}

11
tests/tests.hpp
View File

@@ -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);