瀏覽代碼

Add unittests for defect reproduction.

Kim Kulling 9 年之前
父節點
當前提交
a74b321ed1
共有 3 個文件被更改,包括 113 次插入1 次删除
  1. 7 1
      code/Assimp.cpp
  2. 1 0
      test/CMakeLists.txt
  3. 105 0
      test/unit/utIssues.cpp

+ 7 - 1
code/Assimp.cpp

@@ -429,12 +429,18 @@ ASSIMP_API void aiDetachAllLogStreams(void)
 #ifndef ASSIMP_BUILD_SINGLETHREADED
     boost::mutex::scoped_lock lock(gLogStreamMutex);
 #endif
+    Logger *logger( DefaultLogger::get() );
+    if ( NULL == logger ) {
+        return;
+    }
+
     for (LogStreamMap::iterator it = gActiveLogStreams.begin(); it != gActiveLogStreams.end(); ++it) {
-        DefaultLogger::get()->detatchStream( it->second );
+        logger->detatchStream( it->second );
         delete it->second;
     }
     gActiveLogStreams.clear();
     DefaultLogger::kill();
+    
     ASSIMP_END_EXCEPTION_REGION(void);
 }
 

+ 1 - 0
test/CMakeLists.txt

@@ -44,6 +44,7 @@ SET( TEST_SRCS
   unit/utNoBoostTest.cpp
   unit/utColladaExportCamera.cpp
   unit/utColladaExportLight.cpp
+  unit/utIssues.cpp
 )
 
 SOURCE_GROUP( tests FILES  ${TEST_SRCS} )

+ 105 - 0
test/unit/utIssues.cpp

@@ -0,0 +1,105 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2014, 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 <assimp/scene.h>
+#include <assimp/Importer.hpp>
+#include <assimp/Exporter.hpp>
+
+using namespace Assimp;
+
+class utIssues : public ::testing::Test {
+
+};
+
+TEST_F( utIssues, OpacityBugWhenExporting_727 ) {
+    aiScene *scene( new aiScene );
+
+    scene->mNumMaterials = 1;
+    scene->mMaterials = new aiMaterial*;
+    scene->mMaterials[ 0 ] = new aiMaterial;
+    aiColor3D color( 1, 0, 0 );
+    EXPECT_EQ( AI_SUCCESS, scene->mMaterials[ 0 ]->AddProperty( &color, 1, AI_MATKEY_COLOR_DIFFUSE ) );
+
+    ::srand( static_cast<unsigned int>( ::time( NULL ) ) );
+    float opacity( float( rand() ) / float( RAND_MAX ) );
+    EXPECT_EQ( AI_SUCCESS, scene->mMaterials[ 0 ]->AddProperty( &opacity, 1, AI_MATKEY_OPACITY ) );
+
+    scene->mNumMeshes = 1;
+    scene->mMeshes = new aiMesh*;
+    scene->mMeshes[ 0 ] = new aiMesh;
+    scene->mMeshes[ 0 ]->mMaterialIndex = 0;
+    scene->mMeshes[ 0 ]->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;
+    scene->mMeshes[ 0 ]->mNumVertices = 3;
+    scene->mMeshes[ 0 ]->mVertices = new aiVector3D[ 3 ];
+    scene->mMeshes[ 0 ]->mVertices[ 0 ] = aiVector3D( 1, 0, 0 );
+    scene->mMeshes[ 0 ]->mVertices[ 1 ] = aiVector3D( 0, 1, 0 );
+    scene->mMeshes[ 0 ]->mVertices[ 2 ] = aiVector3D( 0, 0, 1 );
+    scene->mMeshes[ 0 ]->mNumFaces = 1;
+    scene->mMeshes[ 0 ]->mFaces = new aiFace;
+    scene->mMeshes[ 0 ]->mFaces[ 0 ].mNumIndices = 3;
+    scene->mMeshes[ 0 ]->mFaces[ 0 ].mIndices = new unsigned int[ 3 ];
+    scene->mMeshes[ 0 ]->mFaces[ 0 ].mIndices[ 0 ] = 0;
+    scene->mMeshes[ 0 ]->mFaces[ 0 ].mIndices[ 1 ] = 1;
+    scene->mMeshes[ 0 ]->mFaces[ 0 ].mIndices[ 2 ] = 2;
+
+    scene->mRootNode = new aiNode;
+    scene->mRootNode->mNumMeshes = 1;
+    scene->mRootNode->mMeshes = new unsigned int( 0 );
+
+    Assimp::Importer importer;
+    Assimp::Exporter exporter;
+    for ( std::size_t i( 0 ); i < exporter.GetExportFormatCount(); ++i ) {
+        /*const aiExportFormatDesc *desc( exporter.GetExportFormatDescription( i ) );
+        std::cout << "[" << desc->id << "] ";
+        std::string path( "scene." );
+        path.append( desc->fileExtension );
+
+        ASSERT_EQ( AI_SUCCESS, exporter.Export( scene, desc->id, path ) );
+        const aiScene *newScene( importer.ReadFile( path, 0 ) );
+        ASSERT_TRUE( NULL != newScene );
+        float newOpacity;                    
+        if ( newScene->mNumMaterials > 0 ) {
+            //ASSERT_EQ( AI_SUCCESS, newScene->mMaterials[ 0 ]->Get( AI_MATKEY_OPACITY, newOpacity ) );
+            //EXPECT_EQ( opacity, newOpacity );
+        }*/
+    }
+}