Config: Integrate

This commit is contained in:
MerryMage
2017-05-13 22:29:55 +01:00
parent 1548a15c68
commit 41afe78a44
5 changed files with 33 additions and 0 deletions

View File

@ -6,6 +6,7 @@
#include <unordered_set>
#include "Common/CommonTypes.h"
#include "Core/Config/Config.h"
#include "Core/HW/MMIO.h"
// Tests that the UniqueID function returns a "unique enough" identifier
@ -29,6 +30,7 @@ TEST(UniqueID, UniqueEnough)
TEST(IsMMIOAddress, SpecialAddresses)
{
Config::Init();
SConfig::Init();
SConfig::GetInstance().bWii = true;
@ -51,6 +53,7 @@ TEST(IsMMIOAddress, SpecialAddresses)
EXPECT_TRUE(MMIO::IsMMIOAddress(0x0D800F10)); // Mirror of Wii MMIOs
SConfig::Shutdown();
Config::Shutdown();
}
class MappingTest : public testing::Test