Make OMEMO data classes private

3 files changed, 90 insertions, 89 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 56aa3b42..4155f42c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -41,7 +41,6 @@ add_simple_test(qxmppmessage)
 add_simple_test(qxmppmessagereceiptmanager)
 add_simple_test(qxmppmixiq)
 add_simple_test(qxmppnonsaslauthiq)
-add_simple_test(qxmppomemodata)
 add_simple_test(qxmppoutgoingclient)
 add_simple_test(qxmpppushenableiq)
 add_simple_test(qxmpppresence)
@@ -78,6 +77,7 @@ if(WITH_GSTREAMER)
 endif()
 
 if(BUILD_INTERNAL_TESTS)
+    add_simple_test(qxmppomemodata)
     add_simple_test(qxmppsasl)
     add_simple_test(qxmppstreaminitiationiq)
 endif()
diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp
index 6bea34cf..5e75203f 100644
--- a/tests/qxmppmessage/tst_qxmppmessage.cpp
+++ b/tests/qxmppmessage/tst_qxmppmessage.cpp
@@ -9,7 +9,7 @@
 #include "QXmppBitsOfBinaryDataList.h"
 #include "QXmppMessage.h"
 #include "QXmppMixInvitation.h"
-#include "QXmppOmemoElement.h"
+#include "QXmppOmemoElement_p.h"
 #include "QXmppTrustMessageElement.h"
 
 #include <optional>
@@ -53,7 +53,6 @@ private slots:
     void testSlashMe();
     void testMixInvitation();
     void testTrustMessageElement();
-    void testOmemoElement();
     void testE2eeFallbackBody();
 };
 
@@ -1117,87 +1116,6 @@ void tst_QXmppMessage::testTrustMessageElement()
     QVERIFY(message2.trustMessageElement());
 }
 
