AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #603 from Dmitry-Me/cleanupFopenTests 

Cleanup fopen() tests
This commit is contained in:
Lee Thomason 2017-08-10 15:08:34 -07:00 committed by GitHub
parent 30dec75919 520009ef1c
commit 4bbf74205c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xmltest.cpp
View File

@ -650,14 +650,17 @@ int main( int argc, const char ** argv )
XMLTest( "UTF-8: Save testout.xml", false, doc.Error() ); XMLTest( "UTF-8: Save testout.xml", false, doc.Error() );
// Check the round trip. // Check the round trip.
int okay = 0; bool roundTripOkay = false;
FILE* saved = fopen( "resources/out/utf8testout.xml", "r" ); FILE* saved = fopen( "resources/out/utf8testout.xml", "r" );
XMLTest( "UTF-8: Open utf8testout.xml", true, saved != 0 );
FILE* verify = fopen( "resources/utf8testverify.xml", "r" ); FILE* verify = fopen( "resources/utf8testverify.xml", "r" );
XMLTest( "UTF-8: Open utf8testverify.xml", true, verify != 0 );
if ( saved && verify ) if ( saved && verify )
{ {
okay = 1; roundTripOkay = true;
char verifyBuf[256]; char verifyBuf[256];
while ( fgets( verifyBuf, 256, verify ) ) while ( fgets( verifyBuf, 256, verify ) )
{ {
@ -670,7 +673,7 @@ int main( int argc, const char ** argv )
{ {
printf( "verify:%s<\n", verifyBuf ); printf( "verify:%s<\n", verifyBuf );
printf( "saved :%s<\n", savedBuf ); printf( "saved :%s<\n", savedBuf );
okay = 0; roundTripOkay = false;
break; break;
} }
} }
@ -679,7 +682,7 @@ int main( int argc, const char ** argv )
fclose( saved ); fclose( saved );
if ( verify ) if ( verify )
fclose( verify ); fclose( verify );
XMLTest( "UTF-8: Verified multi-language round trip.", 1, okay ); XMLTest( "UTF-8: Verified multi-language round trip.", true, roundTripOkay );
} }
// --------GetText()----------- // --------GetText()-----------
@ -998,7 +1001,9 @@ int main( int argc, const char ** argv )
XMLTest( "Entity transformation: read. ", expected, context, true ); XMLTest( "Entity transformation: read. ", expected, context, true );
FILE* textfile = fopen( "resources/out/textfile.txt", "w" ); const char* textFilePath = "resources/out/textfile.txt";
FILE* textfile = fopen( textFilePath, "w" );
XMLTest( "Entity transformation: open text file for writing", true, textfile != 0, true );
if ( textfile ) if ( textfile )
{ {
XMLPrinter streamer( textfile ); XMLPrinter streamer( textfile );
@ -1006,8 +1011,8 @@ int main( int argc, const char ** argv )
fclose( textfile ); fclose( textfile );
} }
textfile = fopen( "resources/out/textfile.txt", "r" ); textfile = fopen( textFilePath, "r" );
TIXMLASSERT( textfile ); XMLTest( "Entity transformation: open text file for reading", true, textfile != 0, true );
if ( textfile ) if ( textfile )
{ {
char buf[ 1024 ]; char buf[ 1024 ];