From 8ab6bc8a26b8417231e011438e1695386e1e1e4c Mon Sep 17 00:00:00 2001
From: aramis_acg <aramis_acg@67173fc5-114c-0410-ac8e-9d2fd5bffc1f>
Date: Thu, 11 Mar 2010 18:38:35 +0000
Subject: [PATCH] - 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
---
 test/unit/Main.cpp       | 4 ----
 test/unit/utImporter.cpp | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/unit/Main.cpp b/test/unit/Main.cpp
index 7b79bad79..5c7bb60fb 100644
--- a/test/unit/Main.cpp
+++ b/test/unit/Main.cpp
@@ -63,10 +63,6 @@ int main (int argc, char* argv[])
 	// ............................................................................
 	// but shutdown must be done from C to ensure proper deallocation
 	aiDetachAllLogStreams();
-	if (!Assimp::DefaultLogger::isNullLogger()) {
-		return 1;
-	}
-	// ............................................................................
 
     // Rueckmeldung, ob Tests erfolgreich waren
     return collectedresults.wasSuccessful () ? 0 : 1;
diff --git a/test/unit/utImporter.cpp b/test/unit/utImporter.cpp
index a00a31bce..9596bfaf5 100644
--- a/test/unit/utImporter.cpp
+++ b/test/unit/utImporter.cpp
@@ -178,7 +178,8 @@ void  ImporterTest :: testMultipleReads (void)
 {
 	// see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3591099
 	// 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 = 
 		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/anim_test.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));
 }