From d2961f19f48254921a63b34ba134b01b39621c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 5 Dec 2020 22:56:47 +0100
Subject: [PATCH] Test: use new TestSuite API to simplify things.

---
 src/Magnum/Math/Test/PackingBatchTest.cpp          | 3 +--
 src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Magnum/Math/Test/PackingBatchTest.cpp b/src/Magnum/Math/Test/PackingBatchTest.cpp
index 74c30eea7..cab786022 100644
--- a/src/Magnum/Math/Test/PackingBatchTest.cpp
+++ b/src/Magnum/Math/Test/PackingBatchTest.cpp
@@ -28,7 +28,6 @@
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Container.h>
 #include <Corrade/Utility/DebugStl.h>
-#include <Corrade/Utility/FormatStl.h>
 
 #include "Magnum/Math/Color.h"
 #include "Magnum/Math/Packing.h"
@@ -651,7 +650,7 @@ template<class U, class T> void PackingBatchTest::assertionsCast() {
     CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions");
     #endif
 
-    setTestCaseTemplateName(Corrade::Utility::formatString("{}, {}", TypeTraits<U>::name(), TypeTraits<T>::name()));
+    setTestCaseTemplateName({TypeTraits<U>::name(), TypeTraits<T>::name()});
 
     Math::Vector2<T> data[2]{};
     Math::Vector2<U> resultWrongCount[1]{};
diff --git a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
index 04d0fae21..2eb551880 100644
--- a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
+++ b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
@@ -30,7 +30,6 @@
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Container.h>
 #include <Corrade/Utility/DebugStl.h>
-#include <Corrade/Utility/FormatStl.h>
 
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/MeshTools/RemoveDuplicates.h"
@@ -494,9 +493,7 @@ void RemoveDuplicatesTest::removeDuplicatesFuzzyStl() {
 #endif
 
 template<class IndexType, class T> void RemoveDuplicatesTest::removeDuplicatesFuzzyIndexedInPlace() {
-    setTestCaseTemplateName(Utility::formatString("{}, {}",
-        Math::TypeTraits<IndexType>::name(),
-        Math::TypeTraits<T>::name()));
+    setTestCaseTemplateName({Math::TypeTraits<IndexType>::name(), Math::TypeTraits<T>::name()});
 
     /* Same as above, but with an explicit index buffer */
     IndexType indices[]{3, 2, 0, 1, 2, 3};
@@ -557,9 +554,7 @@ void RemoveDuplicatesTest::removeDuplicatesFuzzyIndexedInPlaceEmptyIndicesVertic
 }
 
 template<class IndexType, class T> void RemoveDuplicatesTest::removeDuplicatesFuzzyIndexedInPlaceErased() {
-    setTestCaseTemplateName(Utility::formatString("{}, {}",
-        Math::TypeTraits<IndexType>::name(),
-        Math::TypeTraits<T>::name()));
+    setTestCaseTemplateName({Math::TypeTraits<IndexType>::name(), Math::TypeTraits<T>::name()});
 
     /* Same as above, but with an explicit index buffer */
     IndexType indices[]{3, 2, 0, 1, 2, 3};