Updated test cases to test import of names

This now doesn't overwrite names anymore as this would cause nasty bugs application side.

We can now support these by default without having to handle them as edge cases.
pull/2731/head
RevoluPowered 2019-10-26 17:27:07 +01:00
parent 168ae22ad4
commit 6ea97a1282
1 changed files with 10 additions and 29 deletions

View File

@ -76,6 +76,7 @@ TEST_F( utFBXImporterExporter, importBareBoxWithoutColorsAndTextureCoords ) {
EXPECT_EQ(mesh->mNumVertices, 36u); EXPECT_EQ(mesh->mNumVertices, 36u);
} }
TEST_F(utFBXImporterExporter, importCubesWithNoNames) { TEST_F(utFBXImporterExporter, importCubesWithNoNames) {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/cubes_nonames.fbx", aiProcess_ValidateDataStructure); const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/cubes_nonames.fbx", aiProcess_ValidateDataStructure);
@ -86,26 +87,6 @@ TEST_F(utFBXImporterExporter, importCubesWithNoNames) {
ASSERT_STREQ(root->mName.C_Str(), "RootNode"); ASSERT_STREQ(root->mName.C_Str(), "RootNode");
ASSERT_TRUE(root->mChildren); ASSERT_TRUE(root->mChildren);
ASSERT_EQ(root->mNumChildren, 2u); ASSERT_EQ(root->mNumChildren, 2u);
const auto child0 = root->mChildren[0];
ASSERT_TRUE(child0);
ASSERT_STREQ(child0->mName.C_Str(), "RootNode001");
ASSERT_TRUE(child0->mChildren);
ASSERT_EQ(child0->mNumChildren, 1u);
const auto child00 = child0->mChildren[0];
ASSERT_TRUE(child00);
ASSERT_STREQ(child00->mName.C_Str(), "RootNode001001");
const auto child1 = root->mChildren[1];
ASSERT_TRUE(child1);
ASSERT_STREQ(child1->mName.C_Str(), "RootNode002");
ASSERT_TRUE(child1->mChildren);
ASSERT_EQ(child1->mNumChildren, 1u);
const auto child10 = child1->mChildren[0];
ASSERT_TRUE(child10);
ASSERT_STREQ(child10->mName.C_Str(), "RootNode002001");
} }
TEST_F(utFBXImporterExporter, importCubesWithUnicodeDuplicatedNames) { TEST_F(utFBXImporterExporter, importCubesWithUnicodeDuplicatedNames) {
@ -137,7 +118,7 @@ TEST_F(utFBXImporterExporter, importCubesWithUnicodeDuplicatedNames) {
const auto child10 = child1->mChildren[0]; const auto child10 = child1->mChildren[0];
ASSERT_TRUE(child10); ASSERT_TRUE(child10);
ASSERT_STREQ(child10->mName.C_Str(), "\xd0\x9a\xd1\x83\xd0\xb1\x31""001"); ASSERT_STREQ(child10->mName.C_Str(), "\xd0\x9a\xd1\x83\xd0\xb1\x31");
} }
TEST_F(utFBXImporterExporter, importCubesComplexTransform) { TEST_F(utFBXImporterExporter, importCubesComplexTransform) {
@ -168,14 +149,14 @@ TEST_F(utFBXImporterExporter, importCubesComplexTransform) {
auto parent = child1; auto parent = child1;
const size_t chain_length = 8u; const size_t chain_length = 8u;
const char* chainStr[chain_length] = { const char* chainStr[chain_length] = {
"Cube1001_$AssimpFbx$_Translation", "Cube1_$AssimpFbx$_Translation",
"Cube1001_$AssimpFbx$_RotationPivot", "Cube1_$AssimpFbx$_RotationPivot",
"Cube1001_$AssimpFbx$_RotationPivotInverse", "Cube1_$AssimpFbx$_RotationPivotInverse",
"Cube1001_$AssimpFbx$_ScalingOffset", "Cube1_$AssimpFbx$_ScalingOffset",
"Cube1001_$AssimpFbx$_ScalingPivot", "Cube1_$AssimpFbx$_ScalingPivot",
"Cube1001_$AssimpFbx$_Scaling", "Cube1_$AssimpFbx$_Scaling",
"Cube1001_$AssimpFbx$_ScalingPivotInverse", "Cube1_$AssimpFbx$_ScalingPivotInverse",
"Cube1001" "Cube1"
}; };
for (size_t i = 0; i < chain_length; ++i) { for (size_t i = 0; i < chain_length; ++i) {
ASSERT_TRUE(parent->mChildren); ASSERT_TRUE(parent->mChildren);