empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tests: Fixed some issues with automated tests

Browse source
This commit is contained in:
Souryo 2017-08-06 18:32:32 -04:00
parent d4f8140eef
commit 933ed439b7
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Core/RecordedRomTest.cpp
View file

@ -170,10 +170,11 @@ void RecordedRomTest::RecordFromTest(string newTestFilename, string existingTest
zipReader.LoadArchive(existingTestFilename); zipReader.LoadArchive(existingTestFilename);
std::stringstream testMovie = zipReader.GetStream("TestMovie.mmo"); std::stringstream testMovie = zipReader.GetStream("TestMovie.mmo");
std::stringstream testRom = zipReader.GetStream("TestRom.nes"); std::stringstream testRom = zipReader.GetStream("TestRom.nes");
VirtualFile romFile(testRom, newTestFilename);
if(testMovie && testRom) { if(testMovie && testRom) {
Console::Pause(); Console::Pause();
Console::LoadROM(testRom); Console::LoadROM(romFile);
testRom.seekg(0, ios::beg); testRom.seekg(0, ios::beg);
_romStream << testRom.rdbuf(); _romStream << testRom.rdbuf();
@ -248,8 +249,10 @@ int32_t RecordedRomTest::Run(string filename)
} }
} }
VirtualFile testRomFile(testRom, filename);
//Start playing movie //Start playing movie
if(Console::LoadROM(testRom)) { if(Console::LoadROM(testRomFile)) {
_runningTest = true; _runningTest = true;
MovieManager::Play(testMovie, false); MovieManager::Play(testMovie, false);

5
Utilities/VirtualFile.h
View file

@ -65,8 +65,9 @@ public:
} }
} }
VirtualFile(std::istream &input) VirtualFile(std::istream &input, string filePath)
{ {
_path = filePath;
FromStream(input, _data); FromStream(input, _data);
} }
@ -99,7 +100,7 @@ public:
string GetFileName() string GetFileName()
{ {
return _innerFile.empty() ? FolderUtilities::GetFilename(_path, false) : _innerFile; return _innerFile.empty() ? FolderUtilities::GetFilename(_path, true) : _innerFile;
} }
string GetSha1Hash() string GetSha1Hash()