Citra-emu/hwtests
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add read checks to FS::SDMC::TestFileWrite

Browse Source
This commit is contained in:
archshift 2014-11-23 22:45:02 -08:00
parent 7c756654a1
commit a95803b96b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
send-exec.py
View File

@ -16,6 +16,6 @@ MESSAGE = open("citra-hwtests.3dsx", "rb").read();
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect((TCP_IP, TCP_PORT)) s.connect((TCP_IP, TCP_PORT))
s.send(MESSAGE) s.send(MESSAGE)
time.sleep(0.1) time.sleep(10)
s.close() s.close()

22
source/tests/fs_sdmc.cpp
View File

@ -57,26 +57,38 @@ static bool TestFileRename(FS_archive sdmcArchive)
return true; return true;
} }
static bool TestFileWrite(FS_archive sdmcArchive) static bool TestFileWriteRead(FS_archive sdmcArchive)
{ {
Handle fileHandle; Handle fileHandle;
u32 bytesWritten; u32 bytesWritten;
u32 bytesRead;
u64 fileSize; u64 fileSize;
const static FS_path filePath = FS_makePath(PATH_CHAR, "/test_file_write.txt"); const static FS_path filePath = FS_makePath(PATH_CHAR, "/test_file_write_read.txt");
const static char* stringWritten = "A string\n"; const static char* stringWritten = "A string\n";
// Create file // Create file
FSUSER_OpenFile(NULL, &fileHandle, sdmcArchive, filePath, FS_OPEN_CREATE | FS_OPEN_WRITE, 0); FSUSER_OpenFile(NULL, &fileHandle, sdmcArchive, filePath, FS_OPEN_CREATE | FS_OPEN_WRITE, 0);
// Write to file // Write to file
SoftAssert(FSFILE_Write(fileHandle, &bytesWritten, 0, stringWritten, strlen(stringWritten), FS_WRITE_FLUSH) == 0); SoftAssert(FSFILE_Write(fileHandle, &bytesWritten, 0, stringWritten, strlen(stringWritten)+1, FS_WRITE_FLUSH) == 0);
// Verify string size
SoftAssert(strlen(stringWritten)+1 == bytesWritten);
// Check file size // Check file size
SoftAssert(FSFILE_GetSize(fileHandle, &fileSize) == 0); SoftAssert(FSFILE_GetSize(fileHandle, &fileSize) == 0);
// Verify file size // Verify file size
SoftAssert(fileSize == bytesWritten); SoftAssert(fileSize == bytesWritten);
char* stringRead = new char[fileSize];
// Read from file
SoftAssert(FSFILE_Read(fileHandle, &bytesRead, 0, stringRead, fileSize) == 0);
// Verify string size
SoftAssert(bytesRead == bytesWritten);
// Verify string contents
SoftAssert(strcmp(stringRead, stringWritten) == 0);
delete[] stringRead;
FSFILE_Close(fileHandle); FSFILE_Close(fileHandle);
FSUSER_DeleteFile(NULL, sdmcArchive, filePath); FSUSER_DeleteFile(NULL, sdmcArchive, filePath);
@ -148,8 +160,8 @@ void TestAll()
return TestFileRename(sdmcArchive); return TestFileRename(sdmcArchive);
}); });
Test("SDMC", "Writing to file", [&] { Test("SDMC", "Writing and reading file", [&] {
return TestFileWrite(sdmcArchive); return TestFileWriteRead(sdmcArchive);
}); });
Test("SDMC", "Creating and deleting directory", [&] { Test("SDMC", "Creating and deleting directory", [&] {