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

- Fix: unittest suite now shutdowns the logging system correctly. 

- Add alternative model+ppfx testing sequence to importertest.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@594 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-03-11 18:38:35 +00:00
parent e2daf37a39
commit 8ab6bc8a26
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/Main.cpp
View File

@ -63,10 +63,6 @@ int main (int argc, char* argv[])
// ............................................................................ // ............................................................................
// but shutdown must be done from C to ensure proper deallocation // but shutdown must be done from C to ensure proper deallocation
aiDetachAllLogStreams(); aiDetachAllLogStreams();
if (!Assimp::DefaultLogger::isNullLogger()) {
return 1;
}
// ............................................................................
// Rueckmeldung, ob Tests erfolgreich waren // Rueckmeldung, ob Tests erfolgreich waren
return collectedresults.wasSuccessful () ? 0 : 1; return collectedresults.wasSuccessful () ? 0 : 1;

7
test/unit/utImporter.cpp
View File

@ -178,7 +178,8 @@ void ImporterTest :: testMultipleReads (void)
{ {
// see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3591099 // see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3591099
// Check whether reading and post-processing multiple times using // Check whether reading and post-processing multiple times using
// the same objects is *generally* fine. // the same objects is *generally* fine. This test doesn't target
// importers. Testing post-processing stability is the main point.
const unsigned int flags = const unsigned int flags =
aiProcess_Triangulate | aiProcess_Triangulate |
@ -198,4 +199,8 @@ void ImporterTest :: testMultipleReads (void)
CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/Testwuson.x",flags)); CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/Testwuson.x",flags));
CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/anim_test.x",flags)); CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/anim_test.x",flags));
CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags));
CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/anim_test.x",flags));
CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/bcn_epileptic.x",flags));
CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags));
} }