Browse Source

MeshTools: avoid global state in Tipsify test.

pull/85/head
Vladimír Vondruš 12 years ago
parent
commit
f81124e220
  1. 25
      src/Magnum/MeshTools/Test/TipsifyTest.cpp

25
src/Magnum/MeshTools/Test/TipsifyTest.cpp

@ -30,16 +30,11 @@
namespace Magnum { namespace MeshTools { namespace Test { namespace Magnum { namespace MeshTools { namespace Test {
class TipsifyTest: public TestSuite::Tester { struct TipsifyTest: TestSuite::Tester {
public: explicit TipsifyTest();
TipsifyTest();
void buildAdjacency(); void buildAdjacency();
void tipsify(); void tipsify();
private:
std::vector<UnsignedInt> indices;
std::size_t vertexCount;
}; };
/* /*
@ -57,7 +52,8 @@ class TipsifyTest: public TestSuite::Tester {
*/ */
TipsifyTest::TipsifyTest(): indices{ namespace {
const std::vector<UnsignedInt> Indices{
4, 1, 0, 4, 1, 0,
10, 9, 13, 10, 9, 13,
6, 3, 2, 6, 3, 2,
@ -80,14 +76,20 @@ TipsifyTest::TipsifyTest(): indices{
14, 11, 10, 14, 11, 10,
16, 17, 18 16, 17, 18
}, vertexCount(19) { };
constexpr std::size_t VertexCount = 19;
}
TipsifyTest::TipsifyTest() {
addTests({&TipsifyTest::buildAdjacency, addTests({&TipsifyTest::buildAdjacency,
&TipsifyTest::tipsify}); &TipsifyTest::tipsify});
} }
void TipsifyTest::buildAdjacency() { void TipsifyTest::buildAdjacency() {
std::vector<UnsignedInt> indices = Indices;
std::vector<UnsignedInt> liveTriangleCount, neighborOffset, neighbors; std::vector<UnsignedInt> liveTriangleCount, neighborOffset, neighbors;
Implementation::Tipsify(indices, vertexCount).buildAdjacency(liveTriangleCount, neighborOffset, neighbors); Implementation::Tipsify(indices, VertexCount).buildAdjacency(liveTriangleCount, neighborOffset, neighbors);
CORRADE_COMPARE(liveTriangleCount, (std::vector<UnsignedInt>{ CORRADE_COMPARE(liveTriangleCount, (std::vector<UnsignedInt>{
1, 3, 3, 2, 1, 3, 3, 2,
@ -131,7 +133,8 @@ void TipsifyTest::buildAdjacency() {
} }
void TipsifyTest::tipsify() { void TipsifyTest::tipsify() {
MeshTools::tipsify(indices, vertexCount, 3); std::vector<UnsignedInt> indices = Indices;
MeshTools::tipsify(indices, VertexCount, 3);
CORRADE_COMPARE(indices, (std::vector<UnsignedInt>{ CORRADE_COMPARE(indices, (std::vector<UnsignedInt>{
4, 1, 0, 4, 1, 0,

Loading…
Cancel
Save