1 files changed, 54 insertions, 35 deletions
diff --git a/test/test_aopacket.cpp b/test/test_aopacket.cpp
index 42ff778e..4a24dcd3 100644
--- a/test/test_aopacket.cpp
+++ b/test/test_aopacket.cpp
@@ -1,51 +1,70 @@
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
-
 #include "aopacket.h"
 
-TEST_CASE("AOPacket construct", "[aopacket]")
+#include <QString>
+#include <QtTest/QTest>
+
+class test_AOPacket : public QObject
 {
-  // Parameters
-  QString packet_string = "CT#MY_OOC_NAME#/doc https://docs.google.com/document/d/123/edit##%";
+  Q_OBJECT
+
+private:
+  const QMap<QString, QString> SYMBOL_MAP{
+      {"#", "<num>"},
+      {"%", "<percent>"},
+      {"$", "<dollar>"},
+      {"&", "<and>"},
+  };
 
-  SECTION("Packet string")
+private Q_SLOTS:
+  void constructPacket_data()
   {
-    AOPacket p(packet_string);
-    REQUIRE(p.to_string() == packet_string);
+    QTest::addColumn<QString>("header");
+    QTest::addColumn<QStringList>("content");
+    QTest::addColumn<QString>("result");
+
+    QTest::newRow("Basic Packet") << "CT" << QStringList{"MY_OOC_NAME", "/doc https://docs.google.com/document/d/123/edit"} << "CT#MY_OOC_NAME#/doc https://docs.google.com/document/d/123/edit#%";
   }
-  SECTION("Header and contents")
+
+  void constructPacket()
   {
-    QStringList contents = {"MY_OOC_NAME", "/doc https://docs.google.com/document/d/123/edit#"};
-    AOPacket p("CT", contents);
-    REQUIRE(p.to_string() == packet_string);
-  }
-}
+    QFETCH(QString, header);
+    QFETCH(QStringList, content);
+    QFETCH(QString, result);
 
-TEST_CASE("AOPacket encode/decode", "[aopacket]")
-{
-  // Parameters
-  QString packet_string = "CT#MY_OOC_NAME#/doc https://docs.google.com/document/d/%$&/edit##%";
-  QString good_encode = "CT#MY_OOC_NAME#/doc https://docs.google.com/document/d/<percent><dollar><and>/edit<num>#%";
+    AOPacket packet(header, content);
+    QVERIFY(packet.toString(true) == result);
+  }
 
-  SECTION("Bad encode/decode because packet string constructor splits the '#' after 'edit'")
+  void encodeDecodeData_data()
   {
-    AOPacket p(packet_string);
-    p.net_encode();
-    REQUIRE(p.to_string() != good_encode);
+    QTest::addColumn<QString>("what");
+    QTest::addColumn<QString>("result");
+    QTest::addColumn<bool>("encode");
 
-    p.net_decode();
-    REQUIRE(p.to_string() == packet_string);
+    for (auto it = SYMBOL_MAP.begin(); it != SYMBOL_MAP.end(); ++it)
+    {
+      QTest::newRow(QString("Encode %1").arg(it.key()).toUtf8()) << it.key() << it.value() << true;
+      QTest::newRow(QString("Decode %1").arg(it.value()).toUtf8()) << it.value() << it.key() << false;
+    }
   }
 
-  SECTION("Good encode/decode with header and contents constructor")
+  void encodeDecodeData()
   {
-    QStringList contents = {"MY_OOC_NAME", "/doc https://docs.google.com/document/d/%$&/edit#"};
-    AOPacket p("CT", contents);
-
-    p.net_encode();
-    REQUIRE(p.to_string() == good_encode);
+    QFETCH(QString, what);
+    QFETCH(QString, result);
+    QFETCH(bool, encode);
 
-    p.net_decode();
-    REQUIRE(p.to_string() == packet_string);
+    if (encode)
+    {
+      QVERIFY(AOPacket::encode(what) == result);
+    }
+    else
+    {
+      QVERIFY(AOPacket::decode(what) == result);
+    }
   }
-}
+};
+
+#include "test/test_aopacket.moc"
+
+QTEST_MAIN(test_AOPacket)