From cb262dab5e5599d922633600292e3a59cc2a7f98 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Tue, 24 Aug 2021 11:02:09 +0200 Subject: [PATCH] Revert test back to the exact same version. --- test/unit/utM3DImportExport.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/unit/utM3DImportExport.cpp b/test/unit/utM3DImportExport.cpp index 7efc24985..bd9fca168 100644 --- a/test/unit/utM3DImportExport.cpp +++ b/test/unit/utM3DImportExport.cpp @@ -43,19 +43,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "AbstractImportExportBase.h" #include "UnitTestPCH.h" -#include +#include #include +#include #include using namespace Assimp; class utM3DImportExport : public AbstractImportExportBase { public: - bool importerTest() override { + bool importerTest() override { Assimp::Importer importer; const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure); #ifndef ASSIMP_BUILD_NO_M3D_IMPORTER - return nullptr != scene; + return nullptr != scene; #else return nullptr == scene; #endif // ASSIMP_BUILD_NO_M3D_IMPORTER @@ -63,11 +64,11 @@ public: #ifndef ASSIMP_BUILD_NO_EXPORT bool exporterTest() override { - Assimp::Importer importer; - const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure); - Exporter exporter; - aiReturn ret = exporter.Export(scene, "m3d", ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals_out.m3d"); - return ret == AI_SUCCESS; + Assimp::Importer importer; + const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure); + Exporter exporter; + aiReturn ret = exporter.Export(scene, "m3d", ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals_out.m3d"); + return ret == AI_SUCCESS; } #endif }; @@ -78,6 +79,6 @@ TEST_F(utM3DImportExport, importM3DFromFileTest) { #ifndef ASSIMP_BUILD_NO_EXPORT TEST_F(utM3DImportExport, exportM3DFromFileTest) { - EXPECT_TRUE(exporterTest()); + EXPECT_TRUE(exporterTest()); } #endif // ASSIMP_BUILD_NO_EXPORT