- update unit tests.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1238 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

test/unit/CCompilerTest.c

@@ -1,9 +1,8 @@
 
 // This is just a small test to check whether Assimp's API compiles from C
 
-#include <types.h>
-#include <postprocess.h>
-#include <scene.h>
-#include <version.h>
-#include <config.h>
-#include <cimport.h>
+#include <assimp/postprocess.h>
+#include <assimp/scene.h>
+#include <assimp/version.h>
+#include <assimp/config.h>
+#include <assimp/cimport.h>

test/unit/UnitTestPCH.h

@@ -6,7 +6,7 @@
 
 // We need to be sure to have the same STL settings as Assimp
 #include <AssimpPCH.h>
-#include "cimport.h"
+#include <assimp/cimport.h>
 
 // CPPUNIT
 #include <cppunit/TestFixture.h>

test/unit/utExport.h

@@ -3,8 +3,8 @@
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
-#include <cexport.h>
-#include <Exporter.hpp>
+#include <assimp/cexport.h>
+#include <assimp/Exporter.hpp>
 
 using namespace Assimp;
 

test/unit/utGenNormals.h

@@ -4,9 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <types.h>
-#include <mesh.h>
-#include <scene.h>
+#include <assimp/scene.h>
 #include <GenVertexNormalsProcess.h>
 
 

test/unit/utImporter.cpp

@@ -56,6 +56,21 @@ CPPUNIT_TEST_SUITE_REGISTRATION (ImporterTest);
 #define AIUT_DEF_ERROR_TEXT "sorry, this is a test"
 
 
+static const aiImporterDesc desc = {
+	"UNIT TEST - IMPORTER",
+	"",
+	"",
+	"",
+	0,
+	0,
+	0,
+	0,
+	0,
+	"apple mac linux windows" 
+};
+
+
+
 bool TestPlugin :: CanRead( const std::string& pFile, 
 	IOSystem* pIOHandler, bool test) const
 {
@@ -70,12 +85,9 @@ bool TestPlugin :: CanRead( const std::string& pFile,
 		extension == ".linux" || extension == ".windows" );
 }
 
-void TestPlugin :: GetExtensionList(std::set<std::string>& extensions)
+const aiImporterDesc* TestPlugin :: GetInfo() const
 {
-	extensions.insert("apple");
-	extensions.insert("mac");
-	extensions.insert("linux");
-	extensions.insert("windows");
+	return & desc;
 }
 
 void TestPlugin :: InternReadFile( const std::string& pFile, 
@@ -147,7 +159,7 @@ void ImporterTest :: testPluginInterface (void)
 	CPPUNIT_ASSERT(pImp->IsExtensionSupported(".3ds"));
 	CPPUNIT_ASSERT(!pImp->IsExtensionSupported("."));
 
-	TestPlugin* p = (TestPlugin*) pImp->FindLoader(".windows");
+	TestPlugin* p = (TestPlugin*) pImp->GetImporter(".windows");
 	CPPUNIT_ASSERT(NULL != p);
 
 	try {

test/unit/utImporter.h

@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <Importer.hpp>
+#include <assimp/Importer.hpp>
 #include <BaseImporter.h>
 
 using namespace std;
@@ -52,7 +52,7 @@ public:
 		IOSystem* pIOHandler, bool test) const;
 
 	// overriden
-	void GetExtensionList(std::set<std::string>& extensions);
+	const aiImporterDesc* GetInfo () const;
 
 	// overriden
 	void InternReadFile( const std::string& pFile, 

test/unit/utJoinVertices.h

@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <scene.h>
+#include <assimp/scene.h>
 #include <JoinVerticesProcess.h>
 
 

test/unit/utLimitBoneWeights.h

@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <scene.h>
+#include <assimp/scene.h>
 #include <LimitBoneWeightsProcess.h>
 
 

test/unit/utMaterialSystem.h

@@ -4,9 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <types.h>
-#include <mesh.h>
-#include <scene.h>
+#include <assimp/scene.h>
 #include <MaterialSystem.h>
 
 

test/unit/utPretransformVertices.h

@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <scene.h>
+#include <assimp/scene.h>
 #include <PretransformVertices.h>
 
 

test/unit/utRemoveComments.h

@@ -4,7 +4,6 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "types.h"
 #include <RemoveComments.h>
 
 

test/unit/utRemoveComponent.h

@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <scene.h>
+#include <assimp/scene.h>
 #include <RemoveVCProcess.h>
 #include <MaterialSystem.h>
 

test/unit/utRemoveRedundantMaterials.h

@@ -4,9 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <types.h>
-#include <mesh.h>
-#include <scene.h>
+#include <assimp/scene.h>
 #include <RemoveRedundantMaterials.h>
 #include <MaterialSystem.h>
 

test/unit/utScenePreprocessor.h

@@ -7,9 +7,9 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <mesh.h>
-#include <scene.h>
-#include <Importer.hpp>
+#include <assimp/mesh.h>
+#include <assimp/scene.h>
+#include <assimp/Importer.hpp>
 #include <ScenePreprocessor.h>
 
 using namespace std;

test/unit/utSharedPPData.h

@@ -4,8 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <types.h>
-#include <scene.h>
+#include <assimp/scene.h>
 #include <BaseProcess.h>
 
 

test/unit/utSortByPType.h

@@ -4,8 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <types.h>
-#include <scene.h>
+#include <assimp/scene.h>
 #include <SortByPTypeProcess.h>
 
 

test/unit/utSplitLargeMeshes.h

@@ -4,9 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <types.h>
-#include <mesh.h>
-#include <scene.h>
+#include <assimp/scene.h>
 #include <SplitLargeMeshes.h>
 
 

test/unit/utTriangulate.h

@@ -4,9 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <types.h>
-#include <mesh.h>
-#include <scene.h>
+#include <assimp/scene.h>
 #include <TriangulateProcess.h>
 
 

test/unit/utVertexTriangleAdjacency.h

@@ -4,8 +4,8 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "types.h"
-#include "mesh.h"
+#include "assimp/types.h"
+#include "assimp/mesh.h"
 #include <VertexTriangleAdjacency.h>