|
@@ -60,7 +60,7 @@ protected:
|
|
|
};
|
|
|
|
|
|
TEST_F(utMesh, emptyMeshHasNoContentTest) {
|
|
|
- EXPECT_EQ(0, mesh->mName.length);
|
|
|
+ EXPECT_EQ(0u, mesh->mName.length);
|
|
|
EXPECT_FALSE(mesh->HasPositions());
|
|
|
EXPECT_FALSE(mesh->HasFaces());
|
|
|
EXPECT_FALSE(mesh->HasNormals());
|
|
@@ -69,8 +69,8 @@ TEST_F(utMesh, emptyMeshHasNoContentTest) {
|
|
|
EXPECT_FALSE(mesh->HasVertexColors(AI_MAX_NUMBER_OF_COLOR_SETS));
|
|
|
EXPECT_FALSE(mesh->HasTextureCoords(0));
|
|
|
EXPECT_FALSE(mesh->HasTextureCoords(AI_MAX_NUMBER_OF_TEXTURECOORDS));
|
|
|
- EXPECT_EQ(0, mesh->GetNumUVChannels());
|
|
|
- EXPECT_EQ(0, mesh->GetNumColorChannels());
|
|
|
+ EXPECT_EQ(0u, mesh->GetNumUVChannels());
|
|
|
+ EXPECT_EQ(0u, mesh->GetNumColorChannels());
|
|
|
EXPECT_FALSE(mesh->HasBones());
|
|
|
EXPECT_FALSE(mesh->HasTextureCoordsName(0));
|
|
|
EXPECT_FALSE(mesh->HasTextureCoordsName(AI_MAX_NUMBER_OF_TEXTURECOORDS));
|
|
@@ -80,8 +80,8 @@ TEST_F(utMesh, setTextureCoordsName) {
|
|
|
EXPECT_FALSE(mesh->HasTextureCoordsName(0));
|
|
|
const aiString texcoords_name("texcoord_name");
|
|
|
mesh->SetTextureCoordsName(0, texcoords_name);
|
|
|
- EXPECT_TRUE(mesh->HasTextureCoordsName(0));
|
|
|
- EXPECT_FALSE(mesh->HasTextureCoordsName(1));
|
|
|
+ EXPECT_TRUE(mesh->HasTextureCoordsName(0u));
|
|
|
+ EXPECT_FALSE(mesh->HasTextureCoordsName(1u));
|
|
|
ASSERT_NE(nullptr, mesh->mTextureCoordsNames);
|
|
|
ASSERT_NE(nullptr, mesh->mTextureCoordsNames[0]);
|
|
|
EXPECT_STREQ(texcoords_name.C_Str(), mesh->mTextureCoordsNames[0]->C_Str());
|
|
@@ -94,3 +94,4 @@ TEST_F(utMesh, setTextureCoordsName) {
|
|
|
EXPECT_EQ(nullptr, mesh->mTextureCoordsNames[0]);
|
|
|
EXPECT_EQ(nullptr, mesh->GetTextureCoordsName(0));
|
|
|
}
|
|
|
+
|