From 95d9c16a3b18ad3fcf28337766c518e4817a4aae Mon Sep 17 00:00:00 2001 From: Alexandre Avenel Date: Sat, 8 Dec 2018 22:00:23 +0100 Subject: [PATCH 1/3] Add minimal unit-test for LWO file format --- test/CMakeLists.txt | 1 + test/unit/utLWOImportExport.cpp | 81 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 test/unit/utLWOImportExport.cpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7e2aec270..82d320bed 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -81,6 +81,7 @@ SET( COMMON SET( IMPORTERS unit/utLWSImportExport.cpp + unit/utLWOImportExport.cpp unit/utSMDImportExport.cpp unit/utglTFImportExport.cpp unit/utglTF2ImportExport.cpp diff --git a/test/unit/utLWOImportExport.cpp b/test/unit/utLWOImportExport.cpp new file mode 100644 index 000000000..7e03ee2e4 --- /dev/null +++ b/test/unit/utLWOImportExport.cpp @@ -0,0 +1,81 @@ +/* +--------------------------------------------------------------------------- +Open Asset Import Library (assimp) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2018, assimp team + + + +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following +conditions are met: + +* Redistributions of source code must retain the above +copyright notice, this list of conditions and the +following disclaimer. + +* Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the +following disclaimer in the documentation and/or other +materials provided with the distribution. + +* Neither the name of the assimp team, nor the names of its +contributors may be used to endorse or promote products +derived from this software without specific prior +written permission of the assimp team. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------------------------- +*/ +#include "UnitTestPCH.h" +#include "AbstractImportExportBase.h" +#include +#include +#include + +using namespace Assimp; + + +class utLWOImportExport : public AbstractImportExportBase { +public: + virtual bool importerTest() { + Assimp::Importer importer; + const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/LWO/LWO2/boxuv.lwo", aiProcess_ValidateDataStructure); + + EXPECT_EQ(1u, scene->mNumMeshes); + EXPECT_NE(nullptr, scene->mMeshes[0]); + EXPECT_EQ(24u, scene->mMeshes[0]->mNumVertices); + + //This test model is using n-gons, so 6 faces instead of 12 tris + EXPECT_EQ(6u, scene->mMeshes[0]->mNumFaces); + EXPECT_EQ(aiPrimitiveType_POLYGON, scene->mMeshes[0]->mPrimitiveTypes); + EXPECT_EQ(true, scene->mMeshes[0]->HasTextureCoords(0)); + + return nullptr != scene; + } +}; + +TEST_F( utLWOImportExport, importLWObox_uv ) { + EXPECT_TRUE( importerTest() ); +} + +TEST_F(utLWOImportExport, importLWOformatdetection) { + ::Assimp::Importer importer; + const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/LWO/LWO2/formatDetection", aiProcess_ValidateDataStructure); + + EXPECT_NE(nullptr, scene); +} + From b25975af481550b4bd291db8ba8350ab16c1eb1c Mon Sep 17 00:00:00 2001 From: Alexandre Avenel Date: Sat, 8 Dec 2018 22:52:23 +0100 Subject: [PATCH 2/3] Add unit-test for STL format auto detection --- test/unit/utSTLImportExport.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/unit/utSTLImportExport.cpp b/test/unit/utSTLImportExport.cpp index ee62253fd..77602a882 100644 --- a/test/unit/utSTLImportExport.cpp +++ b/test/unit/utSTLImportExport.cpp @@ -80,6 +80,12 @@ TEST_F(utSTLImporterExporter, test_multiple) { EXPECT_NE(nullptr, scene2); } +TEST_F(utSTLImporterExporter, importSTLformatdetection) { + ::Assimp::Importer importer; + const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/STL/formatDetection", aiProcess_ValidateDataStructure); + + EXPECT_NE(nullptr, scene); +} TEST_F( utSTLImporterExporter, test_with_two_solids ) { Assimp::Importer importer; From b226982a3c60c732605576dd587ebe7c1e24a166 Mon Sep 17 00:00:00 2001 From: Alexandre Avenel Date: Sun, 9 Dec 2018 18:11:22 +0100 Subject: [PATCH 3/3] Add formatDetection unit-test for 3DS importer --- test/unit/ut3DSImportExport.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/unit/ut3DSImportExport.cpp b/test/unit/ut3DSImportExport.cpp index b40694132..0f91e0f7d 100644 --- a/test/unit/ut3DSImportExport.cpp +++ b/test/unit/ut3DSImportExport.cpp @@ -66,3 +66,11 @@ public: TEST_F( ut3DSImportExport, import3DSFromFileTest ) { EXPECT_TRUE( importerTest() ); } + +TEST_F( ut3DSImportExport, import3DSformatdetection) { + ::Assimp::Importer importer; + const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/3DS/testFormatDetection", aiProcess_ValidateDataStructure); + + EXPECT_NE(nullptr, scene); +} +