Merge branch 'develop' into feat/acknowledge_release_type

Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>

1 files changed, 58 insertions, 38 deletions

diff --git a/tests/Version_test.cpp b/tests/Version_test.cpp
index afb4c610..d25bf7bb 100644
--- a/tests/Version_test.cpp
+++ b/tests/Version_test.cpp
@@ -20,6 +20,8 @@
 class VersionTest : public QObject {
     Q_OBJECT
 
+    QStringList m_flex_test_names = {};
+
     void addDataColumns()
     {
         QTest::addColumn<QString>("first");
@@ -32,33 +34,48 @@ class VersionTest : public QObject {
     {
         addDataColumns();
 
-        QTest::newRow("equal, explicit") << "1.2.0" << "1.2.0" << false << true;
-        QTest::newRow("equal, two-digit") << "1.42" << "1.42" << false << true;
-
-        QTest::newRow("lessThan, explicit 1") << "1.2.0" << "1.2.1" << true << false;
-        QTest::newRow("lessThan, explicit 2") << "1.2.0" << "1.3.0" << true << false;
-        QTest::newRow("lessThan, explicit 3") << "1.2.0" << "2.2.0" << true << false;
-        QTest::newRow("lessThan, implicit 1") << "1.2" << "1.2.0" << true << false;
-        QTest::newRow("lessThan, implicit 2") << "1.2" << "1.2.1" << true << false;
-        QTest::newRow("lessThan, implicit 3") << "1.2" << "1.3.0" << true << false;
-        QTest::newRow("lessThan, implicit 4") << "1.2" << "2.2.0" << true << false;
-        QTest::newRow("lessThan, two-digit") << "1.41" << "1.42" << true << false;
-
-        QTest::newRow("greaterThan, explicit 1") << "1.2.1" << "1.2.0" << false << false;
-        QTest::newRow("greaterThan, explicit 2") << "1.3.0" << "1.2.0" << false << false;
-        QTest::newRow("greaterThan, explicit 3") << "2.2.0" << "1.2.0" << false << false;
-        QTest::newRow("greaterThan, implicit 1") << "1.2.0" << "1.2" << false << false;
-        QTest::newRow("greaterThan, implicit 2") << "1.2.1" << "1.2" << false << false;
-        QTest::newRow("greaterThan, implicit 3") << "1.3.0" << "1.2" << false << false;
-        QTest::newRow("greaterThan, implicit 4") << "2.2.0" << "1.2" << false << false;
-        QTest::newRow("greaterThan, two-digit") << "1.42" << "1.41" << false << false;
+        QTest::newRow("equal, explicit") << "1.2.0"
+                                         << "1.2.0" << false << true;
+        QTest::newRow("equal, two-digit") << "1.42"
+                                          << "1.42" << false << true;
+
+        QTest::newRow("lessThan, explicit 1") << "1.2.0"
+                                              << "1.2.1" << true << false;
+        QTest::newRow("lessThan, explicit 2") << "1.2.0"
+                                              << "1.3.0" << true << false;
+        QTest::newRow("lessThan, explicit 3") << "1.2.0"
+                                              << "2.2.0" << true << false;
+        QTest::newRow("lessThan, implicit 1") << "1.2"
+                                              << "1.2.0" << true << false;
+        QTest::newRow("lessThan, implicit 2") << "1.2"
+                                              << "1.2.1" << true << false;
+        QTest::newRow("lessThan, implicit 3") << "1.2"
+                                              << "1.3.0" << true << false;
+        QTest::newRow("lessThan, implicit 4") << "1.2"
+                                              << "2.2.0" << true << false;
+        QTest::newRow("lessThan, two-digit") << "1.41"
+                                             << "1.42" << true << false;
+
+        QTest::newRow("greaterThan, explicit 1") << "1.2.1"
+                                                 << "1.2.0" << false << false;
+        QTest::newRow("greaterThan, explicit 2") << "1.3.0"
+                                                 << "1.2.0" << false << false;
+        QTest::newRow("greaterThan, explicit 3") << "2.2.0"
+                                                 << "1.2.0" << false << false;
+        QTest::newRow("greaterThan, implicit 1") << "1.2.0"
+                                                 << "1.2" << false << false;
+        QTest::newRow("greaterThan, implicit 2") << "1.2.1"
+                                                 << "1.2" << false << false;
+        QTest::newRow("greaterThan, implicit 3") << "1.3.0"
+                                                 << "1.2" << false << false;
+        QTest::newRow("greaterThan, implicit 4") << "2.2.0"
+                                                 << "1.2" << false << false;
+        QTest::newRow("greaterThan, two-digit") << "1.42"
+                                                << "1.41" << false << false;
     }
 
    private slots:
-    void test_versionCompare_data()
-    {
-        setupVersions();
-    }
+    void test_versionCompare_data() { setupVersions(); }
 
     void test_versionCompare()
     {
@@ -83,12 +100,12 @@ class VersionTest : public QObject {
 
         QDir test_vector_dir(QFINDTESTDATA("testdata/Version"));
 
-        QFile vector_file{test_vector_dir.absoluteFilePath("test_vectors.txt")};
+        QFile vector_file{ test_vector_dir.absoluteFilePath("test_vectors.txt") };
 
         vector_file.open(QFile::OpenModeFlag::ReadOnly);
 
         int test_number = 0;
-        const QString test_name_template { "FlexVer test #%1 (%2)" };
+        const QString test_name_template{ "FlexVer test #%1 (%2)" };
         for (auto line = vector_file.readLine(); !vector_file.atEnd(); line = vector_file.readLine()) {
             line = line.simplified();
             if (line.startsWith('#') || line.isEmpty())
@@ -98,33 +115,36 @@ class VersionTest : public QObject {
 
             auto split_line = line.split('<');
             if (split_line.size() == 2) {
-                QString first{split_line.first().simplified()};
-                QString second{split_line.last().simplified()};
+                QString first{ split_line.first().simplified() };
+                QString second{ split_line.last().simplified() };
 
-                auto new_test_name = test_name_template.arg(QString::number(test_number), "lessThan").toLatin1().data();
-                QTest::newRow(new_test_name) << first << second << true << false;
+                auto new_test_name = test_name_template.arg(QString::number(test_number), "lessThan");
+                m_flex_test_names.append(new_test_name);
+                QTest::newRow(m_flex_test_names.last().toLatin1().data()) << first << second << true << false;
 
                 continue;
             }
 
             split_line = line.split('=');
             if (split_line.size() == 2) {
-                QString first{split_line.first().simplified()};
-                QString second{split_line.last().simplified()};
+                QString first{ split_line.first().simplified() };
+                QString second{ split_line.last().simplified() };
 
-                auto new_test_name = test_name_template.arg(QString::number(test_number), "equals").toLatin1().data();
-                QTest::newRow(new_test_name) << first << second << false << true;
+                auto new_test_name = test_name_template.arg(QString::number(test_number), "equals");
+                m_flex_test_names.append(new_test_name);
+                QTest::newRow(m_flex_test_names.last().toLatin1().data()) << first << second << false << true;
 
                 continue;
             }
 
             split_line = line.split('>');
             if (split_line.size() == 2) {
-                QString first{split_line.first().simplified()};
-                QString second{split_line.last().simplified()};
+                QString first{ split_line.first().simplified() };
+                QString second{ split_line.last().simplified() };
 
-                auto new_test_name = test_name_template.arg(QString::number(test_number), "greaterThan").toLatin1().data();
-                QTest::newRow(new_test_name) << first << second << false << false;
+                auto new_test_name = test_name_template.arg(QString::number(test_number), "greaterThan");
+                m_flex_test_names.append(new_test_name);
+                QTest::newRow(m_flex_test_names.last().toLatin1().data()) << first << second << false << false;
 
                 continue;
             }