Merge pull request #17 from agateau/port-to-catch3

Port to catch3
agateau · Aug 1, 2023 · 2799823 · 2799823
2 parents f642abd + 374fbff
commit 2799823
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/3rdparty/catch2 b/3rdparty/catch2
diff --git a/tests/SoundTest.cpp b/tests/SoundTest.cpp
@@ -9,7 +9,17 @@
 #include <QTemporaryDir>
 #include <QUrl>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_all.hpp>
+
+using Catch::Matchers::Equals;
+using Catch::Matchers::WithinAbs;
+
+static constexpr double PRECISION = 0.00001;
+
+static auto Within(float value) {
+    return WithinAbs(value, PRECISION);
+}
 
 static bool fuzzyEq(const Sound& s1, const Sound& s2) {
     QMetaObject mo = BaseSound::staticMetaObject;
@@ -19,7 +29,7 @@ static bool fuzzyEq(const Sound& s1, const Sound& s2) {
         QVariant v2 = property.read(&s2);
 
         if (property.type() == QVariant::Double) {
-            if (v1.toDouble() != Approx(v2.toDouble())) {
+            if (qAbs(v1.toDouble() - v2.toDouble()) > PRECISION) {
                 return false;
             }
         } else {
@@ -37,21 +47,23 @@ TEST_CASE("Sound") {
         Sound sound;
         auto path = QUrl::fromLocalFile(QString(TEST_FIXTURES_DIR) + "/pickup.sfxr");
         REQUIRE(sound.load(path));
-        CHECK(sound.waveForm() == 0);
-        CHECK(sound.sustainTime() == Approx(0.05916));
-        CHECK(sound.baseFrequency() == Approx(0.5019));
-        CHECK(sound.changeSpeed() == Approx(0.54938));
+        CHECK(sound.waveForm() == WaveForm::Enum::Square);
+        CHECK_THAT(sound.sustainTime(), Within(0.05916));
+        CHECK_THAT(sound.sustainTime(), Within(0.05916));
+        CHECK_THAT(sound.sustainTime(), Within(0.05916));
+        CHECK_THAT(sound.baseFrequency(), Within(0.5019));
+        CHECK_THAT(sound.changeSpeed(), Within(0.54938));
         CHECK(sound.phaserOffset() == 0);
     }
 
     SECTION("load sfxj") {
         Sound sound;
         auto path = QUrl::fromLocalFile(QString(TEST_FIXTURES_DIR) + "/pickup.sfxj");
         REQUIRE(sound.load(path));
-        CHECK(sound.waveForm() == 0);
-        CHECK(sound.sustainTime() == Approx(0.05916));
-        CHECK(sound.baseFrequency() == Approx(0.5019));
-        CHECK(sound.changeSpeed() == Approx(0.54938));
+        CHECK(sound.waveForm() == WaveForm::Enum::Square);
+        CHECK_THAT(sound.sustainTime(), Within(0.05916));
+        CHECK_THAT(sound.baseFrequency(), Within(0.5019));
+        CHECK_THAT(sound.changeSpeed(), Within(0.54938));
         CHECK(sound.phaserOffset() == 0);
     }
 

diff --git a/tests/SynthesizerTest.cpp b/tests/SynthesizerTest.cpp
@@ -9,7 +9,7 @@
 #include <QDir>
 #include <QTemporaryDir>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 static constexpr char FIXTURES_DIR[] = TEST_FIXTURES_DIR "/synthesizer";
 

diff --git a/tests/tests.cpp b/tests/tests.cpp
@@ -1,10 +1,10 @@
-#define CATCH_CONFIG_RUNNER
 #include "SynthesizerTest.h"
 
 #include <QCoreApplication>
 #include <QtTest>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 int main(int argc, char* argv[]) {
     QCoreApplication app(argc, argv);