-void tst_QXmppMessage::testOmemoElement()
-{
-    const QByteArray xmlIn(QByteArrayLiteral(
-        "<message id=\"send1\" to=\"juliet@capulet.lit\" from=\"romeo@montague.lit\" type=\"normal\">"
-        "<store xmlns=\"urn:xmpp:hints\"/>"
-        "<encrypted xmlns=\"urn:xmpp:omemo:2\">"
-        "<header sid=\"27183\">"
-        "<keys jid=\"juliet@capulet.lit\">"
-        "<key rid=\"31415\">Oy5TSG9vVVV4Wz9wUkUvI1lUXiVLIU5bbGIsUV0wRngK</key>"
-        "</keys>"
-        "<keys jid=\"romeo@montague.lit\">"
-        "<key rid=\"1337\">PTEoSk91VnRZSXBzcFlPXy4jZ3NKcGVZZ2d3YVJbVj8K</key>"
-        "<key rid=\"12321\" kex=\"true\">a012U0R9WixWKUYhYipucnZOWG06akFOR3Q1NGNOOmUK</key>"
-        "</keys>"
-        "</header>"
-        "<payload>"
-        "Vk9NPi99bHFWKmErOUVTTkAwW1VcZjJvPlElZWUoOk90Kz03YUF7OHc/WjpaQz9ieFdsZjBsSH1w"
-        "R1d2Zzt1bEFAMSZqP0dVJj9oaygmcWRPKGU3Kjc8aV4sJSlpSXBqaENCT2NUVFFmaFNXbCxQaHsj"
-        "OnthQDJyUW9qNjwoZCtpLzpzLGpbKlJRY1NtMVVeRzdsOWRQciNnXV9tajEyWztnKiEhRHs5K2hX"
-        "ZFloaEZtUENTQWIxM0tcVkxIVWY+aGYoeEk/SldZcyNlTzk2Q2NHW1NqWEhEPmhPXl1WZV5xNE9p"
-        "WDZuck8zPGE2Rk4vKWJXd3F1YV0mSXA/NVNGNEQsK18mTlJNbl9WcGJXcVE5e1E0dlFAPVQ8THM+"
-        "QjdcdjZSNDVJclo0QVo6cDBMQDtVcUFnNDpcd1ZXSkcsXz82QjhXLl9NSVBFdipeOmF4NC5YKnNx"
-        "K2dxMGx1MDkrdnJhWTovUjk1ZCZUUSNTKHIvJUgmTyE4bjJbZlZAPl9IZi8ucSM7a2FAQWUzXUJO"
-        "LmpALilFWGRqYlh1Siw2MzJqbipsWlZRMG91MGVQVlExLCFeayMuM3dfSn1ONiU8LixZWSx3YUlV"
-        "bGtIcnVWP2Y0LGwvTzFIQy8qZVVBSVZLS1peSW0xNTRPcXRDIXBkXnhmWyNxQFxHQ19cYXVAO214"
-        "RWw1P0AmIUAlQjk7ZFBWXW1RbWxoTFE+cUxMbk5UCg=="
-        "</payload>"
-        "</encrypted>"
-        "</message>"));
-
-    // An OMEMO element having its OMEMO envelopes sorted in reverse order is
-    // needed since they are serialized in the reverse order in which they are
-    // deserialized.
-    const QByteArray xmlOut1(QByteArrayLiteral(
-        "<message id=\"send1\" to=\"juliet@capulet.lit\" from=\"romeo@montague.lit\" type=\"normal\">"
-        "<store xmlns=\"urn:xmpp:hints\"/>"
-        "<encrypted xmlns=\"urn:xmpp:omemo:2\">"
-        "<header sid=\"27183\">"
-        "<keys jid=\"juliet@capulet.lit\">"
-        "<key rid=\"31415\">Oy5TSG9vVVV4Wz9wUkUvI1lUXiVLIU5bbGIsUV0wRngK</key>"
-        "</keys>"
-        "<keys jid=\"romeo@montague.lit\">"
-        "<key rid=\"12321\" kex=\"true\">a012U0R9WixWKUYhYipucnZOWG06akFOR3Q1NGNOOmUK</key>"
-        "<key rid=\"1337\">PTEoSk91VnRZSXBzcFlPXy4jZ3NKcGVZZ2d3YVJbVj8K</key>"
-        "</keys>"
-        "</header>"
-        "<payload>"
-        "Vk9NPi99bHFWKmErOUVTTkAwW1VcZjJvPlElZWUoOk90Kz03YUF7OHc/WjpaQz9ieFdsZjBsSH1w"
-        "R1d2Zzt1bEFAMSZqP0dVJj9oaygmcWRPKGU3Kjc8aV4sJSlpSXBqaENCT2NUVFFmaFNXbCxQaHsj"
-        "OnthQDJyUW9qNjwoZCtpLzpzLGpbKlJRY1NtMVVeRzdsOWRQciNnXV9tajEyWztnKiEhRHs5K2hX"
-        "ZFloaEZtUENTQWIxM0tcVkxIVWY+aGYoeEk/SldZcyNlTzk2Q2NHW1NqWEhEPmhPXl1WZV5xNE9p"
-        "WDZuck8zPGE2Rk4vKWJXd3F1YV0mSXA/NVNGNEQsK18mTlJNbl9WcGJXcVE5e1E0dlFAPVQ8THM+"
-        "QjdcdjZSNDVJclo0QVo6cDBMQDtVcUFnNDpcd1ZXSkcsXz82QjhXLl9NSVBFdipeOmF4NC5YKnNx"
-        "K2dxMGx1MDkrdnJhWTovUjk1ZCZUUSNTKHIvJUgmTyE4bjJbZlZAPl9IZi8ucSM7a2FAQWUzXUJO"
-        "LmpALilFWGRqYlh1Siw2MzJqbipsWlZRMG91MGVQVlExLCFeayMuM3dfSn1ONiU8LixZWSx3YUlV"
-        "bGtIcnVWP2Y0LGwvTzFIQy8qZVVBSVZLS1peSW0xNTRPcXRDIXBkXnhmWyNxQFxHQ19cYXVAO214"
-        "RWw1P0AmIUAlQjk7ZFBWXW1RbWxoTFE+cUxMbk5UCg=="
-        "</payload>"
-        "</encrypted>"
-        "</message>"));
-
-    const QByteArray xmlOut2(QByteArrayLiteral(
-        "<message type=\"chat\">"
-        "<encrypted xmlns=\"urn:xmpp:omemo:2\">"
-        "<header sid=\"0\"/>"
-        "</encrypted>"
-        "</message>"));
-
-    QXmppMessage message1;
-    QVERIFY(!message1.omemoElement());
-
-    parsePacket(message1, xmlIn);
-    QVERIFY(message1.omemoElement());
-    serializePacket(message1, xmlOut1);
-
-    QXmppMessage message2;
-    message2.setOmemoElement(QXmppOmemoElement());
-    QVERIFY(message2.omemoElement());
-    serializePacket(message2, xmlOut2);
-}
-
 void tst_QXmppMessage::testE2eeFallbackBody()
 {
     const QByteArray xml(
diff --git a/tests/qxmppomemodata/tst_qxmppomemodata.cpp b/tests/qxmppomemodata/tst_qxmppomemodata.cpp
index 9f7fb517..6d508a1a 100644
--- a/tests/qxmppomemodata/tst_qxmppomemodata.cpp
+++ b/tests/qxmppomemodata/tst_qxmppomemodata.cpp
@@ -3,11 +3,12 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "QXmppOmemoDeviceBundle.h"
-#include "QXmppOmemoDeviceElement.h"
-#include "QXmppOmemoDeviceList.h"
-#include "QXmppOmemoElement.h"
-#include "QXmppOmemoEnvelope.h"
+#include "QXmppMessage.h"
+#include "QXmppOmemoDeviceBundle_p.h"
+#include "QXmppOmemoDeviceElement_p.h"
+#include "QXmppOmemoDeviceList_p.h"
+#include "QXmppOmemoElement_p.h"
+#include "QXmppOmemoEnvelope_p.h"
 
 #include "util.h"
 #include <QObject>
@@ -60,6 +61,7 @@ private slots:
     void testIsOmemoElement_data();
     void testIsOmemoElement();
     void testOmemoElement();
+    void testMessageOmemoElement();
 };
 
 void tst_QXmppOmemoData::testIsOmemoDeviceElement_data()
@@ -520,5 +522,86 @@ void tst_QXmppOmemoData::testOmemoElement()
     serializePacket(omemoElement2, xmlIn);
 }
 
