From ac0ce7da24b4e567a34863db3261f755674d8337 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Mon, 6 Dec 2021 22:42:33 +0100
Subject: autotests/: don't instantiate QApplication

Those tests don't even need an event loop.
---
 autotests/callcandidateseventtest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'autotests')

diff --git a/autotests/callcandidateseventtest.cpp b/autotests/callcandidateseventtest.cpp
index 1a69cb66..0d5a543b 100644
--- a/autotests/callcandidateseventtest.cpp
+++ b/autotests/callcandidateseventtest.cpp
@@ -53,5 +53,5 @@ void TestCallCandidatesEvent::fromJson()
              QStringLiteral("candidate:863018703 1 udp 2122260223 10.9.64.156 43670 typ host generation 0"));
 }
 
-QTEST_MAIN(TestCallCandidatesEvent)
+QTEST_APPLESS_MAIN(TestCallCandidatesEvent)
 #include "callcandidateseventtest.moc"
-- 
cgit v1.2.3


From a1fcad591968ec717214a73a2dbe78f608207bc5 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sun, 5 Dec 2021 10:59:44 +0100
Subject: Move away Omittable static tests to autotests/

These are not required to build libQuotient, and omittable.cpp entirely
consisted of them.
---
 CMakeLists.txt           |  2 +-
 autotests/CMakeLists.txt |  1 +
 autotests/utiltests.cpp  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 lib/omittable.cpp        | 34 ----------------------------------
 4 files changed, 47 insertions(+), 35 deletions(-)
 create mode 100644 autotests/utiltests.cpp
 delete mode 100644 lib/omittable.cpp

(limited to 'autotests')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddf11680..89eb996a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,7 +127,7 @@ list(APPEND lib_SRCS
     lib/quotient_common.h
     lib/quotient_export.h
     lib/function_traits.h lib/function_traits.cpp
-    lib/omittable.h lib/omittable.cpp
+    lib/omittable.h
     lib/networkaccessmanager.h lib/networkaccessmanager.cpp
     lib/connectiondata.h lib/connectiondata.cpp
     lib/connection.h lib/connection.cpp
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 282ab036..9efab0d1 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -12,3 +12,4 @@ function(QUOTIENT_ADD_TEST)
 endfunction()
 
 quotient_add_test(NAME callcandidateseventtest)
+quotient_add_test(NAME utiltests)
diff --git a/autotests/utiltests.cpp b/autotests/utiltests.cpp
new file mode 100644
index 00000000..e3ec63d0
--- /dev/null
+++ b/autotests/utiltests.cpp
@@ -0,0 +1,45 @@
+// SPDX-FileCopyrightText: 2021 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "omittable.h"
+
+#include <QtTest/QtTest>
+
+// compile-time Omittable<> tests
+using namespace Quotient;
+
+Omittable<int> testFn(bool) { return 0; }
+bool testFn2(int) { return false; }
+static_assert(
+    std::is_same_v<decltype(std::declval<Omittable<bool>>().then(testFn)),
+                   Omittable<int>>);
+static_assert(
+    std::is_same_v<
+        decltype(std::declval<Omittable<bool>>().then_or(testFn, 0)), int>);
+static_assert(
+    std::is_same_v<decltype(std::declval<Omittable<bool>>().then(testFn)),
+                   Omittable<int>>);
+static_assert(std::is_same_v<decltype(std::declval<Omittable<int>>()
+                                          .then(testFn2)
+                                          .then(testFn)),
+                             Omittable<int>>);
+static_assert(std::is_same_v<decltype(std::declval<Omittable<bool>>()
+                                          .then(testFn)
+                                          .then_or(testFn2, false)),
+                             bool>);
+
+constexpr auto visitTestFn(int, bool) { return false; }
+static_assert(
+    std::is_same_v<Omittable<bool>, decltype(lift(testFn2, Omittable<int>()))>);
+static_assert(std::is_same_v<Omittable<bool>,
+                             decltype(lift(visitTestFn, Omittable<int>(),
+                                           Omittable<bool>()))>);
+
+class TestUtils : public QObject {
+    Q_OBJECT
+private Q_SLOTS:
+    // TODO
+};
+
+QTEST_APPLESS_MAIN(TestUtils)
+#include "utiltests.moc"
diff --git a/lib/omittable.cpp b/lib/omittable.cpp
deleted file mode 100644
index 245ae721..00000000
--- a/lib/omittable.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Kitsune Ral <kitsune-ral@users.sf.net>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#include "omittable.h"
-
-// Omittable<> tests
-using namespace Quotient;
-
-Omittable<int> testFn(bool) { return 0; }
-bool testFn2(int) { return false; }
-static_assert(
-    std::is_same_v<decltype(std::declval<Omittable<bool>>().then(testFn)),
-                   Omittable<int>>);
-static_assert(
-    std::is_same_v<
-        decltype(std::declval<Omittable<bool>>().then_or(testFn, 0)), int>);
-static_assert(
-    std::is_same_v<decltype(std::declval<Omittable<bool>>().then(testFn)),
-                   Omittable<int>>);
-static_assert(std::is_same_v<decltype(std::declval<Omittable<int>>()
-                                          .then(testFn2)
-                                          .then(testFn)),
-                             Omittable<int>>);
-static_assert(std::is_same_v<decltype(std::declval<Omittable<bool>>()
-                                          .then(testFn)
-                                          .then_or(testFn2, false)),
-                             bool>);
-
-constexpr auto visitTestFn(int, bool) { return false; }
-static_assert(
-    std::is_same_v<Omittable<bool>, decltype(lift(testFn2, Omittable<int>()))>);
-static_assert(std::is_same_v<Omittable<bool>,
-                             decltype(lift(visitTestFn, Omittable<int>(),
-                                           Omittable<bool>()))>);
-- 
cgit v1.2.3