From f81124e22041d95dfdcdbadf1fdc11c743d8f994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 11 Jan 2015 20:40:07 +0100
Subject: [PATCH] MeshTools: avoid global state in Tipsify test.

---
 src/Magnum/MeshTools/Test/TipsifyTest.cpp | 73 ++++++++++++-----------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/Magnum/MeshTools/Test/TipsifyTest.cpp b/src/Magnum/MeshTools/Test/TipsifyTest.cpp
index 4a1007999..5b36aa0e9 100644
--- a/src/Magnum/MeshTools/Test/TipsifyTest.cpp
+++ b/src/Magnum/MeshTools/Test/TipsifyTest.cpp
@@ -30,16 +30,11 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class TipsifyTest: public TestSuite::Tester {
-    public:
-        TipsifyTest();
+struct TipsifyTest: TestSuite::Tester {
+    explicit TipsifyTest();
 
-        void buildAdjacency();
-        void tipsify();
-
-    private:
-        std::vector<UnsignedInt> indices;
-        std::size_t vertexCount;
+    void buildAdjacency();
+    void tipsify();
 };
 
 /*
@@ -57,37 +52,44 @@ class TipsifyTest: public TestSuite::Tester {
 
 */
 
-TipsifyTest::TipsifyTest(): indices{
-    4, 1, 0,
-    10, 9, 13,
-    6, 3, 2,
-    9, 5, 4,
-    12, 9, 8,
-    11, 7, 6,
-
-    14, 15, 11,
-    2, 1, 5,
-    10, 6, 5,
-    10, 5, 9,
-    13, 14, 10,
-    1, 4, 5,
-
-    7, 3, 6,
-    6, 2, 5,
-    9, 4, 8,
-    6, 10, 11,
-    13, 9, 12,
-    14, 11, 10,
-
-    16, 17, 18
-}, vertexCount(19) {
+namespace {
+    const std::vector<UnsignedInt> Indices{
+        4, 1, 0,
+        10, 9, 13,
+        6, 3, 2,
+        9, 5, 4,
+        12, 9, 8,
+        11, 7, 6,
+
+        14, 15, 11,
+        2, 1, 5,
+        10, 6, 5,
+        10, 5, 9,
+        13, 14, 10,
+        1, 4, 5,
+
+        7, 3, 6,
+        6, 2, 5,
+        9, 4, 8,
+        6, 10, 11,
+        13, 9, 12,
+        14, 11, 10,
+
+        16, 17, 18
+    };
+
+    constexpr std::size_t VertexCount = 19;
+}
+
+TipsifyTest::TipsifyTest() {
     addTests({&TipsifyTest::buildAdjacency,
               &TipsifyTest::tipsify});
 }
 
 void TipsifyTest::buildAdjacency() {
+    std::vector<UnsignedInt> indices = Indices;
     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>{
         1, 3, 3, 2,
@@ -131,7 +133,8 @@ void TipsifyTest::buildAdjacency() {
 }
 
 void TipsifyTest::tipsify() {
-    MeshTools::tipsify(indices, vertexCount, 3);
+    std::vector<UnsignedInt> indices = Indices;
+    MeshTools::tipsify(indices, VertexCount, 3);
 
     CORRADE_COMPARE(indices, (std::vector<UnsignedInt>{
         4, 1, 0,