From 081365df48ad8eb11e35b8ace7436e2cd7a78ef6 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 10 Sep 2018 22:42:24 +0200 Subject: [PATCH] Introduce simple export test for assbin. --- code/AssbinLoader.cpp | 14 +++++++++----- test/unit/utAssbinImportExport.cpp | 9 ++++++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/code/AssbinLoader.cpp b/code/AssbinLoader.cpp index 21a48fc99..68d4a2bca 100644 --- a/code/AssbinLoader.cpp +++ b/code/AssbinLoader.cpp @@ -188,13 +188,17 @@ aiQuatKey Read(IOStream * stream) } template -void ReadArray(IOStream * stream, T * out, unsigned int size) -{ - for (unsigned int i=0; i(stream); +void ReadArray( IOStream *stream, T * out, unsigned int size) { + ai_assert( nullptr != stream ); + ai_assert( nullptr != out ); + + for (unsigned int i=0; i(stream); + } } -template void ReadBounds( IOStream * stream, T* /*p*/, unsigned int n ) -{ +template +void ReadBounds( IOStream * stream, T* /*p*/, unsigned int n ) { // not sure what to do here, the data isn't really useful. stream->Seek( sizeof(T) * n, aiOrigin_CUR ); } diff --git a/test/unit/utAssbinImportExport.cpp b/test/unit/utAssbinImportExport.cpp index c464a0c82..9348de8cf 100644 --- a/test/unit/utAssbinImportExport.cpp +++ b/test/unit/utAssbinImportExport.cpp @@ -54,6 +54,7 @@ public: virtual bool importerTest() { Assimp::Importer importer; const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/OBJ/spider.obj", aiProcess_ValidateDataStructure ); + Exporter exporter; EXPECT_EQ( aiReturn_SUCCESS, exporter.Export( scene, "assbin", ASSIMP_TEST_MODELS_DIR "/OBJ/spider_test.assbin" ) ); const aiScene *newScene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/OBJ/spider_test.assbin", aiProcess_ValidateDataStructure ); @@ -62,6 +63,12 @@ public: } }; -TEST_F( utAssbinImportExport, import3DFromFileTest ) { +TEST_F( utAssbinImportExport, exportAssbin3DFromFileTest ) { + Assimp::Importer importer; + const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/OBJ/spider.obj", aiProcess_ValidateDataStructure ); + EXPECT_NE( nullptr, scene ); +} + +TEST_F( utAssbinImportExport, import3ExportAssbinDFromFileTest ) { EXPECT_TRUE( importerTest() ); }