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

Update Collada ZAE tests to include encoded URIs

pull/2711/head
RichardTea 2019-10-14 12:25:42 +01:00
parent 198bc428fa
commit f4bd11279f
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/models/Collada/duck.zae
View File

Binary file not shown.

19
test/unit/utColladaImportExport.cpp
View File

@ -53,7 +53,7 @@ class utColladaImportExport : public AbstractImportExportBase {
public: public:
virtual bool importerTest() { virtual bool importerTest() {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/Collada/duck.dae", aiProcess_ValidateDataStructure ); const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/Collada/duck.dae", aiProcess_ValidateDataStructure);
if (scene == nullptr) if (scene == nullptr)
return false; return false;
@ -76,6 +76,7 @@ TEST_F(utColladaImportExport, importBlenFromFileTest) {
class utColladaZaeImportExport : public AbstractImportExportBase { class utColladaZaeImportExport : public AbstractImportExportBase {
public: public:
virtual bool importerTest() { virtual bool importerTest() {
{
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/Collada/duck.zae", aiProcess_ValidateDataStructure); const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/Collada/duck.zae", aiProcess_ValidateDataStructure);
if (scene == nullptr) if (scene == nullptr)
@ -88,6 +89,22 @@ public:
EXPECT_EQ(scene->mNumTextures, 1); EXPECT_EQ(scene->mNumTextures, 1);
EXPECT_EQ(scene->mNumLights, 1); EXPECT_EQ(scene->mNumLights, 1);
EXPECT_EQ(scene->mNumCameras, 1); EXPECT_EQ(scene->mNumCameras, 1);
}
{
Assimp::Importer importer;
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/Collada/duck_nomanifest.zae", aiProcess_ValidateDataStructure);
if (scene == nullptr)
return false;
// Expected number of items
EXPECT_EQ(scene->mNumMeshes, 1);
EXPECT_EQ(scene->mNumMaterials, 1);
EXPECT_EQ(scene->mNumAnimations, 0);
EXPECT_EQ(scene->mNumTextures, 1);
EXPECT_EQ(scene->mNumLights, 1);
EXPECT_EQ(scene->mNumCameras, 1);
}
return true; return true;
} }