Merge branch 'dev'

The result is FTBFS as yet; next commits will fix that, along with a few
other things.

3 files changed, 47 insertions, 1 deletions

diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 0354172b..671d6c08 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -12,6 +12,7 @@ function(QUOTIENT_ADD_TEST)
 endfunction()
 
 quotient_add_test(NAME callcandidateseventtest)
+quotient_add_test(NAME utiltests)
 if(${PROJECT_NAME}_ENABLE_E2EE)
     quotient_add_test(NAME testolmaccount)
     quotient_add_test(NAME testgroupsession)
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"
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"