QDoc: Move separator into utilities

Also remove some unused includes where I update includes
in any case.

Fixes: QTBUG-87081
Change-Id: Id63a3c58f9088a8f312468ff1ce0e8fd59f29de2
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

1 files changed, 74 insertions, 0 deletions

diff --git a/tests/auto/qdoc/utilities/tst_utilities.cpp b/tests/auto/qdoc/utilities/tst_utilities.cpp
index 322c7197b..2cf19c56c 100644
--- a/tests/auto/qdoc/utilities/tst_utilities.cpp
+++ b/tests/auto/qdoc/utilities/tst_utilities.cpp
@@ -40,6 +40,11 @@ private slots:
     void startDebugging();
     void stopDebugging();
     void debugging();
+    void callSeparatorForOneWord();
+    void callSeparatorForMoreThanOneWord();
+    void callCommaForOneWord();
+    void callCommaForTwoWords();
+    void callCommaForThreeWords();
 };
 
 void tst_Utilities::loggingCategoryName()
@@ -80,6 +85,75 @@ void tst_Utilities::debugging()
     QVERIFY(Utilities::debugging());
 }
 
+void tst_Utilities::callSeparatorForOneWord()
+{
+    const QStringList listOfWords { "one" };
+    const QString expected = QStringLiteral("one.");
+
+    int index = 0;
+    QString result;
+    for (const auto &word : listOfWords) {
+        result.append(word);
+        result.append(Utilities::separator(index++, listOfWords.size()));
+    }
+    QCOMPARE(result, expected);
+}
+
+void tst_Utilities::callSeparatorForMoreThanOneWord()
+{
+    const QStringList listOfWords { "one", "two" };
+    const QString expected = QStringLiteral("one and two.");
+
+    int index = 0;
+    QString result;
+    for (const auto &word : listOfWords) {
+        result.append(word);
+        result.append(Utilities::separator(index++, listOfWords.size()));
+    }
+    QCOMPARE(result, expected);
+}
+
+void tst_Utilities::callCommaForOneWord()
+{
+    const QStringList listOfWords { "one" };
+    const QString expected = QStringLiteral("one");
+
+    int index = 0;
+    QString result;
+    for (const auto &word : listOfWords) {
+        result.append(word);
+        result.append(Utilities::comma(index++, listOfWords.size()));
+    }
+    QCOMPARE(result, expected);
+}
+void tst_Utilities::callCommaForTwoWords()
+{
+    const QStringList listOfWords { "one", "two" };
+    const QString expected = QStringLiteral("one and two");
+
+    int index = 0;
+    QString result;
+    for (const auto &word : listOfWords) {
+        result.append(word);
+        result.append(Utilities::comma(index++, listOfWords.size()));
+    }
+    QCOMPARE(result, expected);
+}
+
+void tst_Utilities::callCommaForThreeWords()
+{
+    const QStringList listOfWords { "one", "two", "three" };
+    const QString expected = QStringLiteral("one, two, and three");
+
+    int index = 0;
+    QString result;
+    for (const auto &word : listOfWords) {
+        result.append(word);
+        result.append(Utilities::comma(index++, listOfWords.size()));
+    }
+    QCOMPARE(result, expected);
+}
+
 QTEST_APPLESS_MAIN(tst_Utilities)
 
 #include "tst_utilities.moc"