Integrates unittests for lts/services/s almost successfull into final validation phase
This commit is contained in:
46 files changed
+307
-108
No files matched your search
@@ -43,12 +43,12 @@ Q_DECLARE_METATYPE(CustomData)
|
||||
// Test 1: QStringView basic functionality (replacing QStringRef)
|
||||
TEST(Qt6ApiMigrations, QStringViewBasic)
|
||||
{
|
||||
QString original = "Hello Qt6 Migration";
|
||||
QString original = QStringLiteral("Hello Qt6 Migration");
|
||||
QStringView view = original;
|
||||
|
||||
// Test substring view (similar to QStringRef behavior)
|
||||
QStringView subView = view.mid(6, 4); // "Qt6 "
|
||||
EXPECT_EQ(subView.toString(), "Qt6 ");
|
||||
EXPECT_EQ(subView.toString(), QStringLiteral("Qt6 "));
|
||||
|
||||
// Test that view doesn't allocate memory
|
||||
EXPECT_EQ(view.data(), original.data());
|
||||
@@ -59,7 +59,7 @@ TEST(Qt6ApiMigrations, QStringViewInParameter)
|
||||
{
|
||||
auto processString = [](QStringView sv) -> int { return static_cast<int>(sv.length()); };
|
||||
|
||||
QString str = "Test String";
|
||||
QString str = QStringLiteral("Test String");
|
||||
int result = processString(str);
|
||||
EXPECT_EQ(result, 11);
|
||||
}
|
||||
@@ -85,14 +85,14 @@ TEST(Qt6ApiMigrations, StdListReplacement)
|
||||
TEST(Qt6ApiMigrations, StdListWithCustomTypes)
|
||||
{
|
||||
std::list<QString> stringList;
|
||||
stringList.push_back("First");
|
||||
stringList.push_back("Second");
|
||||
stringList.push_back("Third");
|
||||
stringList.push_back(QStringLiteral("First"));
|
||||
stringList.push_back(QStringLiteral("Second"));
|
||||
stringList.push_back(QStringLiteral("Third"));
|
||||
|
||||
EXPECT_EQ(stringList.size(), 3u);
|
||||
|
||||
// Test contains-like operation
|
||||
bool found = std::find(stringList.begin(), stringList.end(), "Second") != stringList.end();
|
||||
bool found = std::find(stringList.begin(), stringList.end(), QStringLiteral("Second")) != stringList.end();
|
||||
EXPECT_TRUE(found);
|
||||
}
|
||||
|
||||
@@ -100,15 +100,15 @@ TEST(Qt6ApiMigrations, StdListWithCustomTypes)
|
||||
TEST(Qt6ApiMigrations, QMultiMapMultiValue)
|
||||
{
|
||||
QMultiMap<QString, int> multiMap;
|
||||
multiMap.insert("key", 1);
|
||||
multiMap.insert("key", 2);
|
||||
multiMap.insert("key", 3);
|
||||
multiMap.insert(QStringLiteral("key"), 1);
|
||||
multiMap.insert(QStringLiteral("key"), 2);
|
||||
multiMap.insert(QStringLiteral("key"), 3);
|
||||
|
||||
EXPECT_EQ(multiMap.size(), 3);
|
||||
EXPECT_EQ(multiMap.count("key"), 3);
|
||||
EXPECT_EQ(multiMap.count(QStringLiteral("key")), 3);
|
||||
|
||||
// Test values() method - verify all values present
|
||||
QList<int> values = multiMap.values("key");
|
||||
QList<int> values = multiMap.values(QStringLiteral("key"));
|
||||
EXPECT_EQ(values.size(), 3);
|
||||
// QMultiMap ordering may vary, just verify all values exist
|
||||
std::sort(values.begin(), values.end());
|
||||
@@ -121,20 +121,20 @@ TEST(Qt6ApiMigrations, QMultiMapMultiValue)
|
||||
TEST(Qt6ApiMigrations, QMultiMapIteration)
|
||||
{
|
||||
QMultiMap<QString, int> multiMap;
|
||||
multiMap.insert("a", 1);
|
||||
multiMap.insert("b", 2);
|
||||
multiMap.insert("a", 3);
|
||||
multiMap.insert(QStringLiteral("a"), 1);
|
||||
multiMap.insert(QStringLiteral("b"), 2);
|
||||
multiMap.insert(QStringLiteral("a"), 3);
|
||||
|
||||
int aCount = 0;
|
||||
int bCount = 0;
|
||||
|
||||
for (auto it = multiMap.begin(); it != multiMap.end(); ++it)
|
||||
{
|
||||
if (it.key() == "a")
|
||||
if (it.key() == QStringLiteral("a"))
|
||||
{
|
||||
aCount++;
|
||||
}
|
||||
else if (it.key() == "b")
|
||||
else if (it.key() == QStringLiteral("b"))
|
||||
{
|
||||
bCount++;
|
||||
}
|
||||
@@ -170,14 +170,14 @@ TEST(Qt6ApiMigrations, QVariantFromValueCustomType)
|
||||
// Register the type
|
||||
qRegisterMetaType<CustomData>("CustomData");
|
||||
|
||||
CustomData data{42, "Test"};
|
||||
CustomData data{42, QStringLiteral("Test")};
|
||||
QVariant variant = QVariant::fromValue(data);
|
||||
|
||||
EXPECT_TRUE(variant.canConvert<CustomData>());
|
||||
|
||||
CustomData retrieved = variant.value<CustomData>();
|
||||
EXPECT_EQ(retrieved.value, 42);
|
||||
EXPECT_EQ(retrieved.text, "Test");
|
||||
EXPECT_EQ(retrieved.text, QStringLiteral("Test"));
|
||||
}
|
||||
|
||||
// Test 10: QVariant with standard types
|
||||
@@ -186,8 +186,8 @@ TEST(Qt6ApiMigrations, QVariantFromValueStandard)
|
||||
QVariant intVariant = QVariant::fromValue(42);
|
||||
EXPECT_EQ(intVariant.toInt(), 42);
|
||||
|
||||
QVariant stringVariant = QVariant::fromValue(QString("Hello"));
|
||||
EXPECT_EQ(stringVariant.toString(), "Hello");
|
||||
QVariant stringVariant = QVariant::fromValue(QStringLiteral("Hello"));
|
||||
EXPECT_EQ(stringVariant.toString(), QStringLiteral("Hello"));
|
||||
}
|
||||
|
||||
// Test 11: QXmlStreamWriter UTF-8 (no setCodec needed)
|
||||
@@ -240,11 +240,11 @@ TEST(Qt6ApiMigrations, QXmlStreamWriterAttributes)
|
||||
// Test 13: QStringView comparison with QString
|
||||
TEST(Qt6ApiMigrations, QStringViewComparison)
|
||||
{
|
||||
QString str = "Hello";
|
||||
QString str = QStringLiteral("Hello");
|
||||
QStringView view = str;
|
||||
|
||||
EXPECT_EQ(view, str);
|
||||
EXPECT_TRUE(view == "Hello");
|
||||
EXPECT_TRUE(view == QStringLiteral("Hello"));
|
||||
EXPECT_TRUE(str == view);
|
||||
}
|
||||
|
||||
@@ -269,14 +269,14 @@ TEST(Qt6ApiMigrations, StdListAlgorithms)
|
||||
TEST(Qt6ApiMigrations, QMultiMapOperations)
|
||||
{
|
||||
QMultiMap<QString, int> map;
|
||||
map.insert("key1", 1);
|
||||
map.insert("key2", 2);
|
||||
map.insert(QStringLiteral("key1"), 1);
|
||||
map.insert(QStringLiteral("key2"), 2);
|
||||
|
||||
EXPECT_TRUE(map.contains("key1"));
|
||||
EXPECT_FALSE(map.contains("key3"));
|
||||
EXPECT_TRUE(map.contains(QStringLiteral("key1")));
|
||||
EXPECT_FALSE(map.contains(QStringLiteral("key3")));
|
||||
|
||||
// Remove all values for a key
|
||||
int removed = map.remove("key1");
|
||||
int removed = map.remove(QStringLiteral("key1"));
|
||||
EXPECT_EQ(removed, 1);
|
||||
EXPECT_FALSE(map.contains("key1"));
|
||||
EXPECT_FALSE(map.contains(QStringLiteral("key1")));
|
||||
}
|
||||
Reference in new issue
Block a user