+void tst_QXmppOmemoData::testMessageOmemoElement()
+{
+    const QByteArray xmlIn(QByteArrayLiteral(
+        "<message id=\"send1\" to=\"juliet@capulet.lit\" from=\"romeo@montague.lit\" type=\"normal\">"
+        "<store xmlns=\"urn:xmpp:hints\"/>"
+        "<encrypted xmlns=\"urn:xmpp:omemo:2\">"
+        "<header sid=\"27183\">"
+        "<keys jid=\"juliet@capulet.lit\">"
+        "<key rid=\"31415\">Oy5TSG9vVVV4Wz9wUkUvI1lUXiVLIU5bbGIsUV0wRngK</key>"
+        "</keys>"
+        "<keys jid=\"romeo@montague.lit\">"
+        "<key rid=\"1337\">PTEoSk91VnRZSXBzcFlPXy4jZ3NKcGVZZ2d3YVJbVj8K</key>"
+        "<key rid=\"12321\" kex=\"true\">a012U0R9WixWKUYhYipucnZOWG06akFOR3Q1NGNOOmUK</key>"
+        "</keys>"
+        "</header>"
+        "<payload>"
+        "Vk9NPi99bHFWKmErOUVTTkAwW1VcZjJvPlElZWUoOk90Kz03YUF7OHc/WjpaQz9ieFdsZjBsSH1w"
+        "R1d2Zzt1bEFAMSZqP0dVJj9oaygmcWRPKGU3Kjc8aV4sJSlpSXBqaENCT2NUVFFmaFNXbCxQaHsj"
+        "OnthQDJyUW9qNjwoZCtpLzpzLGpbKlJRY1NtMVVeRzdsOWRQciNnXV9tajEyWztnKiEhRHs5K2hX"
+        "ZFloaEZtUENTQWIxM0tcVkxIVWY+aGYoeEk/SldZcyNlTzk2Q2NHW1NqWEhEPmhPXl1WZV5xNE9p"
+        "WDZuck8zPGE2Rk4vKWJXd3F1YV0mSXA/NVNGNEQsK18mTlJNbl9WcGJXcVE5e1E0dlFAPVQ8THM+"
+        "QjdcdjZSNDVJclo0QVo6cDBMQDtVcUFnNDpcd1ZXSkcsXz82QjhXLl9NSVBFdipeOmF4NC5YKnNx"
+        "K2dxMGx1MDkrdnJhWTovUjk1ZCZUUSNTKHIvJUgmTyE4bjJbZlZAPl9IZi8ucSM7a2FAQWUzXUJO"
+        "LmpALilFWGRqYlh1Siw2MzJqbipsWlZRMG91MGVQVlExLCFeayMuM3dfSn1ONiU8LixZWSx3YUlV"
+        "bGtIcnVWP2Y0LGwvTzFIQy8qZVVBSVZLS1peSW0xNTRPcXRDIXBkXnhmWyNxQFxHQ19cYXVAO214"
+        "RWw1P0AmIUAlQjk7ZFBWXW1RbWxoTFE+cUxMbk5UCg=="
+        "</payload>"
+        "</encrypted>"
+        "</message>"));
+
+    // An OMEMO element having its OMEMO envelopes sorted in reverse order is
+    // needed since they are serialized in the reverse order in which they are
+    // deserialized.
+    const QByteArray xmlOut1(QByteArrayLiteral(
+        "<message id=\"send1\" to=\"juliet@capulet.lit\" from=\"romeo@montague.lit\" type=\"normal\">"
+        "<store xmlns=\"urn:xmpp:hints\"/>"
+        "<encrypted xmlns=\"urn:xmpp:omemo:2\">"
+        "<header sid=\"27183\">"
+        "<keys jid=\"juliet@capulet.lit\">"
+        "<key rid=\"31415\">Oy5TSG9vVVV4Wz9wUkUvI1lUXiVLIU5bbGIsUV0wRngK</key>"
+        "</keys>"
+        "<keys jid=\"romeo@montague.lit\">"
+        "<key rid=\"12321\" kex=\"true\">a012U0R9WixWKUYhYipucnZOWG06akFOR3Q1NGNOOmUK</key>"
+        "<key rid=\"1337\">PTEoSk91VnRZSXBzcFlPXy4jZ3NKcGVZZ2d3YVJbVj8K</key>"
+        "</keys>"
+        "</header>"
+        "<payload>"
+        "Vk9NPi99bHFWKmErOUVTTkAwW1VcZjJvPlElZWUoOk90Kz03YUF7OHc/WjpaQz9ieFdsZjBsSH1w"
+        "R1d2Zzt1bEFAMSZqP0dVJj9oaygmcWRPKGU3Kjc8aV4sJSlpSXBqaENCT2NUVFFmaFNXbCxQaHsj"
+        "OnthQDJyUW9qNjwoZCtpLzpzLGpbKlJRY1NtMVVeRzdsOWRQciNnXV9tajEyWztnKiEhRHs5K2hX"
+        "ZFloaEZtUENTQWIxM0tcVkxIVWY+aGYoeEk/SldZcyNlTzk2Q2NHW1NqWEhEPmhPXl1WZV5xNE9p"
+        "WDZuck8zPGE2Rk4vKWJXd3F1YV0mSXA/NVNGNEQsK18mTlJNbl9WcGJXcVE5e1E0dlFAPVQ8THM+"
+        "QjdcdjZSNDVJclo0QVo6cDBMQDtVcUFnNDpcd1ZXSkcsXz82QjhXLl9NSVBFdipeOmF4NC5YKnNx"
+        "K2dxMGx1MDkrdnJhWTovUjk1ZCZUUSNTKHIvJUgmTyE4bjJbZlZAPl9IZi8ucSM7a2FAQWUzXUJO"
+        "LmpALilFWGRqYlh1Siw2MzJqbipsWlZRMG91MGVQVlExLCFeayMuM3dfSn1ONiU8LixZWSx3YUlV"
+        "bGtIcnVWP2Y0LGwvTzFIQy8qZVVBSVZLS1peSW0xNTRPcXRDIXBkXnhmWyNxQFxHQ19cYXVAO214"
+        "RWw1P0AmIUAlQjk7ZFBWXW1RbWxoTFE+cUxMbk5UCg=="
+        "</payload>"
+        "</encrypted>"
+        "</message>"));
+
+    const QByteArray xmlOut2(QByteArrayLiteral(
+        "<message type=\"chat\">"
+        "<encrypted xmlns=\"urn:xmpp:omemo:2\">"
+        "<header sid=\"0\"/>"
+        "</encrypted>"
+        "</message>"));
+
+    QXmppMessage message1;
+    QVERIFY(!message1.omemoElement());
+
+    parsePacket(message1, xmlIn);
+    QVERIFY(message1.omemoElement());
+    serializePacket(message1, xmlOut1);
+
+    QXmppMessage message2;
+    message2.setOmemoElement(QXmppOmemoElement());
+    QVERIFY(message2.omemoElement());
+    serializePacket(message2, xmlOut2);
+}
+
 QTEST_MAIN(tst_QXmppOmemoData)
 #include "tst_qxmppomemodata.moc"