v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1484 from jaredmulconry/msvc2013_tempfile_fix 

Fixed File Size reported as 0 in tests that use temporary files
pull/1482/head^2
Kim Kulling 2017-10-09 00:06:57 +02:00 committed by GitHub
parent 55cfe298b0 b2716a9c3f
commit 21add21ab1
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/unit/utDefaultIOStream.cpp
View File

@ -69,6 +69,11 @@ TEST_F( utDefaultIOStream, FileSizeTest ) {
auto vflush = std::fflush( fs );
ASSERT_EQ(vflush, 0);
std::fclose(fs);
fs = std::fopen(fpath, "r");
ASSERT_NE(nullptr, fs);
TestDefaultIOStream myStream( fs, fpath);
size_t size = myStream.FileSize();
EXPECT_EQ( size, dataSize);

13
test/unit/utIOStreamBuffer.cpp
View File

@ -90,7 +90,11 @@ TEST_F( IOStreamBufferTest, open_close_Test ) {
auto written = std::fwrite( data, sizeof(*data), dataCount, fs );
EXPECT_NE( 0U, written );
std::fflush( fs );
auto flushResult = std::fflush( fs );
ASSERT_EQ(0, flushResult);
std::fclose( fs );
fs = std::fopen(fname, "r");
ASSERT_NE(nullptr, fs);
{
TestDefaultIOStream myStream( fs, fname );
@ -112,7 +116,12 @@ TEST_F( IOStreamBufferTest, readlineTest ) {
auto written = std::fwrite( data, sizeof(*data), dataCount, fs );
EXPECT_NE( 0U, written );
std::fflush( fs );
auto flushResult = std::fflush(fs);
ASSERT_EQ(0, flushResult);
std::fclose(fs);
fs = std::fopen(fname, "r");
ASSERT_NE(nullptr, fs);
const auto tCacheSize = 26u;