Browse Source

MeshTools: fix outdated naming in a test.

VertexFormat used to be an (excessively long) MeshAttributeType and
apparently I didn't clean up all cases yet.
pull/549/head
Vladimír Vondruš 4 years ago
parent
commit
d5927a9fb6
  1. 6
      src/Magnum/MeshTools/Test/ConcatenateTest.cpp

6
src/Magnum/MeshTools/Test/ConcatenateTest.cpp

@ -48,7 +48,7 @@ struct ConcatenateTest: TestSuite::Tester {
void concatenateUnsupportedPrimitive(); void concatenateUnsupportedPrimitive();
void concatenateInconsistentPrimitive(); void concatenateInconsistentPrimitive();
void concatenateInconsistentAttributeType(); void concatenateInconsistentAttributeFormat();
void concatenateInconsistentAttributeArraySize(); void concatenateInconsistentAttributeArraySize();
void concatenateIntoNoMeshes(); void concatenateIntoNoMeshes();
}; };
@ -66,7 +66,7 @@ ConcatenateTest::ConcatenateTest() {
&ConcatenateTest::concatenateUnsupportedPrimitive, &ConcatenateTest::concatenateUnsupportedPrimitive,
&ConcatenateTest::concatenateInconsistentPrimitive, &ConcatenateTest::concatenateInconsistentPrimitive,
&ConcatenateTest::concatenateInconsistentAttributeType, &ConcatenateTest::concatenateInconsistentAttributeFormat,
&ConcatenateTest::concatenateInconsistentAttributeArraySize, &ConcatenateTest::concatenateInconsistentAttributeArraySize,
&ConcatenateTest::concatenateIntoNoMeshes}); &ConcatenateTest::concatenateIntoNoMeshes});
} }
@ -577,7 +577,7 @@ void ConcatenateTest::concatenateInconsistentPrimitive() {
"MeshTools::concatenateInto(): expected MeshPrimitive::Triangles but got MeshPrimitive::Lines in mesh 1\n"); "MeshTools::concatenateInto(): expected MeshPrimitive::Triangles but got MeshPrimitive::Lines in mesh 1\n");
} }
void ConcatenateTest::concatenateInconsistentAttributeType() { void ConcatenateTest::concatenateInconsistentAttributeFormat() {
#ifdef CORRADE_NO_ASSERT #ifdef CORRADE_NO_ASSERT
CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions");
#endif #endif

Loading…
Cancel
Save