Assbin: add unittest.

code/AssbinExporter.cpp

@@ -244,8 +244,8 @@ size_t WriteArray(IOStream * stream, const T* in, unsigned int size) {
     return n;
 }
 
-    // ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
-    /** @class  AssbinChunkWriter
+/** @class  AssbinChunkWriter
  *  @brief  Chunk writer mechanism for the .assbin file structure
  *
  *  This is a standard in-memory IOStream (most of the code is based on BlobIOStream),
@@ -254,16 +254,16 @@ size_t WriteArray(IOStream * stream, const T* in, unsigned int size) {
  *  and the chunk contents to the container stream. This allows relatively easy chunk
  *  chunk construction, even recursively.
  */
-    class AssbinChunkWriter : public IOStream
+class AssbinChunkWriter : public IOStream
-    {
+{
-    private:
+private:
 
     uint8_t* buffer;
     uint32_t magic;
     IOStream * container;
     size_t cur_size, cursor, initial;
 
-    private:
+private:
     // -------------------------------------------------------------------
     void Grow(size_t need = 0)
     {
@@ -280,7 +280,7 @@ size_t WriteArray(IOStream * stream, const T* in, unsigned int size) {
         cur_size = new_size;
     }
 
-    public:
+public:
 
     AssbinChunkWriter( IOStream * container, uint32_t magic, size_t initial = 4096)
         : buffer(NULL), magic(magic), container(container), cur_size(0), cursor(0), initial(initial)
@@ -330,21 +330,21 @@ size_t WriteArray(IOStream * stream, const T* in, unsigned int size) {
         return pCount;
     }
 
-    };
+};
 
-    // ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
-    /** @class  AssbinExport
+/** @class  AssbinExport
  *  @brief  Assbin exporter class
  *
  *  This class performs the .assbin exporting, and is responsible for the file layout.
  */
-    class AssbinExport
+class AssbinExport
-    {
+{
-    private:
+private:
     bool shortened;
     bool compressed;
 
-    protected:
+protected:
     // -----------------------------------------------------------------------------------
     void WriteBinaryNode( IOStream * container, const aiNode* node)
     {
@@ -746,7 +746,7 @@ size_t WriteArray(IOStream * stream, const T* in, unsigned int size) {
 
     }
 
-    public:
+public:
     AssbinExport()
         : shortened(false), compressed(false) // temporary settings until properties are introduced for exporters
     {
@@ -822,7 +822,7 @@ size_t WriteArray(IOStream * stream, const T* in, unsigned int size) {
 
         pIOSystem->Close( out );
     }
-    };
+};
 
 void ExportSceneAssbin(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/)
 {

code/AssbinExporter.h

@@ -46,6 +46,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_ASSBINEXPORTER_H_INC
 #define AI_ASSBINEXPORTER_H_INC
 
-// nothing really needed here - reserved for future use like properties
+#include <assimp/defs.h>
 
-#endif
+// nothing really needed here - reserved for future use like properties
+namespace Assimp {
+
+void ASSIMP_API ExportSceneAssbin(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/);
+
+}
+
+#endif // AI_ASSBINEXPORTER_H_INC

test/CMakeLists.txt

@@ -114,6 +114,7 @@ SET( IMPORTERS
   unit/utCSMImportExport.cpp
   unit/utB3DImportExport.cpp
   unit/utMDCImportExport.cpp
+  unit/utAssbinImportExport.cpp
 )
 
 SET( MATERIAL

test/unit/utAssbinImportExport.cpp

@@ -0,0 +1,67 @@
+/*
+---------------------------------------------------------------------------
+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 "SceneDiffer.h"
+#include "AbstractImportExportBase.h"
+#include <assimp/Importer.hpp>
+#include <assimp/Exporter.hpp>
+#include <assimp/postprocess.h>
+
+using namespace Assimp;
+
+class utAssbinImportExport : public AbstractImportExportBase {
+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 );
+
+        return newScene != nullptr;
+    }
+};
+
+TEST_F( utAssbinImportExport, import3DFromFileTest ) {
+    EXPECT_TRUE( importerTest() );
+}