From 8ea74a81adcf426e0ebfbfd1a476f637e1efbe1c Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Fri, 17 Jul 2026 17:12:43 +0200 Subject: [PATCH] tests: make smoke-tests Qt6-safe (use QStringLiteral/QLatin1) --- .../ddsDataTopicTests_smoke.cpp | 4 ++-- .../ddsFunctionTopicTests_smoke.cpp | 10 +++++----- .../ddsGenericDataTests_smoke.cpp | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Lts/DDS/DdsUnitTestsPlaceholder/ddsDataTopicTests_smoke.cpp b/Lts/DDS/DdsUnitTestsPlaceholder/ddsDataTopicTests_smoke.cpp index a1e6f3f82..619718571 100644 --- a/Lts/DDS/DdsUnitTestsPlaceholder/ddsDataTopicTests_smoke.cpp +++ b/Lts/DDS/DdsUnitTestsPlaceholder/ddsDataTopicTests_smoke.cpp @@ -9,8 +9,8 @@ private slots: QVERIFY(QCoreApplication::instance() == nullptr || true); // harmless check } void test_qstring_format() { - QString fmt = QStringLiteral("%1-%2").arg(42).arg("abc"); - QCOMPARE(fmt, QString("42-abc")); + QString fmt = QStringLiteral("%1-%2").arg(42).arg(QStringLiteral("abc")); + QCOMPARE(fmt, QStringLiteral("42-abc")); } }; diff --git a/Lts/DDS/DdsUnitTestsPlaceholder/ddsFunctionTopicTests_smoke.cpp b/Lts/DDS/DdsUnitTestsPlaceholder/ddsFunctionTopicTests_smoke.cpp index 54ea564d6..a836b1c5a 100644 --- a/Lts/DDS/DdsUnitTestsPlaceholder/ddsFunctionTopicTests_smoke.cpp +++ b/Lts/DDS/DdsUnitTestsPlaceholder/ddsFunctionTopicTests_smoke.cpp @@ -6,15 +6,15 @@ class FunctionTopicSmokeTest : public QObject { private slots: void test_containers() { QStringList list; - list << "a" << "b" << "c"; + list << QStringLiteral("a") << QStringLiteral("b") << QStringLiteral("c"); QCOMPARE(list.size(), 3); - QVERIFY(list.contains("b")); + QVERIFY(list.contains(QStringLiteral("b"))); } void test_qmap_basic() { QMap m; - m["one"] = 1; - m["two"] = 2; - QCOMPARE(m.value("two"), 2); + m[QStringLiteral("one")] = 1; + m[QStringLiteral("two")] = 2; + QCOMPARE(m.value(QStringLiteral("two")), 2); } }; diff --git a/Lts/DDS/DdsUnitTestsPlaceholder/ddsGenericDataTests_smoke.cpp b/Lts/DDS/DdsUnitTestsPlaceholder/ddsGenericDataTests_smoke.cpp index 34e016031..fc9479a24 100644 --- a/Lts/DDS/DdsUnitTestsPlaceholder/ddsGenericDataTests_smoke.cpp +++ b/Lts/DDS/DdsUnitTestsPlaceholder/ddsGenericDataTests_smoke.cpp @@ -6,12 +6,12 @@ class GenericSmokeTest : public QObject { private slots: void test_string_ops() { QString s = QString::fromUtf8("mIxEd"); - QCOMPARE(s.toLower(), QString("mixed")); + QCOMPARE(s.toLower(), QStringLiteral("mixed")); } void test_basic_qvariant() { - QVariant v = QString("value"); + QVariant v = QStringLiteral("value"); QVERIFY(v.canConvert()); - QCOMPARE(v.toString(), QString("value")); + QCOMPARE(v.toString(), QStringLiteral("value")); } };